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
filters := []Filter{{
<mask> func TestWhitelist(t *testing.T) { <mask> rules := `||host1^ <mask> ||host2^ <mask> ` <mask> filters := []Filter{Filter{ <mask> ID: 0, Data: []byte(rules), <mask> }} <mask> <mask> whiteRules := `||host1^ <mask> ||host3^ </s> Pull request:* all: fix all staticcheck simplification and unused warn...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/dnsfilter_test.go
whiteFilters := []Filter{{
<mask> <mask> whiteRules := `||host1^ <mask> ||host3^ <mask> ` <mask> whiteFilters := []Filter{Filter{ <mask> ID: 0, Data: []byte(whiteRules), <mask> }} <mask> d := NewForTest(nil, filters) <mask> d.SetFilters(filters, whiteFilters, false) <mask> defer d.Close() </s> Pull request:* all: fix all stat...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/dnsfilter_test.go
filters := []Filter{{
<mask> // Check behaviour without any per-client settings, <mask> // then apply per-client settings and check behaviour once again <mask> func TestClientSettings(t *testing.T) { <mask> var r Result <mask> filters := []Filter{Filter{ <mask> ID: 0, Data: []byte("||example.org^\n"), <mask> }} <mask> d := Ne...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/dnsfilter_test.go
<mask> r, _ = d.CheckHost("facebook.com", dns.TypeA, &setts) <mask> assert.True(t, r.IsFiltered && r.Reason == FilteredBlockedService) <mask> } <mask> <mask> func prepareTestDir() string { <mask> const dir = "./agh-test" <mask> _ = os.RemoveAll(dir) <mask> _ = os.MkdirAll(dir, 0755) <mask> return dir <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/dnsfilter_test.go
exp := make([]byte, 4)
<mask> func (d *Dnsfilter) setCacheResult(cache cache.Cache, host string, res Result) int { <mask> var buf bytes.Buffer <mask> <mask> expire := uint(time.Now().Unix()) + d.Config.CacheTime*60 <mask> var exp []byte <mask> exp = make([]byte, 4) <mask> binary.BigEndian.PutUint32(exp, uint32(expire)) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/safe_search.go
const ( dnsTimeout = 3 * time.Second defaultSafebrowsingServer = `https://dns-family.adguard.com/dns-query` defaultParentalServer = `https://dns-family.adguard.com/dns-query` sbTXTSuffix = `sb.dns.adguard.com.` pcTXTSuffix = `pc.dns.adguard.com.` )
<mask> "github.com/miekg/dns" <mask> "golang.org/x/net/publicsuffix" <mask> ) <mask> <mask> const dnsTimeout = 3 * time.Second <mask> const defaultSafebrowsingServer = "https://dns-family.adguard.com/dns-query" <mask> const defaultParentalServer = "https://dns-family.adguard.com/dns-query" <mask> const sbTXT...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc.go
func (c *sbCtx) setCache(prefix, hashes []byte) {
<mask> expire byte[4] <mask> hash byte[32] <mask> ... <mask> */ <mask> func (c *sbCtx) setCache(prefix []byte, hashes []byte) { <mask> d := make([]byte, 4+len(hashes)) <mask> expire := uint(time.Now().Unix()) + c.cacheTime*60 <mask> binary.BigEndian.PutUint32(d[:4], uint32(expire)) <mask> copy(d[4:], hashe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc.go
b := &strings.Builder{} encoder := hex.NewEncoder(b)
<mask> } <mask> <mask> // convert hash array to string <mask> func (c *sbCtx) getQuestion() string { <mask> q := "" <mask> for hash := range c.hashToHost { <mask> q += fmt.Sprintf("%s.", hex.EncodeToString(hash[0:2])) <mask> } <mask> if c.svc == "SafeBrowsing" { <mask> q += sbTXTSuffix </s> Pull req...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc.go
// Ignore errors, since strings.(*Buffer).Write never returns // errors. // // TODO(e.burkov, a.garipov): Find out and document why exactly // this slice. _, _ = encoder.Write(hash[0:2]) _, _ = b.WriteRune('.')
<mask> // convert hash array to string <mask> func (c *sbCtx) getQuestion() string { <mask> q := "" <mask> for hash := range c.hashToHost { <mask> q += fmt.Sprintf("%s.", hex.EncodeToString(hash[0:2])) <mask> } <mask> if c.svc == "SafeBrowsing" { <mask> q += sbTXTSuffix <mask> } else { <mask> q += ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc.go
// See comment above. _, _ = b.WriteString(sbTXTSuffix) return b.String()
<mask> for hash := range c.hashToHost { <mask> q += fmt.Sprintf("%s.", hex.EncodeToString(hash[0:2])) <mask> } <mask> if c.svc == "SafeBrowsing" { <mask> q += sbTXTSuffix <mask> } else { <mask> q += pcTXTSuffix <mask> } <mask> return q <mask> } <mask> <mask> // Find the target hash in TXT respo...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc.go
// See comment above. _, _ = b.WriteString(pcTXTSuffix) return b.String()
<mask> q += sbTXTSuffix <mask> } else { <mask> q += pcTXTSuffix <mask> } <mask> return q <mask> } <mask> <mask> // Find the target hash in TXT response <mask> func (c *sbCtx) processTXT(resp *dns.Msg) (bool, [][]byte) { <mask> matched := false </s> Pull request:* all: fix all staticcheck simplificat...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc.go
svc: "SafeBrowsing", hashToHost: hashes,
<mask> _, ok = hashes[sha256.Sum256([]byte("com"))] <mask> assert.False(t, ok) <mask> <mask> c := &sbCtx{ <mask> svc: "SafeBrowsing", <mask> } <mask> <mask> // test getQuestion() <mask> c.hashToHost = hashes <mask> q := c.getQuestion() </s> Pull request:* all: fix all staticcheck simplification an...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc_test.go
<mask> c := &sbCtx{ <mask> svc: "SafeBrowsing", <mask> } <mask> <mask> // test getQuestion() <mask> c.hashToHost = hashes <mask> q := c.getQuestion() <mask> assert.True(t, strings.Index(q, "7a1b.") >= 0) <mask> assert.True(t, strings.Index(q, "af5a.") >= 0) <mask> assert.True(t, strings.Index(q, "e...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc_test.go
assert.True(t, strings.Contains(q, "7a1b.")) assert.True(t, strings.Contains(q, "af5a.")) assert.True(t, strings.Contains(q, "eb11.")) assert.True(t, strings.HasSuffix(q, "sb.dns.adguard.com."))
<mask> <mask> // test getQuestion() <mask> c.hashToHost = hashes <mask> q := c.getQuestion() <mask> assert.True(t, strings.Index(q, "7a1b.") >= 0) <mask> assert.True(t, strings.Index(q, "af5a.") >= 0) <mask> assert.True(t, strings.Index(q, "eb11.") >= 0) <mask> assert.True(t, strings.Index(q, "sb.dns.ad...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/dnsfilter/sb_pc_test.go
<mask> userName string <mask> expire uint32 // expiration time (in seconds) <mask> } <mask> <mask> /* <mask> expire byte[4] <mask> name_len byte[2] <mask> name byte[] <mask> */ <mask> func (s *session) serialize() []byte { <mask> var data []byte <mask> data = make([]byte, 4+2+len(s.userName)) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/auth.go
const ( expireLen = 4 nameLen = 2 ) data := make([]byte, expireLen+nameLen+len(s.userName))
<mask> name_len byte[2] <mask> name byte[] <mask> */ <mask> func (s *session) serialize() []byte { <mask> var data []byte <mask> data = make([]byte, 4+2+len(s.userName)) <mask> binary.BigEndian.PutUint32(data[0:4], s.expire) <mask> binary.BigEndian.PutUint16(data[4:6], uint16(len(s.userName))) <mask> copy...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/auth.go
func (a *Auth) UserFind(login, password string) User {
<mask> log.Debug("Auth: added user: %s", u.Name) <mask> } <mask> <mask> // UserFind - find a user <mask> func (a *Auth) UserFind(login string, password string) User { <mask> a.lock.Lock() <mask> defer a.lock.Unlock() <mask> for _, u := range a.users { <mask> if u.Name == login && <mask> bcrypt.Compa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/auth.go
<mask> "sync/atomic" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> var nextFilterID = time.Now().Unix() // semi-stable way to generate an uniq...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/filter.go
num := len(firstChunk) - firstChunkLen if n < num { num = n }
<mask> n, err := reader.Read(buf) <mask> total += n <mask> <mask> if htmlTest { <mask> // gather full buffer firstChunk and perform its data tests <mask> num := util.MinInt(n, len(firstChunk)-firstChunkLen) <mask> copied := copy(firstChunk[firstChunkLen:], buf[:num]) <mask> firstChunkLen += c...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/filter.go
if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") {
<mask> return false, fmt.Errorf("data contains non-printable characters") <mask> } <mask> <mask> s := strings.ToLower(string(firstChunk)) <mask> if strings.Index(s, "<html") >= 0 || <mask> strings.Index(s, "<!doctype") >= 0 { <mask> return false, fmt.Errorf("data is HTML, not plain te...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/filter.go
func Main(version, channel, armVer string) {
<mask> // Context - a global context object <mask> var Context homeContext <mask> <mask> // Main is the entry point <mask> func Main(version string, channel string, armVer string) { <mask> // Init update-related global variables <mask> versionString = version <mask> updateChannel = channel <mask> ARMVersi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/home.go
return os.IsNotExist(err)
<mask> if !filepath.IsAbs(configfile) { <mask> configfile = filepath.Join(Context.workDir, Context.configFilename) <mask> } <mask> _, err := os.Stat(configfile) <mask> if !os.IsNotExist(err) { <mask> // do nothing, file exists <mask> return false <mask> } <mask> return true <mask> } <mask> <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/home.go
msg := fmt.Sprintf("Unable to write response json: %s", err) log.Println(msg) http.Error(w, msg, http.StatusInternalServerError)
<mask> w.Header().Set("Content-Type", "text/plain") <mask> log.Printf("config.Language is %s", config.Language) <mask> _, err := fmt.Fprintf(w, "%s\n", config.Language) <mask> if err != nil { <mask> errorText := fmt.Sprintf("Unable to write response json: %s", err) <mask> log.Println(errorText) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/i18n.go
msg := fmt.Sprintf("failed to read request body: %s", err) log.Println(msg) http.Error(w, msg, http.StatusBadRequest)
<mask> <mask> func handleI18nChangeLanguage(w http.ResponseWriter, r *http.Request) { <mask> body, err := ioutil.ReadAll(r.Body) <mask> if err != nil { <mask> errorText := fmt.Sprintf("failed to read request body: %s", err) <mask> log.Println(errorText) <mask> http.Error(w, errorText, http.StatusBadRequ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/i18n.go
msg := "empty language specified" log.Println(msg) http.Error(w, msg, http.StatusBadRequest)
<mask> } <mask> <mask> language := strings.TrimSpace(string(body)) <mask> if language == "" { <mask> errorText := fmt.Sprintf("empty language specified") <mask> log.Println(errorText) <mask> http.Error(w, errorText, http.StatusBadRequest) <mask> return <mask> } <mask> if !isLanguageAllowed(langu...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/i18n.go
msg := fmt.Sprintf("unknown language specified: %s", language) log.Println(msg) http.Error(w, msg, http.StatusBadRequest)
<mask> http.Error(w, errorText, http.StatusBadRequest) <mask> return <mask> } <mask> if !isLanguageAllowed(language) { <mask> errorText := fmt.Sprintf("unknown language specified: %s", language) <mask> log.Println(errorText) <mask> http.Error(w, errorText, http.StatusBadRequest) <mask> return <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/i18n.go
for range ticker.C { log.Debug("free os memory") debug.FreeOSMemory()
<mask> // periodically call "debug.FreeOSMemory" so <mask> // that the OS could reclaim the free memory <mask> go func() { <mask> ticker := time.NewTicker(5 * time.Minute) <mask> for { <mask> select { <mask> case t := <-ticker.C: <mask> t.Second() <mask> log.Debug("Free OS memory") <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/memory.go
ip := <-r.ipChannel
<mask> // Wait for a signal and then synchronously resolve hostname by IP address <mask> // Add the hostname:IP pair to "Clients" array <mask> func (r *RDNS) workerLoop() { <mask> for { <mask> var ip string <mask> ip = <-r.ipChannel <mask> <mask> host := r.resolve(ip) <mask> if len(host) == 0 { <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/rdns.go
if util.IsOpenWRT() {
<mask> if err != nil { <mask> log.Fatal(err) <mask> } <mask> <mask> if util.IsOpenWrt() { <mask> // On OpenWrt it is important to run enable after the service installation <mask> // Otherwise, the service won't start on the system startup <mask> _, err := runInitdCommand("enable") <mask> if err !...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/service.go
if util.IsOpenWRT() {
<mask> } <mask> <mask> // handleServiceStatusCommand handles service "uninstall" command <mask> func handleServiceUninstallCommand(s service.Service) { <mask> if util.IsOpenWrt() { <mask> // On OpenWrt it is important to run disable command first <mask> // as it will remove the symlink <mask> _, err := ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/service.go
// Use modified service file templates.
<mask> // POSIX <mask> // Redirect StdErr & StdOut to files. <mask> c.Option["LogOutput"] = true <mask> <mask> // Use modified service file templates <mask> c.Option["SystemdScript"] = systemdScript <mask> c.Option["SysvScript"] = sysvScript <mask> <mask> // On OpenWrt we're using a different type of ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/service.go
// On OpenWrt we're using a different type of sysvScript. if util.IsOpenWRT() {
<mask> // Use modified service file templates <mask> c.Option["SystemdScript"] = systemdScript <mask> c.Option["SysvScript"] = sysvScript <mask> <mask> // On OpenWrt we're using a different type of sysvScript <mask> if util.IsOpenWrt() { <mask> c.Option["SysvScript"] = openWrtScript <mask> } else if ut...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/service.go
} else if runtime.GOOS == "freebsd" {
<mask> <mask> // On OpenWrt we're using a different type of sysvScript <mask> if util.IsOpenWrt() { <mask> c.Option["SysvScript"] = openWrtScript <mask> } else if util.IsFreeBSD() { <mask> c.Option["SysvScript"] = freeBSDScript <mask> } <mask> } <mask> <mask> // runInitdCommand runs init.d service c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/service.go
func verifyCertChain(data *tlsConfigStatus, certChain, serverName string) error {
<mask> }() <mask> } <mask> } <mask> <mask> func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string) error { <mask> log.Tracef("TLS: got certificate: %d bytes", len(certChain)) <mask> <mask> // now do a more extended validation <mask> var certs []*pem.Block // PEM-encoded certifi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/tls.go
data.WarningValidation = "You have specified an empty certificate"
<mask> parsedCerts = append(parsedCerts, parsed) <mask> } <mask> <mask> if len(parsedCerts) == 0 { <mask> data.WarningValidation = fmt.Sprintf("You have specified an empty certificate") <mask> return errors.New(data.WarningValidation) <mask> } <mask> <mask> data.ValidCert = true <mask> </s> Pull...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/tls.go
func (w *Whois) query(target, serverAddr string) (string, error) {
<mask> return m <mask> } <mask> <mask> // Send request to a server and receive the response <mask> func (w *Whois) query(target string, serverAddr string) (string, error) { <mask> addr, _, _ := net.SplitHostPort(serverAddr) <mask> if addr == "whois.arin.net" { <mask> target = "n + " + target <mask> } <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/whois.go
ip := <-w.ipChan
<mask> <mask> // Get IP address from channel; get WHOIS info; associate info with a client <mask> func (w *Whois) workerLoop() { <mask> for { <mask> var ip string <mask> ip = <-w.ipChan <mask> <mask> info := w.process(ip) <mask> if len(info) == 0 { <mask> continue <mask> } </s> Pull request:...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/home/whois.go
func UIntArrayEquals(a, b []uint64) bool {
<mask> <mask> "github.com/stretchr/testify/assert" <mask> ) <mask> <mask> func UIntArrayEquals(a []uint64, b []uint64) bool { <mask> if len(a) != len(b) { <mask> return false <mask> } <mask> <mask> for i := range a { </s> Pull request:* all: fix all staticcheck simplification and unused warnings Me...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/stats/stats_test.go
var hour int32 = 1
<mask> os.Remove(conf.Filename) <mask> } <mask> <mask> func TestLargeNumbers(t *testing.T) { <mask> var hour int32 <mask> hour = 1 <mask> newID := func() uint32 { <mask> // use "atomic" to make Go race detector happy <mask> return uint32(atomic.LoadInt32(&hour)) <mask> } <mask> </s> Pull request:...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/stats/stats_test.go
s.db, err = bolt.Open(s.conf.Filename, 0o644, nil)
<mask> <mask> func (s *statsCtx) dbOpen() bool { <mask> var err error <mask> log.Tracef("db.Open...") <mask> s.db, err = bolt.Open(s.conf.Filename, 0644, nil) <mask> if err != nil { <mask> log.Error("Stats: open DB: %s: %s", s.conf.Filename, err) <mask> if err.Error() == "invalid argument" { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/stats/stats_unit.go
return a[j].Count < a[i].Count
<mask> pair.Count = v <mask> a = append(a, pair) <mask> } <mask> less := func(i, j int) bool { <mask> if a[i].Count >= a[j].Count { <mask> return true <mask> } <mask> return false <mask> } <mask> sort.Slice(a, less) <mask> if max > len(a) { <mask> max = len(a) <mask> } </s> Pull reque...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/stats/stats_unit.go
udb.NResult = append(udb.NResult, u.nResult...)
<mask> <mask> func serialize(u *unit) *unitDB { <mask> udb := unitDB{} <mask> udb.NTotal = u.nTotal <mask> for _, it := range u.nResult { <mask> udb.NResult = append(udb.NResult, it) <mask> } <mask> if u.nTotal != 0 { <mask> udb.TimeAvg = uint32(u.timeSum / u.nTotal) <mask> } <mask> udb.Domains =...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/stats/stats_unit.go
// Per-hour units. units := []*unitDB{}
<mask> curUnit := serialize(s.unit) <mask> curID := s.unit.id <mask> s.unitLock.Unlock() <mask> <mask> units := []*unitDB{} //per-hour units <mask> firstID := curID - limit + 1 <mask> for i := firstID; i != curID; i++ { <mask> u := s.loadUnitFromDB(tx, i) <mask> if u == nil { <mask> u = &unitDB{...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/stats/stats_unit.go
if IsOpenWRT() {
<mask> if len(hostsFn) != 0 { <mask> a.hostsFn = hostsFn <mask> } <mask> <mask> if IsOpenWrt() { <mask> a.hostsDirs = append(a.hostsDirs, "/tmp/hosts") // OpenWRT: "/tmp/hosts/dhcp.cfg01411c" <mask> } <mask> <mask> // Load hosts initially <mask> a.updateHosts() </s> Pull request:* all: fix all st...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
// Process returns the list of IP addresses for the hostname or nil if nothing // found.
<mask> _ = a.watcher.Close() <mask> } <mask> } <mask> <mask> // Process - get the list of IP addresses for the hostname <mask> // Return nil if not found <mask> func (a *AutoHosts) Process(host string, qtype uint16) []net.IP { <mask> if qtype == dns.TypePTR { <mask> return nil <mask> } <mask> </s> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
if ips, ok := a.table[host]; ok {
<mask> } <mask> <mask> var ipsCopy []net.IP <mask> a.lock.Lock() <mask> ips, _ := a.table[host] <mask> if len(ips) != 0 { <mask> ipsCopy = make([]net.IP, len(ips)) <mask> copy(ipsCopy, ips) <mask> } <mask> a.lock.Unlock() <mask> </s> Pull request:* all: fix all staticcheck simplification and un...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
<mask> if !ok { <mask> return <mask> } <mask> <mask> // skip duplicate events <mask> repeat := true <mask> for repeat { <mask> select { <mask> case _ = <-a.watcher.Events: <mask> // skip this event </s> Pull request:* all: fix all staticcheck simplification and unused warning...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
case <-a.watcher.Events: // Skip this duplicating event
<mask> // skip duplicate events <mask> repeat := true <mask> for repeat { <mask> select { <mask> case _ = <-a.watcher.Events: <mask> // skip this event <mask> default: <mask> repeat = false <mask> } <mask> } <mask> </s> Pull request:* all: fix all staticcheck simplific...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
// updateLoop reads static hosts from system files.
<mask> } <mask> } <mask> } <mask> <mask> // updateLoop - read static hosts from system files <mask> func (a *AutoHosts) updateLoop() { <mask> for { <mask> select { <mask> case ok := <-a.updateChan: <mask> if !ok { </s> Pull request:* all: fix all staticcheck simplification and unused warnings Me...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
for ok := range a.updateChan { if !ok { log.Debug("Finished AutoHosts update loop") return
<mask> } <mask> <mask> // updateLoop - read static hosts from system files <mask> func (a *AutoHosts) updateLoop() { <mask> for { <mask> select { <mask> case ok := <-a.updateChan: <mask> if !ok { <mask> log.Debug("Finished AutoHosts update loop") <mask> return <mask> } <mask> <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/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
a.updateHosts()
<mask> log.Debug("Finished AutoHosts update loop") <mask> return <mask> } <mask> } <mask> } <mask> <mask> // updateHosts - loads system hosts <mask> func (a *AutoHosts) updateHosts() { </s> Pull request:* all: fix all staticcheck simplification and unused warnings Merge in DNS/adguard-home from 2270...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/auto_hosts.go
// ContainsString checks if string is in the slice of strings. func ContainsString(strs []string, str string) bool { for _, s := range strs { if s == str {
<mask> "runtime" <mask> "strings" <mask> ) <mask> <mask> // ContainsString checks if "v" is in the array "arr" <mask> func ContainsString(arr []string, v string) bool { <mask> for _, i := range arr { <mask> if i == v { <mask> return true <mask> } <mask> } <mask> return false <mask> } </s> Pul...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/helpers.go
// FileExists returns true if file exists.
<mask> } <mask> return false <mask> } <mask> <mask> // fileExists returns TRUE if file exists <mask> func FileExists(fn string) bool { <mask> _, err := os.Stat(fn) <mask> if err != nil { <mask> return false <mask> } </s> Pull request:* all: fix all staticcheck simplification and unused warnings Merg...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/helpers.go
return err == nil
<mask> <mask> // fileExists returns TRUE if file exists <mask> func FileExists(fn string) bool { <mask> _, err := os.Stat(fn) <mask> if err != nil { <mask> return false <mask> } <mask> return true <mask> } <mask> <mask> // runCommand runs shell command <mask> func RunCommand(command string, argument...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/helpers.go
// RunCommand runs shell command.
<mask> } <mask> return true <mask> } <mask> <mask> // runCommand runs shell command <mask> func RunCommand(command string, arguments ...string) (int, string, error) { <mask> cmd := exec.Command(command, arguments...) <mask> out, err := cmd.Output() <mask> if err != nil { <mask> return 1, "", fmt.Error...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/helpers.go
// IsOpenWRT checks if OS is OpenWRT. func IsOpenWRT() bool {
<mask> } <mask> return strings.TrimSpace(s) <mask> } <mask> <mask> // MinInt - return the minimum value <mask> func MinInt(a, b int) int { <mask> if a < b { <mask> return a <mask> } <mask> return b <mask> } <mask> <mask> // IsOpenWrt checks if OS is OpenWRT <mask> func IsOpenWrt() bool { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/helpers.go
<mask> } <mask> <mask> return strings.Contains(string(body), "OpenWrt") <mask> } <mask> <mask> // IsFreeBSD checks if OS is FreeBSD <mask> func IsFreeBSD() bool { <mask> if runtime.GOOS == "freebsd" { <mask> return true <mask> } <mask> <mask> return false <mask> } </s> Pull request:* all: fix al...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3
internal/util/helpers.go
// Package aghos contains utilities for functions requiring system calls and // other OS-specific APIs. OS-specific network handling should go to aghnet // instead.
<mask> // Package aghos contains utilities for functions requiring system calls. <mask> package aghos <mask> <mask> import ( <mask> "fmt" <mask> "os/exec" </s> Pull request: all: imp ipset, add tests Closes #2611. Squashed commit of the following: commit f72577757e5cd0299863ccc01780ad9307adc6ea Author: Ain...
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/aghos/os.go
// IpsetList is the ipset configuration that allows AdGuard Home to add // IP addresses of the specified domain names to an ipset list. Syntax: // // DOMAIN[,DOMAIN].../IPSET_NAME // IpsetList []string `yaml:"ipset"`
<mask> EnableDNSSEC bool `yaml:"enable_dnssec"` // Set DNSSEC flag in outcoming DNS request <mask> EnableEDNSClientSubnet bool `yaml:"edns_client_subnet"` // Enable EDNS Client Subnet option <mask> MaxGoroutines uint32 `yaml:"max_goroutines"` // Max. number of parallel gorout...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/dnsforward/config.go
<mask> import ( <mask> "fmt" <mask> "net" <mask> "net/http" <mask> "os" <mask> "runtime" <mask> "strings" <mask> "sync" <mask> "time" <mask> </s> Pull request: all: imp ipset, add tests Closes #2611. Squashed commit of the following: commit f72577757e5cd0299863ccc01780ad9307adc6ea Author: Ainar G...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/dnsforward/dnsforward.go
if err := s.ipset.close(); err != nil {
<mask> s.stats = nil <mask> s.queryLog = nil <mask> s.dnsProxy = nil <mask> <mask> if err := s.ipset.Close(); err != nil { <mask> log.Error("closing ipset: %s", err) <mask> } <mask> } <mask> <mask> // WriteDiskConfig - write configuration </s> Pull request: all: imp ipset, add tests Closes #2611. ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/dnsforward/dnsforward.go
// Initialize ipset configuration
<mask> // Set default values in the case if nothing is configured <mask> // -- <mask> s.initDefaultSettings() <mask> <mask> // Initialize IPSET configuration <mask> // -- <mask> err := s.ipset.init(s.conf.IPSETList) <mask> if err != nil { <mask> if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/dnsforward/dnsforward.go
err := s.ipset.init(s.conf.IpsetList)
<mask> s.initDefaultSettings() <mask> <mask> // Initialize IPSET configuration <mask> // -- <mask> err := s.ipset.init(s.conf.IPSETList) <mask> if err != nil { <mask> if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) { <mask> return fmt.Errorf("cannot initialize ipset: %w", err) ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/dnsforward/dnsforward.go
return err
<mask> // Initialize IPSET configuration <mask> // -- <mask> err := s.ipset.init(s.conf.IPSETList) <mask> if err != nil { <mask> if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) { <mask> return fmt.Errorf("cannot initialize ipset: %w", err) <mask> } <mask> <mask> // ipset ca...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/dnsforward/dnsforward.go
log.Debug("inited ipset")
<mask> return err <mask> } <mask> <mask> // Prepare DNS servers settings <mask> // -- <mask> err = s.prepareUpstreamSettings() <mask> if err != nil { <mask> return err <mask> } </s> Pull request: all: imp ipset, add tests Closes #2611. Squashed commit of the following: commit f72577757e5cd029986...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa
internal/dnsforward/dnsforward.go
// To transfer information between modules type dnsContext struct { srv *Server proxyCtx *proxy.DNSContext setts *dnsfilter.RequestFilteringSettings // filtering settings for this client startTime time.Time result *dnsfilter.Result origResp ...
<mask> <mask> return true, nil <mask> } <mask> <mask> // handleDNSRequest filters the incoming DNS requests and writes them to the query log <mask> // nolint (gocyclo) <mask> func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error { <mask> start := time.Now() <mask> <mask> if s.conf...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
// Perform initial checks; process WHOIS & rDNS func processInitial(ctx *dnsContext) int { s := ctx.srv d := ctx.proxyCtx
<mask> ) <mask> <mask> if s.conf.AAAADisabled && d.Req.Question[0].Qtype == dns.TypeAAAA { <mask> _ = proxy.CheckDisabledAAAARequest(d, true) <mask> return resultFinish <mask> } </s> Merge: * dns: refactor Squashed commit of the following: commit e9469266cafa3df537b5a4d5e28ca51db8289a34 Merge: 17cf6d60 ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
return resultFinish
<mask> start := time.Now() <mask> <mask> if s.conf.AAAADisabled && d.Req.Question[0].Qtype == dns.TypeAAAA { <mask> _ = proxy.CheckDisabledAAAARequest(d, true) <mask> return nil <mask> } <mask> <mask> if s.conf.OnDNSRequest != nil { <mask> s.conf.OnDNSRequest(d) <mask> } </s> Merge: * dns: refac...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
return resultFinish
<mask> // disable Mozilla DoH <mask> if (d.Req.Question[0].Qtype == dns.TypeA || d.Req.Question[0].Qtype == dns.TypeAAAA) && <mask> d.Req.Question[0].Name == "use-application-dns.net." { <mask> d.Res = s.genNXDomain(d.Req) <mask> return nil <mask> } <mask> <mask> // use dnsfilter before cache -- chan...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
return resultDone } // Apply filtering logic func processFilteringBeforeRequest(ctx *dnsContext) int { s := ctx.srv d := ctx.proxyCtx
<mask> d.Res = s.genNXDomain(d.Req) <mask> return nil <mask> } <mask> <mask> // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise <mask> s.RLock() <mask> // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use. <mask> /...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
<mask> // A better approach is for proxy.Stop() to wait until all its workers exit, <mask> // but this would require the Upstream interface to have Close() function <mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond). <mask> <mask> var setts *dnsfilter.RequestFilteringSe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil if ctx.protectionEnabled { ctx.setts = s.getClientRequestFilteringSettings(d) ctx.result, err = s.filterDNSRequest(ctx)
<mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond). <mask> <mask> var setts *dnsfilter.RequestFilteringSettings <mask> var err error <mask> res := &dnsfilter.Result{} <mask> protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil <mask> if protectionEnabl...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
ctx.err = err return resultError
<mask> res, err = s.filterDNSRequest(d, setts) <mask> } <mask> s.RUnlock() <mask> if err != nil { <mask> return err <mask> } <mask> <mask> var origResp *dns.Msg <mask> if d.Res == nil { <mask> answer := []dns.RR{} </s> Merge: * dns: refactor Squashed commit of the following: commit e9469266caf...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
return resultDone }
<mask> ctx.err = err <mask> return resultError <mask> } <mask> <mask> // Pass request to upstream servers; process the response <mask> func processUpstream(ctx *dnsContext) int { <mask> s := ctx.srv <mask> d := ctx.proxyCtx </s> Merge: * dns: refactor Squashed commit of the following: commit e946926...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
// Pass request to upstream servers; process the response func processUpstream(ctx *dnsContext) int { s := ctx.srv d := ctx.proxyCtx if d.Res != nil { return resultDone // response is already set - nothing to do }
<mask> if err != nil { <mask> return err <mask> } <mask> <mask> var origResp *dns.Msg <mask> if d.Res == nil { <mask> answer := []dns.RR{} <mask> originalQuestion := d.Req.Question[0] <mask> <mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { <mask> answer = append(a...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
if d.Addr != nil && s.conf.GetUpstreamsByClient != nil { clientIP := ipFromAddr(d.Addr) upstreams := s.conf.GetUpstreamsByClient(clientIP) if len(upstreams) > 0 { log.Debug("Using custom upstreams for %s", clientIP) d.Upstreams = upstreams
<mask> if d.Res == nil { <mask> answer := []dns.RR{} <mask> originalQuestion := d.Req.Question[0] <mask> <mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { <mask> answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName)) <mask> // resolve canonical name, not the orig...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
}
<mask> d.Upstreams = upstreams <mask> } <mask> <mask> // request was not filtered so let it be processed further <mask> err := s.dnsProxy.Resolve(d) <mask> if err != nil { </s> Merge: * dns: refactor Squashed commit of the following: commit e9469266cafa3df537b5a4d5e28ca51db8289a34 Merge: 17cf6d60 e7e9...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
// request was not filtered so let it be processed further err := s.dnsProxy.Resolve(d) if err != nil { ctx.err = err return resultError }
<mask> // resolve canonical name, not the original host name <mask> d.Req.Question[0].Name = dns.Fqdn(res.CanonName) <mask> } <mask> <mask> if d.Addr != nil && s.conf.GetUpstreamsByClient != nil { <mask> clientIP := ipFromAddr(d.Addr) <mask> upstreams := s.conf.GetUpstreamsByClient(clientIP) <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
ctx.responseFromUpstream = true return resultDone }
<mask> d.Upstreams = upstreams <mask> } <mask> } <mask> <mask> // request was not filtered so let it be processed further <mask> err = p.Resolve(d) <mask> if err != nil { <mask> return err <mask> } <mask> <mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
// Apply filtering logic after we have received response from upstream servers func processFilteringAfterResponse(ctx *dnsContext) int { s := ctx.srv d := ctx.proxyCtx res := ctx.result var err error
<mask> if err != nil { <mask> return err <mask> } <mask> <mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { <mask> d.Req.Question[0] = originalQuestion <mask> d.Res.Question[0] = originalQuestion <mask> <mask> if len(d.Res.Answer) != 0 { <mask> answer = append...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
if !ctx.responseFromUpstream { return resultDone // don't process response if it's not from upstream servers }
<mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { <mask> d.Req.Question[0] = originalQuestion <mask> d.Res.Question[0] = originalQuestion <mask> <mask> if len(d.Res.Answer) != 0 { <mask> answer = append(answer, d.Res.Answer...) // host -> IP <mask> d.Res.Answer = an...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { d.Req.Question[0] = ctx.origQuestion d.Res.Question[0] = ctx.origQuestion if len(d.Res.Answer) != 0 { answer := []dns.RR{} answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName)) answer = append(answer, d.Res.Answer...) // ho...
<mask> answer = append(answer, d.Res.Answer...) // host -> IP <mask> d.Res.Answer = answer <mask> } <mask> <mask> } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled { <mask> origResp2 := d.Res <mask> res, err = s.filterDNSResponse(d, setts) <mask> if err != nil { ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
<mask> } else { <mask> res = &dnsfilter.Result{} <mask> } <mask> } <mask> } <mask> <mask> if d.Res != nil { <mask> d.Res.Compress = true // some devices require DNS message compression <mask> } <mask> </s> Merge: * dns: refactor Squashed commit of the following: commit e9469266cafa3df537...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
} else if res.Reason != dnsfilter.NotFilteredWhiteList && ctx.protectionEnabled { origResp2 := d.Res ctx.result, err = s.filterDNSResponse(ctx) if err != nil { ctx.err = err return resultError } if ctx.result != nil { ctx.origResp = origResp2 // matched by response } else { ctx.result = &dnsfil...
<mask> } <mask> } <mask> } <mask> <mask> if d.Res != nil { <mask> d.Res.Compress = true // some devices require DNS message compression <mask> } <mask> <mask> shouldLog := true <mask> msg := d.Req <mask> </s> Merge: * dns: refactor Squashed commit of the following: commit e9469266cafa3df537...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
return resultDone } // Write Stats data and logs func processQueryLogsAndStats(ctx *dnsContext) int { elapsed := time.Since(ctx.startTime) s := ctx.srv d := ctx.proxyCtx
<mask> } <mask> <mask> shouldLog := true <mask> msg := d.Req <mask> <mask> // don't log ANY request if refuseAny is enabled <mask> if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { </s> Merge: * dns: refactor Squashed commit of the following: commit e9469266cafa3df...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
<mask> if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny { <mask> shouldLog = false <mask> } <mask> <mask> elapsed := time.Since(start) <mask> s.RLock() <mask> // Synchronize access to s.queryLog and s.stats so they won't be suddenly uninitialized while in use. <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
OrigAnswer: ctx.origResp, Result: ctx.result,
<mask> if shouldLog && s.queryLog != nil { <mask> p := querylog.AddParams{ <mask> Question: msg, <mask> Answer: d.Res, <mask> OrigAnswer: origResp, <mask> Result: res, <mask> Elapsed: elapsed, <mask> ClientIP: getIP(d.Addr), <mask> } <mask> if d.Upstream != nil { <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
s.updateStats(d, elapsed, *ctx.result)
<mask> } <mask> s.queryLog.Add(p) <mask> } <mask> <mask> s.updateStats(d, elapsed, *res) <mask> s.RUnlock() <mask> <mask> return nil <mask> } <mask> </s> Merge: * dns: refactor Squashed commit of the following: commit e9469266cafa3df537b5a4d5e28ca51db8289a34 Merge: 17cf6d60 e7e946fa Author: Simo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) { d := ctx.proxyCtx
<mask> return &setts <mask> } <mask> <mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered <mask> func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) { <mask> req := d.Req <mask> host := strings.Tri...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts)
<mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered <mask> func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) { <mask> req := d.Req <mask> host := strings.TrimSuffix(req.Question[0].Name, ".") <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
} else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { ctx.origQuestion = d.Req.Question[0] // resolve canonical name, not the original host name d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
<mask> } <mask> } <mask> <mask> d.Res = resp <mask> } <mask> <mask> return &res, err <mask> } <mask> <mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address. </s> Merge: * dns: refactor Squashed commit of the following: commit e94692...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) { d := ctx.proxyCtx
<mask> } <mask> <mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address. <mask> // If this is a match, we set a new response in d.Res and return. <mask> func (s *Server) filterDNSResponse(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts)
<mask> if !s.conf.ProtectionEnabled || s.dnsFilter == nil { <mask> s.RUnlock() <mask> continue <mask> } <mask> res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts) <mask> s.RUnlock() <mask> <mask> if err != nil { <mask> return nil, err <mask> </s> Merge: * dns: re...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e
dnsforward/dnsforward.go
ProtectionEnabled bool `yaml:"protection_enabled"`
<mask> coreFile string <mask> FilterFile string `yaml:"-"` <mask> Port int `yaml:"port"` <mask> FilteringEnabled bool `yaml:"filtering_enabled"` <mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"` <mask> SafeSearchEnabled bool `yaml:"safes...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd
config.go
ProtectionEnabled: true,
<mask> Port: 53, <mask> binaryFile: "coredns", // only filename, no path <mask> coreFile: "Corefile", // only filename, no path <mask> FilterFile: "dnsfilter.txt", // only filename, no path <mask> FilteringEnabled: true, <mask> SafeBrowsingEnab...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd
config.go
{{if .ProtectionEnabled}}dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} {
<mask> return nil <mask> } <mask> <mask> const coreDNSConfigTemplate = `. { <mask> dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} { <mask> {{if .SafeBrowsingEnabled}}safebrowsing{{end}} <mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivity}}{{end}} <mask> {{if .Sa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd
config.go
}{{end}}
<mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivity}}{{end}} <mask> {{if .SafeSearchEnabled}}safesearch{{end}} <mask> {{if .QueryLogEnabled}}querylog{{end}} <mask> blocked_ttl {{.BlockedResponseTTL}} <mask> } <mask> {{.Pprof}} <mask> hosts { <mask> f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd
config.go
"dns_address": config.BindHost, "dns_port": config.CoreDNS.Port, "protection_enabled": config.CoreDNS.ProtectionEnabled, "querylog_enabled": config.CoreDNS.QueryLogEnabled, "running": isRunning(), "upstream_dns": config.CoreDNS.UpstreamDNS, "version": Version...
<mask> } <mask> <mask> func handleStatus(w http.ResponseWriter, r *http.Request) { <mask> data := map[string]interface{}{ <mask> "running": isRunning(), <mask> "version": VersionString, <mask> "dns_address": config.BindHost, <mask> "dns_port": config.CoreDNS.Port, <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd
control.go
func handleProtectionEnable(w http.ResponseWriter, r *http.Request) { config.CoreDNS.ProtectionEnabled = true httpUpdateConfigReloadDNSReturnOK(w, r) } func handleProtectionDisable(w http.ResponseWriter, r *http.Request) { config.CoreDNS.ProtectionEnabled = false httpUpdateConfigReloadDNSReturnOK(w, r) }
<mask> } <mask> <mask> // ----- <mask> // stats <mask> // ----- <mask> func handleStats(w http.ResponseWriter, r *http.Request) { <mask> resp, err := client.Get("http://127.0.0.1:8618/stats") </s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kind...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd
control.go
httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> } <mask> <mask> func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) { <mask> config.CoreDNS.QueryLogEnabled = true <mask> err := writeAllConfigsAndReloadCoreDNS() <mask> if err != nil { <mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err) <mask> log.Println(errorte...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd
control.go