docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
"github.com/AdguardTeam/AdGuardHome/util"
<mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter" <mask> "github.com/AdguardTeam/golibs/file" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> </s> +(dhcpd): added static IP for MacOS
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/filter.go
line := util.SplitNext(&data, '\n')
<mask> seenTitle := false <mask> <mask> // Count lines in the filter <mask> for len(data) != 0 { <mask> line := SplitNext(&data, '\n') <mask> if len(line) == 0 { <mask> continue <mask> } <mask> <mask> if line[0] == '!' { </s> +(dhcpd): added static IP for MacOS </s> remove ln := SplitNext(&...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/filter.go
dir := prepareTestDir() defer func() { _ = os.RemoveAll(dir) }() Context = homeContext{} Context.workDir = dir
<mask> "github.com/stretchr/testify/assert" <mask> ) <mask> <mask> func TestFilters(t *testing.T) { <mask> Context.client = &http.Client{ <mask> Timeout: time.Minute * 5, <mask> } <mask> <mask> f := filter{ <mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", </s> +(dhc...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/filter_test.go
_ = os.Remove(f.Path())
<mask> err = f.load() <mask> assert.True(t, err == nil) <mask> <mask> f.unload() <mask> os.Remove(f.Path()) <mask> } </s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/filter_test.go
"github.com/AdguardTeam/AdGuardHome/util" "github.com/joomcode/errorx"
<mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/isdelve" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter" <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/AdGuardHome/querylog" </s> +(dhcp...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/home.go
util.SetRlimit(config.RlimitNoFile)
<mask> config.Clients = nil <mask> <mask> if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") && <mask> config.RlimitNoFile != 0 { <mask> setRlimit(config.RlimitNoFile) <mask> } <mask> <mask> // override bind host/port from the console <mask> if args.bindHost != "" { <mask> config.BindHost =...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/home.go
admin, _ := util.HaveAdminRights()
<mask> <mask> // Check if the current user has root (administrator) rights <mask> // and if not, ask and try to run as root <mask> func requireAdminRights() { <mask> admin, _ := haveAdminRights() <mask> if //noinspection ALL <mask> admin || isdelve.Enabled { <mask> return <mask> } <mask> </s> +(dhcp...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/home.go
err := util.ConfigureSyslog(serviceName)
<mask> } <mask> <mask> if ls.LogFile == configSyslog { <mask> // Use syslog where it is possible and eventlog on Windows <mask> err := configureSyslog() <mask> if err != nil { <mask> log.Fatalf("cannot initialize syslog: %s", err) <mask> } <mask> } else { <mask> logFilePath := filepath.Join(C...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/home.go
_ = Context.httpsServer.server.Shutdown(context.TODO())
<mask> func stopHTTPServer() { <mask> log.Info("Stopping HTTP server...") <mask> Context.httpsServer.shutdown = true <mask> if Context.httpsServer.server != nil { <mask> Context.httpsServer.server.Shutdown(context.TODO()) <mask> } <mask> Context.httpServer.Shutdown(context.TODO()) <mask> log.Info("Stopp...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/home.go
_ = Context.httpServer.Shutdown(context.TODO())
<mask> Context.httpsServer.shutdown = true <mask> if Context.httpsServer.server != nil { <mask> Context.httpsServer.server.Shutdown(context.TODO()) <mask> } <mask> Context.httpServer.Shutdown(context.TODO()) <mask> log.Info("Stopped HTTP server") <mask> } <mask> <mask> // This function is called before...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/home.go
ifaces, err := util.GetValidNetInterfacesForWeb()
<mask> log.Printf("Go to https://%s:%d", config.TLS.ServerName, config.TLS.PortHTTPS) <mask> } <mask> } else if config.BindHost == "0.0.0.0" { <mask> log.Println("AdGuard Home is available on the following addresses:") <mask> ifaces, err := getValidNetInterfacesForWeb() <mask> if err != nil { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/home.go
"github.com/AdguardTeam/AdGuardHome/util"
<mask> "syscall" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/kardianos/service" <mask> ) <mask> <mask> const ( <mask> launchdStdoutPath = "/var/log/AdGuardHome.stdout.log" </s> +(dhcpd): added static IP for MacOS
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/service.go
code, _, err := util.RunCommand("sh", "-c", confPath+" "+action)
<mask> // runInitdCommand runs init.d service command <mask> // returns command code or error if any <mask> func runInitdCommand(action string) (int, error) { <mask> confPath := "/etc/init.d/" + serviceName <mask> code, _, err := runCommand("sh", "-c", confPath+" "+action) <mask> return code, err <mask> } <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/service.go
"github.com/AdguardTeam/AdGuardHome/util"
<mask> "fmt" <mask> "os" <mask> "path/filepath" <mask> <mask> "github.com/AdguardTeam/golibs/file" <mask> "github.com/AdguardTeam/golibs/log" <mask> "golang.org/x/crypto/bcrypt" <mask> yaml "gopkg.in/yaml.v2" </s> +(dhcpd): added static IP for MacOS
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/upgrade.go
log.Printf("%s(): called", util.FuncName())
<mask> <mask> // The first schema upgrade: <mask> // No more "dnsfilter.txt", filters are now kept in data/filters/ <mask> func upgradeSchema0to1(diskConfig *map[string]interface{}) error { <mask> log.Printf("%s(): called", _Func()) <mask> <mask> dnsFilterPath := filepath.Join(Context.workDir, "dnsfilter.txt...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/upgrade.go
log.Printf("%s(): called", util.FuncName())
<mask> // Second schema upgrade: <mask> // coredns is now dns in config <mask> // delete 'Corefile', since we don't use that anymore <mask> func upgradeSchema1to2(diskConfig *map[string]interface{}) error { <mask> log.Printf("%s(): called", _Func()) <mask> <mask> coreFilePath := filepath.Join(Context.workDir,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/upgrade.go
log.Printf("%s(): called", util.FuncName())
<mask> <mask> // Third schema upgrade: <mask> // Bootstrap DNS becomes an array <mask> func upgradeSchema2to3(diskConfig *map[string]interface{}) error { <mask> log.Printf("%s(): called", _Func()) <mask> <mask> // Let's read dns configuration from diskConfig <mask> dnsConfig, ok := (*diskConfig)["dns"] <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/upgrade.go
log.Printf("%s(): called", util.FuncName())
<mask> } <mask> <mask> // Add use_global_blocked_services=true setting for existing "clients" array <mask> func upgradeSchema3to4(diskConfig *map[string]interface{}) error { <mask> log.Printf("%s(): called", _Func()) <mask> <mask> (*diskConfig)["schema_version"] = 4 <mask> <mask> clients, ok := (*diskCon...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/upgrade.go
log.Printf("%s(): called", util.FuncName())
<mask> // - name: "..." <mask> // password: "..." <mask> // ... <mask> func upgradeSchema4to5(diskConfig *map[string]interface{}) error { <mask> log.Printf("%s(): called", _Func()) <mask> <mask> (*diskConfig)["schema_version"] = 5 <mask> <mask> name, ok := (*diskConfig)["auth_name"] <mask> if !ok { <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/upgrade.go
log.Printf("%s(): called", util.FuncName())
<mask> // ids: <mask> // - 127.0.0.1 <mask> // - ... <mask> func upgradeSchema5to6(diskConfig *map[string]interface{}) error { <mask> log.Printf("%s(): called", _Func()) <mask> <mask> (*diskConfig)["schema_version"] = 6 <mask> <mask> clients, ok := (*diskConfig)["clients"] <mask> if !ok { </s> +(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/upgrade.go
"github.com/AdguardTeam/AdGuardHome/util"
<mask> "strings" <mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/cache" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> </s> +(dhcpd): added static IP for MacOS
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/whois.go
ln := util.SplitNext(&data, '\n')
<mask> m := map[string]string{} <mask> descr := "" <mask> netname := "" <mask> for len(data) != 0 { <mask> ln := SplitNext(&data, '\n') <mask> if len(ln) == 0 || ln[0] == '#' || ln[0] == '%' { <mask> continue <mask> } <mask> <mask> kv := strings.SplitN(ln, ":", 2) </s> +(dhcpd): added static ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd
home/whois.go
list map[string]*Client // name -> client ipIndex map[string]*Client // IP -> client ipHost map[string]*ClientHost // IP -> Hostname
<mask> WhoisInfo [][]string // [[key,value], ...] <mask> } <mask> <mask> type clientsContainer struct { <mask> list map[string]*Client // name -> client <mask> ipIndex map[string]*Client // IP -> client <mask> ipHost map[string]ClientHost // IP -> Hostname <mask> lock sync.Mutex <mask> } <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4
home/clients.go
clients.ipHost = make(map[string]*ClientHost)
<mask> log.Fatal("clients.list != nil") <mask> } <mask> clients.list = make(map[string]*Client) <mask> clients.ipIndex = make(map[string]*Client) <mask> clients.ipHost = make(map[string]ClientHost) <mask> <mask> go clients.periodicUpdate() <mask> } <mask> <mask> func (clients *clientsContainer) perio...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4
home/clients.go
ch = &ClientHost{
<mask> log.Debug("Clients: set WHOIS info for auto-client %s: %v", ch.Host, ch.WhoisInfo) <mask> return <mask> } <mask> <mask> ch = ClientHost{ <mask> Source: ClientSourceWHOIS, <mask> } <mask> ch.WhoisInfo = info <mask> clients.ipHost[ip] = ch <mask> log.Debug("Clients: set WHOIS info for auto-c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4
home/clients.go
// check auto-clients index ch, ok := clients.ipHost[ip] if ok && ch.Source > source {
<mask> if ok { <mask> return false, nil <mask> } <mask> <mask> // check index <mask> c, ok := clients.ipHost[ip] <mask> if ok && c.Source > source { <mask> return false, nil <mask> } <mask> <mask> clients.ipHost[ip] = ClientHost{ <mask> Host: host, </s> - whois: couldn't set info on exi...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4
home/clients.go
} else if ok { ch.Source = source } else { ch = &ClientHost{ Host: host, Source: source, } clients.ipHost[ip] = ch
<mask> // check index <mask> c, ok := clients.ipHost[ip] <mask> if ok && c.Source > source { <mask> return false, nil <mask> } <mask> <mask> clients.ipHost[ip] = ClientHost{ <mask> Host: host, <mask> Source: source, <mask> WhoisInfo: c.WhoisInfo, <mask> } <mask> log.Tracef("'%s' -> '...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4
home/clients.go
"archive/tar"
<mask> <mask> import ( <mask> "archive/zip" <mask> "compress/gzip" <mask> "encoding/json" <mask> "fmt" <mask> "io" </s> * auto-update: use native code to unpack .tar.gz </s> remove err = targzFileUnpack(u.pkgName, u.updateDir) </s> add _, err = targzFileUnpack(u.pkgName, u.updateDir) </s> remove ret...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086
control_update.go
"compress/gzip"
<mask> <mask> import ( <mask> "archive/tar" <mask> "archive/zip" <mask> "encoding/json" <mask> "fmt" <mask> "io" <mask> "io/ioutil" </s> * auto-update: use native code to unpack .tar.gz </s> remove err = targzFileUnpack(u.pkgName, u.updateDir) </s> add _, err = targzFileUnpack(u.pkgName, u.updateDi...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086
control_update.go
// Existing files are overwritten // Return the list of files (not directories) written func targzFileUnpack(tarfile, outdir string) ([]string, error) { f, err := os.Open(tarfile) if err != nil { return nil, fmt.Errorf("os.Open(): %s", err)
<mask> return nil <mask> } <mask> <mask> // Unpack all files from .tar.gz file to the specified directory <mask> func targzFileUnpack(tarfile, outdir string) error { <mask> cmd := exec.Command("tar", "zxf", tarfile, "-C", outdir) <mask> log.Tracef("Unpacking: %v", cmd.Args) <mask> _, err := cmd.Output() <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086
control_update.go
defer f.Close() gzReader, err := gzip.NewReader(f) if err != nil { return nil, fmt.Errorf("gzip.NewReader(): %s", err) } var files []string var err2 error tarReader := tar.NewReader(gzReader) for { header, err := tarReader.Next() if err == io.EOF { err2 = nil break } if err != nil { err2 = ...
<mask> _, err := cmd.Output() <mask> if err != nil || cmd.ProcessState.ExitCode() != 0 { <mask> return fmt.Errorf("exec.Command() failed: %s", err) <mask> } <mask> return nil <mask> } <mask> <mask> // Perform an update procedure <mask> func doUpdate(u *updateInfo) error { <mask> log.Info("Updating fro...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086
control_update.go
_, err = targzFileUnpack(u.pkgName, u.updateDir)
<mask> if err != nil { <mask> return fmt.Errorf("zipFileUnpack() failed: %s", err) <mask> } <mask> } else if strings.HasSuffix(file, ".tar.gz") { <mask> err = targzFileUnpack(u.pkgName, u.updateDir) <mask> if err != nil { <mask> return fmt.Errorf("zipFileUnpack() failed: %s", err) <mask> } <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086
control_update.go
func testTargzFileUnpack(t *testing.T) { fn := "./dist/AdGuardHome_v0.95_linux_amd64.tar.gz" outdir := "./test-unpack" _ = os.Mkdir(outdir, 0755) files, e := targzFileUnpack(fn, outdir) if e != nil { t.Fatalf("FAILED: %s", e) } t.Logf("%v", files) os.RemoveAll(outdir) }
<mask> os.RemoveAll(u.updateDir) <mask> } <mask> <mask> func testZipFileUnpack(t *testing.T) { <mask> fn := "./dist/AdGuardHome_v0.95_Windows_amd64.zip" <mask> outdir := "./test-unpack" <mask> _ = os.Mkdir(outdir, 0755) </s> * auto-update: use native code to unpack .tar.gz </s> remove func targzFileUnpack(...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086
control_update_test.go
// Return TRUE if host names doesn't contain disallowed characters func isHostnameOK(hostname string) bool { for _, c := range hostname { if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '-') { log.Debug("DNS: skipping invalid hostname %s from DHCP", hos...
<mask> } <mask> <mask> func (s *Server) onDHCPLeaseChanged(flags int) { <mask> switch flags { <mask> case dhcpd.LeaseChangedAdded, <mask> dhcpd.LeaseChangedAddedStatic, <mask> dhcpd.LeaseChangedRemovedStatic: </s> * DNS: resolve host names from DHCP: improve #1956 Squashed commit of the following: com...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b
dnsforward/handle_dns.go
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
<mask> <mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll) <mask> <mask> for _, l := range ll { <mask> if len(l.Hostname) == 0 { <mask> continue <mask> } <mask> <mask> m[l.IP.String()] = l.Hostname <mask> </s> * DNS: resolve host names from DHCP: improve #1956 Squashed commit of the following:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b
dnsforward/handle_dns.go
lowhost := strings.ToLower(l.Hostname) m[l.IP.String()] = lowhost
<mask> if len(l.Hostname) == 0 { <mask> continue <mask> } <mask> <mask> m[l.IP.String()] = l.Hostname <mask> <mask> ip := make(net.IP, 4) <mask> copy(ip, l.IP.To4()) <mask> hostToIP[l.Hostname] = ip <mask> } </s> * DNS: resolve host names from DHCP: improve #1956 Squashed commit of the fo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b
dnsforward/handle_dns.go
hostToIP[lowhost] = ip
<mask> m[l.IP.String()] = l.Hostname <mask> <mask> ip := make(net.IP, 4) <mask> copy(ip, l.IP.To4()) <mask> hostToIP[l.Hostname] = ip <mask> } <mask> <mask> log.Debug("DNS: added %d A/PTR entries from DHCP", len(m)) <mask> <mask> s.tableHostToIPLock.Lock() </s> * DNS: resolve host names from DH...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b
dnsforward/handle_dns.go
err = dhcpServer.CheckConfig(newconfig.ServerConfig) if err != nil { httpError(w, http.StatusBadRequest, "Invalid DHCP configuration: %s", err) return }
<mask> return <mask> } <mask> <mask> err = dhcpServer.Stop() <mask> if err != nil { <mask> log.Error("failed to stop the DHCP server: %s", err) <mask> } </s> * control: use new DHCP functions: CheckConfig, Init, Start </s> remove err = dhcpServer.Start(&newconfig.ServerConfig) </s> add err = dhcpS...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048
dhcp.go
err = dhcpServer.Init(newconfig.ServerConfig) if err != nil { httpError(w, http.StatusBadRequest, "Invalid DHCP configuration: %s", err) return }
<mask> } <mask> <mask> if newconfig.Enabled { <mask> <mask> staticIP, err := hasStaticIP(newconfig.InterfaceName) <mask> if !staticIP && err == nil { <mask> err = setStaticIP(newconfig.InterfaceName) </s> * control: use new DHCP functions: CheckConfig, Init, Start </s> remove err := dhcpServer.Start...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048
dhcp.go
err = dhcpServer.Start()
<mask> return <mask> } <mask> } <mask> <mask> err = dhcpServer.Start(&newconfig.ServerConfig) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to start DHCP server: %s", err) <mask> return <mask> } <mask> } </s> * control: use new DHCP functions: CheckConfig, I...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048
dhcp.go
err := dhcpServer.Init(config.DHCP) if err != nil { return errorx.Decorate(err, "Couldn't init DHCP server") } err = dhcpServer.Start()
<mask> if !config.DHCP.Enabled { <mask> // not enabled, don't do anything <mask> return nil <mask> } <mask> err := dhcpServer.Start(&config.DHCP) <mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't start DHCP server") <mask> } <mask> return nil <mask> } </s> * control: use new DHC...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048
dhcp.go
<textarea className="form-control form-control--textarea" value={this.props.userRules} onChange={this.handleChange} />
<mask> title="Custom filtering rules" <mask> subtitle="Enter one rule on a line. You can use either adblock rules or hosts files syntax." <mask> > <mask> <form onSubmit={this.handleSubmit}> <mask> <textarea className="form-control" val...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Filters/UserRules.js
position: relative;
<mask> .logs__row { <mask> display: flex; <mask> align-items: center; <mask> min-height: 26px; <mask> } <mask> <mask> .logs__row--overflow { </s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions'; </s> add import ...
[ "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/Logs.css
min-height: 26px;
<mask> .logs__row { <mask> position: relative; <mask> display: flex; <mask> align-items: center; <mask> } <mask> <mask> .logs__row--overflow { <mask> overflow: hidden; <mask> } </s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQuery...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/Logs.css
import React, { Component, Fragment } from 'react';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import ReactTable from 'react-table'; <mask> import { saveAs } from 'file-saver/FileSaver'; <mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../ui/Card'; </s> Add "block" and "unblock" butto...
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
import escapeRegExp from 'lodash/escapeRegExp'; import endsWith from 'lodash/endsWith';
<mask> import PropTypes from 'prop-types'; <mask> import ReactTable from 'react-table'; <mask> import { saveAs } from 'file-saver/FileSaver'; <mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../ui/Card'; <mask> import Loading from '../ui/Loading'; <mask> import Tooltip from '../ui/Tooltip...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
this.props.getFilteringStatus();
<mask> componentDidMount() { <mask> this.getLogs(); <mask> } <mask> <mask> componentDidUpdate(prevProps) { <mask> // get logs when queryLog becomes enabled <mask> if (this.props.dashboard.queryLogEnabled && !prevProps.dashboard.queryLogEnabled) { </s> Add "block" and "unbloc...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
{this.renderTooltip(isFiltered, rule)}
<mask> const liNodes = responses.map((response, index) => <mask> (<li key={index} title={response}>{response}</li>)); <mask> return ( <mask> <div className="logs__row"> <mask> { this.renderTooltip(is...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
{this.renderTooltip(isFiltered, rule)}
<mask> ); <mask> } <mask> return ( <mask> <div className="logs__row"> <mask> { this.renderTooltip(isFiltered, rule) } <mask> <span>Empty</span> <mask> </div> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
Cell: (row) => { const { reason } = row.original; const isFiltered = row ? reason.indexOf('Filtered') === 0 : false; return ( <Fragment> <div className="logs__row"> {row.value} ...
<mask> accessor: 'client', <mask> maxWidth: 250, <mask> }, <mask> ]; <mask> <mask> if (logs) { <mask> return (<ReactTable </s> Add "block" and "unblock" buttons to the Query Log </s> remove { this.renderTooltip(isFiltered, rule...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
className='logs__table'
<mask> ]; <mask> <mask> if (logs) { <mask> return (<ReactTable <mask> data={logs} <mask> columns={columns} <mask> showPagination={false} <mask> defaultPageSize={1000} </s> Add "block" and "unblock" buttons to the Query...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
getFilteringStatus: PropTypes.func, filtering: PropTypes.object, userRules: PropTypes.string, setRules: PropTypes.func, addSuccessToast: PropTypes.func,
<mask> dashboard: PropTypes.object, <mask> toggleLogStatus: PropTypes.func, <mask> downloadQueryLog: PropTypes.func, <mask> }; <mask> <mask> export default Logs; </s> Add "block" and "unblock" buttons to the Query Log </s> remove const { queryLogs, dashboard } = state; const props = { queryL...
[ "keep", "keep", "add", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/components/Logs/index.js
import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions';
<mask> import { connect } from 'react-redux'; <mask> import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions'; <mask> import Logs from '../components/Logs'; <mask> <mask> const mapStateToProps = (state) => { <mask> const { queryLogs, dashboard } = state; <mask> const props = { queryLogs, ...
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/containers/Logs.js
const { queryLogs, dashboard, filtering } = state; const props = { queryLogs, dashboard, filtering };
<mask> import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions'; <mask> import Logs from '../components/Logs'; <mask> <mask> const mapStateToProps = (state) => { <mask> const { queryLogs, dashboard } = state; <mask> const props = { queryLogs, dashboard }; <mask> return props; <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/containers/Logs.js
getFilteringStatus, setRules, addSuccessToast,
<mask> toggleLogStatus, <mask> downloadQueryLog, <mask> }; <mask> <mask> export default connect( <mask> mapStateToProps, <mask> mapDispatchToProps, <mask> )(Logs); </s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '.....
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d
client/src/containers/Logs.js
<p className="setup__desc text-center">
<mask> <div className="setup__group"> <mask> <h1 className="setup__title"> <mask> <Trans>install_welcome_title</Trans> <mask> </h1> <mask> <p className="setup__desc"> <mask> <Trans>install_w...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c466f8cc7387a6803876e3869ad18a1e8aaffcaf
client/src/install/Setup/Greeting.js
<mask> const renderInterfaces = (interfaces => ( <mask> Object.keys(interfaces).map((item) => { <mask> const option = interfaces[item]; <mask> const { name } = option; <mask> const ip = getInterfaceIp(option); <mask> <mask> return ( <mask> <option value={ip} key=...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c466f8cc7387a6803876e3869ad18a1e8aaffcaf
client/src/install/Setup/Settings.js
if (option.ip_addresses && option.ip_addresses.length > 0) { const ip = getInterfaceIp(option); return ( <option value={ip} key={name}> {name} - {ip} </option> ); } return false;
<mask> const option = interfaces[item]; <mask> const { name } = option; <mask> const ip = getInterfaceIp(option); <mask> <mask> return ( <mask> <option value={ip} key={name}> <mask> {name} - {ip} <mask> </option> <mask> ); <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c466f8cc7387a6803876e3869ad18a1e8aaffcaf
client/src/install/Setup/Settings.js
<mask> parentalCache gcache.Cache <mask> safeSearchCache gcache.Cache <mask> ) <mask> <mask> var resolverAddr string // DNS server address <mask> <mask> // Result holds state of hostname check <mask> type Result struct { <mask> IsFiltered bool `json:",omitempty"` // True if the host name is filter...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
type dialFunctionType func(ctx context.Context, network, addr string) (net.Conn, error)
<mask> // <mask> <mask> // Connect to a remote server resolving hostname using our own DNS server <mask> func createCustomDialContext(resolverAddr string) dialFunctionType { <mask> return func(ctx context.Context, network, addr string) (net.Conn, error) { <mask> log.Tracef("network:%v addr:%v", network, addr...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
func createCustomDialContext(resolverAddr string) dialFunctionType { return func(ctx context.Context, network, addr string) (net.Conn, error) { log.Tracef("network:%v addr:%v", network, addr)
<mask> // lifecycle helper functions <mask> // <mask> <mask> // Connect to a remote server resolving hostname using our own DNS server <mask> func customDialContext(ctx context.Context, network, addr string) (net.Conn, error) { <mask> log.Tracef("network:%v addr:%v", network, addr) <mask> <mask> host, port...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
host, port, err := net.SplitHostPort(addr) if err != nil { return nil, err }
<mask> // Connect to a remote server resolving hostname using our own DNS server <mask> func customDialContext(ctx context.Context, network, addr string) (net.Conn, error) { <mask> log.Tracef("network:%v addr:%v", network, addr) <mask> <mask> host, port, err := net.SplitHostPort(addr) <mask> if err != nil { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
dialer := &net.Dialer{ Timeout: time.Minute * 5, }
<mask> if err != nil { <mask> return nil, err <mask> } <mask> <mask> dialer := &net.Dialer{ <mask> Timeout: time.Minute * 5, <mask> } <mask> <mask> if net.ParseIP(host) != nil { <mask> con, err := dialer.DialContext(ctx, network, addr) <mask> return con, err <mask> } </s> * dnsfilter: don't...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
if net.ParseIP(host) != nil { con, err := dialer.DialContext(ctx, network, addr) return con, err }
<mask> dialer := &net.Dialer{ <mask> Timeout: time.Minute * 5, <mask> } <mask> <mask> if net.ParseIP(host) != nil { <mask> con, err := dialer.DialContext(ctx, network, addr) <mask> return con, err <mask> } <mask> <mask> r := upstream.NewResolver(resolverAddr, 30*time.Second) <mask> addrs, e := ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
r := upstream.NewResolver(resolverAddr, 30*time.Second) addrs, e := r.LookupIPAddr(ctx, host) log.Tracef("LookupIPAddr: %s: %v", host, addrs) if e != nil { return nil, e }
<mask> con, err := dialer.DialContext(ctx, network, addr) <mask> return con, err <mask> } <mask> <mask> r := upstream.NewResolver(resolverAddr, 30*time.Second) <mask> addrs, e := r.LookupIPAddr(ctx, host) <mask> log.Tracef("LookupIPAddr: %s: %v", host, addrs) <mask> if e != nil { <mask> return nil,...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
var firstErr error firstErr = nil for _, a := range addrs { addr = fmt.Sprintf("%s:%s", a.String(), port) con, err := dialer.DialContext(ctx, network, addr) if err != nil { if firstErr == nil { firstErr = err } continue
<mask> if e != nil { <mask> return nil, e <mask> } <mask> <mask> var firstErr error <mask> firstErr = nil <mask> for _, a := range addrs { <mask> addr = fmt.Sprintf("%s:%s", a.String(), port) <mask> con, err := dialer.DialContext(ctx, network, addr) <mask> if err != nil { <mask> if firstErr ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
return con, err
<mask> if err != nil { <mask> if firstErr == nil { <mask> firstErr = err <mask> } <mask> continue <mask> } <mask> return con, err <mask> } <mask> return nil, firstErr <mask> } </s> * dnsfilter: don't use global variable for custom resolver function </s> remove var firstErr error firstE...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
return nil, firstErr
<mask> firstErr = err <mask> } <mask> continue <mask> } <mask> return con, err <mask> } <mask> return nil, firstErr <mask> } <mask> <mask> // New creates properly initialized DNS Filter that is ready to be used </s> * dnsfilter: don't use global variable for custom resolver function </s> rem...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
<mask> continue <mask> } <mask> return con, err <mask> } <mask> return nil, firstErr <mask> } <mask> <mask> // New creates properly initialized DNS Filter that is ready to be used <mask> func New(c *Config) *Dnsfilter { <mask> d := new(Dnsfilter) </s> * dnsfilter: don't use global variable for cus...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
d.transport.DialContext = createCustomDialContext(c.ResolverAddress)
<mask> TLSHandshakeTimeout: 10 * time.Second, <mask> ExpectContinueTimeout: 1 * time.Second, <mask> } <mask> if c != nil && len(c.ResolverAddress) != 0 { <mask> resolverAddr = c.ResolverAddress <mask> d.transport.DialContext = customDialContext <mask> } <mask> d.client = http.Client{ <mask> Tra...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f
dnsfilter/dnsfilter.go
<mask> - 1.11.x <mask> - master <mask> - tip <mask> <mask> node_js: <mask> - lts/* <mask> <mask> os: <mask> - linux <mask> - osx <mask> <mask> before_install: </s> Travis -- fix build on OSX, simplify travis and get rid of yarn </s> remove "build-dev": "NODE_ENV=development webpack --con...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8
.travis.yml
<mask> os: <mask> - linux <mask> - osx <mask> <mask> before_install: <mask> - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi <mask> - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$P...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8
.travis.yml
cd client; npm install cd client; npm run build-prod
<mask> <mask> build: AdguardDNS coredns <mask> <mask> $(STATIC): <mask> yarn --cwd client install <mask> yarn --cwd client run build-prod <mask> <mask> AdguardDNS: $(STATIC) *.go <mask> echo mkfile_dir = $(mkfile_dir) <mask> go get -v -d . <mask> GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH) go get -v ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8
Makefile
"build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js", "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch", "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
<mask> "name": "dashboard", <mask> "version": "0.1.0", <mask> "private": true, <mask> "scripts": { <mask> "build-dev": "NODE_ENV=development webpack --config webpack.dev.js", <mask> "watch": "NODE_ENV=development webpack --config webpack.dev.js --watch", <mask> "build-prod": "NODE_ENV=product...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8
client/package.json
HandleDDR bool `yaml:"handle_ddr"` // Handle DDR requests
<mask> AAAADisabled bool `yaml:"aaaa_disabled"` // Respond with an empty answer to all AAAA requests <mask> EnableDNSSEC bool `yaml:"enable_dnssec"` // Set AD flag in outcoming DNS request <mask> EnableEDNSClientSubnet bool `yaml:"edns_client_subnet"` // Enable EDNS Clien...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe
internal/dnsforward/config.go
// used for ClientID checking and Discovery of Designated Resolvers (DDR).
<mask> CertificateChainData []byte `yaml:"-" json:"-"` <mask> PrivateKeyData []byte `yaml:"-" json:"-"` <mask> <mask> // ServerName is the hostname of the server. Currently, it is only being <mask> // used for ClientID checking. <mask> ServerName string `yaml:"-" json:"-"` <mask> <mask> cert tls....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe
internal/dnsforward/config.go
// ddrHostFQDN is the FQDN used in Discovery of Designated Resolvers (DDR) requests. // See https://www.ietf.org/archive/id/draft-ietf-add-ddr-06.html. const ddrHostFQDN = "_dns.resolver.arpa."
<mask> resultCodeError <mask> ) <mask> <mask> // handleDNSRequest filters the incoming DNS requests and writes them to the query log <mask> func (s *Server) handleDNSRequest(_ *proxy.Proxy, d *proxy.DNSContext) error { <mask> ctx := &dnsContext{ <mask> proxyCtx: d, <mask> result: &filtering.Result{},...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe
internal/dnsforward/dns.go
s.processDDRQuery,
<mask> mods := []modProcessFunc{ <mask> s.processRecursion, <mask> s.processInitial, <mask> s.processDetermineLocal, <mask> s.processInternalHosts, <mask> s.processRestrictLocal, <mask> s.processInternalIPAddrs, </s> Pull request: dnsforward: ddr support Merge in DNS/adguard-home from 4463-ddr-sup...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe
internal/dnsforward/dns.go
HandleDDR: true,
<mask> RefuseAny: true, <mask> AllServers: false, <mask> FastestTimeout: timeutil.Duration{ <mask> Duration: fastip.DefaultPingWaitTimeout, <mask> }, <mask> </s> Pull request: dnsforward: ddr support Merge in DNS/adguard-home from 4463-ddr-support-1 to master Squashed commit o...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe
internal/home/config.go
"net/netip"
<mask> "fmt" <mask> "net/http" <mask> "os" <mask> "strings" <mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalg" </s> Pull request: 4898-redirect-https Merge in DNS/adguard-home from 4898-redirect-https to master Updates #4898. Updates #4927. Squashed commit...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
if status.ValidCert && status.ValidKey && status.ValidPair { // Do not return warnings since those aren't critical. err = nil }
<mask> func loadTLSConf(tlsConf *tlsConfigSettings, status *tlsConfigStatus) (err error) { <mask> defer func() { <mask> if err != nil { <mask> status.WarningValidation = err.Error() <mask> } <mask> }() <mask> <mask> tlsConf.CertificateChainData = []byte(tlsConf.CertificateChain) </s> Pull request: 4...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
// Set status.ValidCert to true to signal the frontend that the // certificate opens successfully while the private key can't be opened.
<mask> if err != nil { <mask> return fmt.Errorf("reading cert file: %w", err) <mask> } <mask> <mask> status.ValidCert = true <mask> } <mask> <mask> if tlsConf.PrivateKeyPath != "" { <mask> if tlsConf.PrivateKey != "" { </s> Pull request: 4898-redirect-https Merge in DNS/adguard-home from 4898-...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
// validateCertChain verifies certs using the first as the main one and others // as intermediate. srvName stands for the expected DNS name. func validateCertChain(certs []*x509.Certificate, srvName string) (err error) { main, others := certs[0], certs[1:]
<mask> <mask> return nil <mask> } <mask> <mask> // validateCertChain validates the certificate chain and sets data in status. <mask> // The returned error is also set in status.WarningValidation. <mask> func validateCertChain(status *tlsConfigStatus, certChain []byte, serverName string) (err error) { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", ...
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
pool := x509.NewCertPool() for _, cert := range others { log.Info("tls: got an intermediate cert") pool.AddCert(cert)
<mask> if decoded == nil { <mask> break <mask> } <mask> <mask> if decoded.Type == "CERTIFICATE" { <mask> certs = append(certs, decoded) <mask> } <mask> } <mask> <mask> parsedCerts, err := parsePEMCerts(certs) <mask> if err != nil { <mask> return err </s> Pull request: 4898-redirect-htt...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
opts := x509.VerifyOptions{ DNSName: srvName, Roots: Context.tlsRoots, Intermediates: pool, } _, err = main.Verify(opts)
<mask> certs = append(certs, decoded) <mask> } <mask> } <mask> <mask> parsedCerts, err := parsePEMCerts(certs) <mask> if err != nil { <mask> return err <mask> } <mask> <mask> status.ValidCert = true </s> Pull request: 4898-redirect-https Merge in DNS/adguard-home from 4898-redirect-https to ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
return fmt.Errorf("certificate does not verify: %w", err)
<mask> } <mask> <mask> parsedCerts, err := parsePEMCerts(certs) <mask> if err != nil { <mask> return err <mask> } <mask> <mask> status.ValidCert = true <mask> <mask> opts := x509.VerifyOptions{ </s> Pull request: 4898-redirect-https Merge in DNS/adguard-home from 4898-redirect-https to master Up...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
return nil } // certHasIP returns true if cert has at least a single IP address either in its // DNS names or in the IP addresses section. func certHasIP(cert *x509.Certificate) (ok bool) { if len(cert.IPAddresses) > 0 { return true }
<mask> if err != nil { <mask> return err <mask> } <mask> <mask> status.ValidCert = true <mask> <mask> opts := x509.VerifyOptions{ <mask> DNSName: serverName, <mask> Roots: Context.tlsRoots, <mask> } </s> Pull request: 4898-redirect-https Merge in DNS/adguard-home from 4898-redirect-https to m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
for _, name := range cert.DNSNames { if _, err := netip.ParseAddr(name); err == nil { return true }
<mask> } <mask> <mask> status.ValidCert = true <mask> <mask> opts := x509.VerifyOptions{ <mask> DNSName: serverName, <mask> Roots: Context.tlsRoots, <mask> } <mask> <mask> log.Info("tls: number of certs: %d", len(parsedCerts)) <mask> <mask> pool := x509.NewCertPool() </s> Pull request: 4898...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
return false }
<mask> DNSName: serverName, <mask> Roots: Context.tlsRoots, <mask> } <mask> <mask> log.Info("tls: number of certs: %d", len(parsedCerts)) <mask> <mask> pool := x509.NewCertPool() <mask> for _, cert := range parsedCerts[1:] { <mask> log.Info("tls: got an intermediate cert") <mask> pool.AddCert(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
// parseCertChain parses the certificate chain from raw data, and returns it. // If ok is true, the returned error, if any, is not critical. func parseCertChain(chain []byte) (parsedCerts []*x509.Certificate, ok bool, err error) { log.Debug("tls: got certificate chain: %d bytes", len(chain))
<mask> } <mask> <mask> log.Info("tls: number of certs: %d", len(parsedCerts)) <mask> <mask> pool := x509.NewCertPool() <mask> for _, cert := range parsedCerts[1:] { <mask> log.Info("tls: got an intermediate cert") <mask> pool.AddCert(cert) <mask> } <mask> <mask> opts.Intermediates = pool <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
var certs []*pem.Block for decoded, pemblock := pem.Decode(chain); decoded != nil; { if decoded.Type == "CERTIFICATE" { certs = append(certs, decoded) } decoded, pemblock = pem.Decode(pemblock) }
<mask> log.Info("tls: got an intermediate cert") <mask> pool.AddCert(cert) <mask> } <mask> <mask> opts.Intermediates = pool <mask> <mask> mainCert := parsedCerts[0] <mask> _, err = mainCert.Verify(opts) <mask> if err != nil { <mask> // Let self-signed certs through and don't return this error. <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
parsedCerts, err = parsePEMCerts(certs)
<mask> } <mask> <mask> opts.Intermediates = pool <mask> <mask> mainCert := parsedCerts[0] <mask> _, err = mainCert.Verify(opts) <mask> if err != nil { <mask> // Let self-signed certs through and don't return this error. <mask> status.WarningValidation = fmt.Sprintf("certificate does not verify: %s",...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
return nil, false, err
<mask> <mask> mainCert := parsedCerts[0] <mask> _, err = mainCert.Verify(opts) <mask> if err != nil { <mask> // Let self-signed certs through and don't return this error. <mask> status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err) <mask> } else { <mask> status.ValidChain = t...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
log.Info("tls: number of certs: %d", len(parsedCerts)) if !certHasIP(parsedCerts[0]) { err = errors.Error(`certificate has no IP addresses` + `, this may cause issues with DNS-over-TLS clients`)
<mask> } else { <mask> status.ValidChain = true <mask> } <mask> <mask> if mainCert != nil { <mask> status.Subject = mainCert.Subject.String() <mask> status.Issuer = mainCert.Issuer.String() <mask> status.NotAfter = mainCert.NotAfter <mask> status.NotBefore = mainCert.NotBefore <mask> status.DN...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
return parsedCerts, true, err
<mask> status.NotBefore = mainCert.NotBefore <mask> status.DNSNames = mainCert.DNSNames <mask> } <mask> <mask> return nil <mask> } <mask> <mask> // parsePEMCerts parses multiple PEM-encoded certificates. <mask> func parsePEMCerts(certs []*pem.Block) (parsedCerts []*x509.Certificate, err error) { <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
// validatePKey validates the private key, returning its type. It returns an // empty string if error occurs. func validatePKey(pkey []byte) (keyType string, err error) {
<mask> <mask> return parsedCerts, nil <mask> } <mask> <mask> // validatePKey validates the private key and sets data in status. The returned <mask> // error is also set in status.WarningValidation. <mask> func validatePKey(status *tlsConfigStatus, pkey []byte) (err error) { <mask> defer func() { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
for decoded, pemblock := pem.Decode([]byte(pkey)); decoded != nil; {
<mask> var key *pem.Block <mask> <mask> // Go through all pem blocks, but take first valid pem block and drop the <mask> // rest. <mask> pemblock := []byte(pkey) <mask> for { <mask> var decoded *pem.Block <mask> decoded, pemblock = pem.Decode(pemblock) <mask> if decoded == nil { <mask> break <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
decoded, pemblock = pem.Decode(pemblock)
<mask> key = decoded <mask> <mask> break <mask> } <mask> } <mask> <mask> if key == nil { <mask> return "", errors.Error("no valid keys were found") </s> Pull request: 4898-redirect-https Merge in DNS/adguard-home from 4898-redirect-https to master Updates #4898. Updates #4927. Squashed commit ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
return "", errors.Error("no valid keys were found")
<mask> } <mask> } <mask> <mask> if key == nil { <mask> return errors.Error("no valid keys were found") <mask> } <mask> <mask> _, keyType, err := parsePrivateKey(key.Bytes) <mask> if err != nil { <mask> return fmt.Errorf("parsing private key: %w", err) </s> Pull request: 4898-redirect-https Merg...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go
_, keyType, err = parsePrivateKey(key.Bytes)
<mask> if key == nil { <mask> return errors.Error("no valid keys were found") <mask> } <mask> <mask> _, keyType, err := parsePrivateKey(key.Bytes) <mask> if err != nil { <mask> return fmt.Errorf("parsing private key: %w", err) <mask> } <mask> <mask> if keyType == keyTypeED25519 { </s> Pull reques...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401
internal/home/tls.go