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
<mask> "use_adguard_browsing_sec_hint": "AdGuard Home controleert of het domein in de blokkeerlijst voorkomt dmv Browsing Security web service. Dit gebeurt dmv een privacy vriendelijk API verzoek:een korte prefix van de domein naam met SHA256 hash wordt verzonden naar de server.", <mask> "use_adguard_parental...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/nl.json
<mask> "example_meaning_host_block": "AdGuard Home zal nu het adres 127.0.0.1 voor het domein example.org retourneren (maar niet de subdomeinen).", <mask> "example_comment": "! Hier komt een opmerking", <mask> "example_comment_meaning": "zomaar een opmerking", <mask> "example_comment_hash": "# Nog e...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/nl.json
import { renderField, renderRadioField, renderSelectField, renderServiceField, ip, mac, required } from '../../../helpers/form';
<mask> import flow from 'lodash/flow'; <mask> <mask> import Tabs from '../../ui/Tabs'; <mask> import { toggleAllServices } from '../../../helpers/helpers'; <mask> import { renderField, renderRadioField, renderSelectField, renderServiceField, ipv4, mac, required } from '../../../helpers/form'; <mask> import { CLI...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/components/Settings/Clients/Form.js
validate={[ip, required]}
<mask> component={renderField} <mask> type="text" <mask> className="form-control" <mask> placeholder={t('form_enter_ip')} <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/components/Settings/Clients/Form.js
return <Trans>form_error_ip4_format</Trans>; } return false; }; export const ipv6 = (value) => { if (value && !new RegExp(R_IPV6).test(value)) { return <Trans>form_error_ip6_format</Trans>; } return false; }; export const ip = (value) => { if (value && !new RegExp(R_IPV4).test(...
<mask> export const ipv4 = (value) => { <mask> if (value && !new RegExp(R_IPV4).test(value)) { <mask> return <Trans>form_error_ip_format</Trans>; <mask> } <mask> return false; <mask> }; </s> - client: allow add ip-v6 to exceptions </s> remove import { renderField, renderRadioField, renderSele...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/helpers/form.js
"github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/AdguardTeam/golibs/stringutil" <mask> "github.com/AdguardTeam/urlfilter" <mask> "github.com/AdguardTeam/urlfilter/filterlist" <mask> "github.com/miekg/dns" <mask> ) <mask> <mask> // DefaultHostsPaths returns the slice of paths default for the operating system </s> Pull request: 3815 fix ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
// is intended to be used within fs.FS so the initial slash is omitted.
<mask> ) <mask> <mask> // DefaultHostsPaths returns the slice of paths default for the operating system <mask> // to files and directories which are containing the hosts database. The result <mask> // is intended to use within fs.FS so the initial slash is omitted. <mask> func DefaultHostsPaths() (paths []strin...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
// updates is the channel for receiving updated hosts.
<mask> rulesStrg *filterlist.RuleStorage <mask> // engine serves rulesStrg. <mask> engine *urlfilter.DNSEngine <mask> <mask> // Updates is the channel for receiving updated hosts. The receivable map's <mask> // values has a type of slice of strings. <mask> updates chan *netutil.IPMap <mask> <mask> //...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
// last is the set of hosts that was cached within last detected change. last *netutil.IPMap
<mask> // updates is the channel for receiving updated hosts. <mask> updates chan *netutil.IPMap <mask> <mask> // fsys is the working file system to read hosts files from. <mask> fsys fs.FS <mask> </s> Pull request: 3815 fix hosts container rewrites Merge in DNS/adguard-home from 3815-weird-rewrites to ma...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
last: &netutil.IPMap{},
<mask> engLock: &sync.RWMutex{}, <mask> updates: make(chan *netutil.IPMap, 1), <mask> fsys: fsys, <mask> w: w, <mask> patterns: patterns, <mask> } <mask> </s> Pull request: 3815 fix hosts container rewrites Merge in DNS/adguard-home from 3815-weird-rewrites to master Updates #3815. S...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
res, ok = hc.engine.MatchRequest(req) return res, ok
<mask> <mask> hc.engLock.RLock() <mask> defer hc.engLock.RUnlock() <mask> <mask> return hc.engine.MatchRequest(req) <mask> } <mask> <mask> // Close implements the io.Closer interface for *HostsContainer. <mask> func (hc *HostsContainer) Close() (err error) { <mask> log.Debug("%s: closing hosts containe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
log.Debug("%s: closing", hostsContainerPref)
<mask> } <mask> <mask> // Close implements the io.Closer interface for *HostsContainer. <mask> func (hc *HostsContainer) Close() (err error) { <mask> log.Debug("%s: closing hosts container", hostsContainerPref) <mask> <mask> return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
// Upd returns the channel into which the updates are sent. The receivable // map's values are guaranteed to be of type of *stringutil.Set.
<mask> <mask> return errors.Annotate(hc.w.Close(), "%s: closing: %w", hostsContainerPref) <mask> } <mask> <mask> // Upd returns the channel into which the updates are sent. <mask> func (hc *HostsContainer) Upd() (updates <-chan *netutil.IPMap) { <mask> return hc.updates <mask> } <mask> <mask> // pathsToP...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
func (hc *HostsContainer) newHostsParser() (hp *hostsParser) { return &hostsParser{ rules: &strings.Builder{}, table: netutil.NewIPMap(hc.last.Len()), } } // parseFile is a aghos.FileWalker for parsing the files with hosts syntax. It // never signs to stop walking and never returns any additional patterns.
<mask> // updates channel afterwards. <mask> table *netutil.IPMap <mask> } <mask> <mask> // parseHostsFile is a aghtest.FileWalker for parsing the files with hosts <mask> // syntax. It never signs to stop the walking. <mask> // <mask> // See man hosts(5). <mask> func (hp hostsParser) parseHostsFile( <mask...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
func (hp *hostsParser) parseFile(
<mask> // parseHostsFile is a aghtest.FileWalker for parsing the files with hosts <mask> // syntax. It never signs to stop the walking. <mask> // <mask> // See man hosts(5). <mask> func (hp hostsParser) parseHostsFile( <mask> r io.Reader, <mask> ) (patterns []string, cont bool, err error) { <mask> s := bufio...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
func (hp *hostsParser) parseLine(line string) (ip net.IP, hosts []string) {
<mask> return nil, true, s.Err() <mask> } <mask> <mask> // parseLine parses the line having the hosts syntax ignoring invalid ones. <mask> func (hp hostsParser) parseLine(line string) (ip net.IP, hosts []string) { <mask> line = strings.TrimSpace(line) <mask> fields := strings.Fields(line) <mask> if len(fie...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
func (hp *hostsParser) add(ip net.IP, host string) (added bool) {
<mask> return ip, hosts <mask> } <mask> <mask> // add returns true if the pair of ip and host wasn't added to the hp before. <mask> func (hp hostsParser) add(ip net.IP, host string) (added bool) { <mask> v, ok := hp.table.Get(ip) <mask> hosts, _ := v.([]string) <mask> if ok && stringutil.InSlice(hosts, hos...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
hosts, _ := v.(*stringutil.Set) switch { case ok && hosts.Has(host):
<mask> <mask> // add returns true if the pair of ip and host wasn't added to the hp before. <mask> func (hp hostsParser) add(ip net.IP, host string) (added bool) { <mask> v, ok := hp.table.Get(ip) <mask> hosts, _ := v.([]string) <mask> if ok && stringutil.InSlice(hosts, host) { <mask> return false <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
case hosts == nil: hosts = stringutil.NewSet(host) hp.table.Set(ip, hosts) default: hosts.Add(host)
<mask> hosts, _ := v.(*stringutil.Set) <mask> switch { <mask> case ok && hosts.Has(host): <mask> return false <mask> } <mask> <mask> return true <mask> } </s> Pull request: 3815 fix hosts container rewrites Merge in DNS/adguard-home from 3815-weird-rewrites to master Updates #3815. Squashed commit o...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
<mask> if ok && stringutil.InSlice(hosts, host) { <mask> return false <mask> } <mask> <mask> hp.table.Set(ip, append(hosts, host)) <mask> <mask> return true <mask> } <mask> <mask> // addPair puts the pair of ip and host to the rules builder if needed. <mask> func (hp hostsParser) addPair(ip net.IP, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
func (hp *hostsParser) addPair(ip net.IP, host string) {
<mask> return true <mask> } <mask> <mask> // addPair puts the pair of ip and host to the rules builder if needed. <mask> func (hp hostsParser) addPair(ip net.IP, host string) { <mask> arpa, err := netutil.IPToReversedAddr(ip) <mask> if err != nil { <mask> return <mask> } <mask> </s> Pull request: 381...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
const ( nl = "\n" sc = ";" rewriteSuccess = "$dnsrewrite=NOERROR" + sc rewriteSuccessPTR = rewriteSuccess + "PTR" + sc ) ipStr := ip.String() fqdn := dns.Fqdn(host) for _, ruleData := range [...][]string{{ // A/AAAA. rules.MaskStartURL,
<mask> // Assume the validation of the IP address is performed already. <mask> qtype = "A" <mask> } <mask> <mask> stringutil.WriteToBuilder( <mask> hp.rules, <mask> "||", <mask> host, <mask> "^$dnsrewrite=NOERROR;", <mask> qtype, <mask> ";", <mask> ip.String(), </s> Pull request: 3815 ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
rules.MaskSeparator, rewriteSuccess,
<mask> stringutil.WriteToBuilder( <mask> hp.rules, <mask> "||", <mask> host, <mask> "^$dnsrewrite=NOERROR;", <mask> qtype, <mask> ";", <mask> ip.String(), <mask> "\n", <mask> "||", </s> Pull request: 3815 fix hosts container rewrites Merge in DNS/adguard-home from 3815-weird-rewrites to m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
sc, ipStr, nl, }, { // PTR. rules.MaskStartURL,
<mask> "||", <mask> host, <mask> "^$dnsrewrite=NOERROR;", <mask> qtype, <mask> ";", <mask> ip.String(), <mask> "\n", <mask> "||", <mask> arpa, <mask> "^$dnsrewrite=NOERROR;PTR;", <mask> dns.Fqdn(host), <mask> "\n", <mask> ) </s> Pull request: 3815 fix hosts container rewrites Mer...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
rules.MaskSeparator, rewriteSuccessPTR, fqdn, nl, }} { stringutil.WriteToBuilder(hp.rules, ruleData...) }
<mask> ip.String(), <mask> "\n", <mask> "||", <mask> arpa, <mask> "^$dnsrewrite=NOERROR;PTR;", <mask> dns.Fqdn(host), <mask> "\n", <mask> ) <mask> <mask> log.Debug("%s: added ip-host pair %q/%q", hostsContainerPref, ip, host) <mask> } <mask> <mask> // sendUpd tries to send the parsed data...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
func (hp *hostsParser) sendUpd(ch chan *netutil.IPMap) {
<mask> log.Debug("%s: added ip-host pair %q/%q", hostsContainerPref, ip, host) <mask> } <mask> <mask> // sendUpd tries to send the parsed data to the ch. <mask> func (hp hostsParser) sendUpd(ch chan *netutil.IPMap) { <mask> log.Debug("%s: sending upd", hostsContainerPref) <mask> select { <mask> case ch <- ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
upd := hp.table
<mask> // sendUpd tries to send the parsed data to the ch. <mask> func (hp *hostsParser) sendUpd(ch chan *netutil.IPMap) { <mask> log.Debug("%s: sending upd", hostsContainerPref) <mask> select { <mask> case ch <- upd: <mask> // Updates are delivered. Go on. <mask> case <-ch: <mask> ch <- upd </s> Pull...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
case ch <- upd:
<mask> // sendUpd tries to send the parsed data to the ch. <mask> func (hp hostsParser) sendUpd(ch chan *netutil.IPMap) { <mask> log.Debug("%s: sending upd", hostsContainerPref) <mask> select { <mask> case ch <- hp.table: <mask> // Updates are delivered. Go on. <mask> default: <mask> log.Debug("%s: the...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
case <-ch: ch <- upd log.Debug("%s: replaced the last update", hostsContainerPref) case ch <- upd: // The previous update was just read and the next one pushed. Go on.
<mask> case ch <- upd: <mask> // Updates are delivered. Go on. <mask> default: <mask> log.Debug("%s: the channel is broken", hostsContainerPref) <mask> } <mask> } <mask> </s> Pull request: 3815 fix hosts container rewrites Merge in DNS/adguard-home from 3815-weird-rewrites to master Updates #3815. S...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
log.Debug("%s: the channel is broken", hostsContainerPref)
<mask> select { <mask> case ch <- hp.table: <mask> // Updates are delivered. Go on. <mask> default: <mask> log.Debug("%s: the buffer is full", hostsContainerPref) <mask> } <mask> } <mask> <mask> // newStrg creates a new rules storage from parsed data. <mask> func (hp hostsParser) newStrg() (s *filte...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
func (hp *hostsParser) newStrg() (s *filterlist.RuleStorage, err error) {
<mask> } <mask> } <mask> <mask> // newStrg creates a new rules storage from parsed data. <mask> func (hp hostsParser) newStrg() (s *filterlist.RuleStorage, err error) { <mask> return filterlist.NewRuleStorage([]filterlist.RuleList{&filterlist.StringRuleList{ <mask> ID: 1, <mask> RulesText: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
ID: -1,
<mask> <mask> // newStrg creates a new rules storage from parsed data. <mask> func (hp hostsParser) newStrg() (s *filterlist.RuleStorage, err error) { <mask> return filterlist.NewRuleStorage([]filterlist.RuleList{&filterlist.StringRuleList{ <mask> ID: 1, <mask> RulesText: hp.rules.String(),...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
// refresh gets the data from specified files and propagates the updates if // needed.
<mask> IgnoreCosmetic: true, <mask> }}) <mask> } <mask> <mask> // refresh gets the data from specified files and propagates the updates. <mask> func (hc *HostsContainer) refresh() (err error) { <mask> log.Debug("%s: refreshing", hostsContainerPref) <mask> <mask> hp := hostsParser{ <mask> rules: &stri...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
hp := hc.newHostsParser() if _, err = aghos.FileWalker(hp.parseFile).Walk(hc.fsys, hc.patterns...); err != nil { return fmt.Errorf("refreshing : %w", err)
<mask> // refresh gets the data from specified files and propagates the updates. <mask> func (hc *HostsContainer) refresh() (err error) { <mask> log.Debug("%s: refreshing", hostsContainerPref) <mask> <mask> hp := hostsParser{ <mask> rules: &strings.Builder{}, <mask> table: netutil.NewIPMap(0), <mask> } ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
if hp.equalSet(hc.last) { log.Debug("%s: no updates detected", hostsContainerPref)
<mask> rules: &strings.Builder{}, <mask> table: netutil.NewIPMap(0), <mask> } <mask> <mask> _, err = aghos.FileWalker(hp.parseHostsFile).Walk(hc.fsys, hc.patterns...) <mask> if err != nil { <mask> return fmt.Errorf("updating: %w", err) <mask> } <mask> <mask> defer hp.sendUpd(hc.updates) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
return nil }
<mask> log.Debug("%s: no updates detected", hostsContainerPref) <mask> <mask> defer hp.sendUpd(hc.updates) <mask> <mask> hc.last = hp.table.ShallowClone() <mask> <mask> var rulesStrg *filterlist.RuleStorage <mask> if rulesStrg, err = hp.newStrg(); err != nil { </s> Pull request: 3815 fix hosts contain...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
hc.last = hp.table.ShallowClone()
<mask> defer hp.sendUpd(hc.updates) <mask> <mask> var rulesStrg *filterlist.RuleStorage <mask> if rulesStrg, err = hp.newStrg(); err != nil { <mask> return fmt.Errorf("initializing rules storage: %w", err) <mask> } <mask> <mask> hc.resetEng(rulesStrg) </s> Pull request: 3815 fix hosts container rewrit...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer.go
"github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest" <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/AdguardTeam/urlfilter" <mask> "github.com/miekg/dns" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
// event is a convenient alias for an empty struct{} to emit test events. type event = struct{} eventsCh := make(chan event, 1)
<mask> Data: []byte(strings.Join([]string{knownIP.String(), knownHost}, sp) + nl), <mask> }, <mask> } <mask> <mask> eventsCh := make(chan struct{}, 1) <mask> t.Cleanup(func() { close(eventsCh) }) <mask> <mask> w := &aghtest.FSWatcher{ <mask> OnEvents: func() (e <-chan struct{}) { return eventsCh }...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
OnEvents: func() (e <-chan event) { return eventsCh },
<mask> eventsCh := make(chan struct{}, 1) <mask> t.Cleanup(func() { close(eventsCh) }) <mask> <mask> w := &aghtest.FSWatcher{ <mask> OnEvents: func() (e <-chan struct{}) { return eventsCh }, <mask> OnAdd: func(name string) (err error) { <mask> assert.Equal(t, dirname, name) <mask> <mask> return ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
checkRefresh := func(t *testing.T, wantHosts *stringutil.Set) {
<mask> hc, err := NewHostsContainer(testFS, w, dirname) <mask> require.NoError(t, err) <mask> t.Cleanup(func() { require.ErrorIs(t, hc.Close(), closeCalled) }) <mask> <mask> checkRefresh := func(t *testing.T, wantHosts []string) { <mask> upd, ok := <-hc.Upd() <mask> require.True(t, ok) <mask> require...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
var hosts *stringutil.Set hosts, ok = v.(*stringutil.Set)
<mask> <mask> v, ok := upd.Get(knownIP) <mask> require.True(t, ok) <mask> <mask> var hosts []string <mask> hosts, ok = v.([]string) <mask> require.True(t, ok) <mask> require.Len(t, hosts, len(wantHosts)) <mask> <mask> assert.Equal(t, wantHosts, hosts) <mask> } </s> Pull request: 3815 fix h...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
<mask> <mask> var hosts []string <mask> hosts, ok = v.([]string) <mask> require.True(t, ok) <mask> require.Len(t, hosts, len(wantHosts)) <mask> <mask> assert.Equal(t, wantHosts, hosts) <mask> } <mask> <mask> t.Run("initial_refresh", func(t *testing.T) { </s> Pull request: 3815 fix hosts contai...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
assert.True(t, hosts.Equal(wantHosts))
<mask> hosts, ok = v.([]string) <mask> require.True(t, ok) <mask> require.Len(t, hosts, len(wantHosts)) <mask> <mask> assert.Equal(t, wantHosts, hosts) <mask> } <mask> <mask> t.Run("initial_refresh", func(t *testing.T) { <mask> checkRefresh(t, []string{knownHost}) <mask> }) </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
checkRefresh(t, stringutil.NewSet(knownHost))
<mask> assert.Equal(t, wantHosts, hosts) <mask> } <mask> <mask> t.Run("initial_refresh", func(t *testing.T) { <mask> checkRefresh(t, []string{knownHost}) <mask> }) <mask> <mask> testFS[p2] = &fstest.MapFile{ <mask> Data: []byte(strings.Join([]string{knownIP.String(), knownAlias}, sp) + nl), <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
eventsCh <- event{}
<mask> <mask> testFS[p2] = &fstest.MapFile{ <mask> Data: []byte(strings.Join([]string{knownIP.String(), knownAlias}, sp) + nl), <mask> } <mask> <mask> eventsCh <- struct{}{} <mask> <mask> t.Run("second_refresh", func(t *testing.T) { <mask> checkRefresh(t, []string{knownHost, knownAlias}) <mask> })...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
checkRefresh(t, stringutil.NewSet(knownHost, knownAlias)) }) eventsCh <- event{} t.Run("no_changes_refresh", func(t *testing.T) { assert.Empty(t, hc.Upd())
<mask> <mask> eventsCh <- struct{}{} <mask> <mask> t.Run("second_refresh", func(t *testing.T) { <mask> checkRefresh(t, []string{knownHost, knownAlias}) <mask> }) <mask> } <mask> <mask> func TestHostsContainer_MatchRequest(t *testing.T) { <mask> var ( </s> Pull request: 3815 fix hosts container rewri...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
128, 0, 0, 0,
<mask> func TestHostsContainer_MatchRequest(t *testing.T) { <mask> var ( <mask> ip4 = net.IP{127, 0, 0, 1} <mask> ip6 = net.IP{ <mask> 0, 0, 0, 0, <mask> 0, 0, 0, 0, <mask> 0, 0, 0, 0, <mask> 0, 0, 0, 1, <mask> } <mask> </s> Pull request: 3815 fix hosts container rewrites Merge in DNS/ad...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
ip4.String() + " " + hostname4 + " " + hostname4a + nl + ip6.String() + " " + hostname6 + nl + `256.256.256.256 fakebroadcast` + nl,
<mask> const filename = "file1" <mask> <mask> gsfs := fstest.MapFS{ <mask> filename: &fstest.MapFile{Data: []byte( <mask> strings.Join([]string{ip4.String(), hostname4, hostname4a}, sp) + nl + <mask> strings.Join([]string{ip6.String(), hostname6}, sp) + nl + <mask> strings.Join([]string{"256.256....
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
}, { name: "a_for_aaaa", want: []interface{}{ ip4.To16(), }, req: urlfilter.DNSRequest{ Hostname: hostname4, DNSType: dns.TypeAAAA, },
<mask> Hostname: hostname4, <mask> DNSType: dns.TypeA, <mask> }, <mask> }, { <mask> name: "aaaa", <mask> want: []interface{}{ip6}, <mask> req: urlfilter.DNSRequest{ <mask> Hostname: hostname6, <mask> DNSType: dns.TypeAAAA, </s> Pull request: 3815 fix hosts container rewrites Merge in D...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
ipToHost.Set(knownIP, *stringutil.NewSet(knownHost))
<mask> <mask> const knownHost = "host1" <mask> <mask> ipToHost := netutil.NewIPMap(0) <mask> ipToHost.Set(knownIP, []string{knownHost}) <mask> <mask> testCases := []struct { <mask> name string <mask> host string <mask> wantRules string </s> Pull request: 3815 fix hosts container rewrit...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
name: "existing_one", host: knownHost, wantRules: "||" + knownHost + "^$dnsrewrite=NOERROR;A;1.2.3.4\n" + "||4.3.2.1.in-addr.arpa^$dnsrewrite=NOERROR;PTR;host1.\n", ip: knownIP,
<mask> wantRules: "||host2^$dnsrewrite=NOERROR;A;1.2.3.4\n" + <mask> "||4.3.2.1.in-addr.arpa^$dnsrewrite=NOERROR;PTR;host2.\n", <mask> ip: knownIP, <mask> }, { <mask> name: "existing_one", <mask> host: knownHost, <mask> wantRules: "", <mask> ip: knownIP, <mask> }, { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/aghnet/hostscontainer_test.go
case res.Reason == filtering.Rewritten:
<mask> // Resolve the new canonical name, not the original host name. The <mask> // original question is readded in processFilteringAfterResponse. <mask> ctx.origQuestion = q <mask> req.Question[0].Name = dns.Fqdn(res.CanonName) <mask> case res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHos...
[ "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/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/dnsforward/filter.go
case res.Reason.In(filtering.RewrittenRule, filtering.RewrittenAutoHosts):
<mask> } <mask> } <mask> <mask> d.Res = resp <mask> case res.Reason == filtering.RewrittenRule: <mask> if err = s.filterDNSRewrite(req, res, d); err != nil { <mask> return nil, err <mask> } <mask> } <mask> </s> Pull request: 3815 fix hosts container rewrites Merge in DNS/adguard-home from ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/dnsforward/filter.go
// DNSRewriteResult set. dnsr is expected to be non-empty.
<mask> type DNSRewriteResultResponse map[rules.RRType][]rules.RRValue <mask> <mask> // processDNSRewrites processes DNS rewrite rules in dnsr. It returns an empty <mask> // result if dnsr is empty. Otherwise, the result will have either CanonName or <mask> // DNSRewriteResult set. <mask> func (d *DNSFilter) pr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/dnsrewrite.go
<mask> // processDNSRewrites processes DNS rewrite rules in dnsr. It returns an empty <mask> // result if dnsr is empty. Otherwise, the result will have either CanonName or <mask> // DNSRewriteResult set. <mask> func (d *DNSFilter) processDNSRewrites(dnsr []*rules.NetworkRule) (res Result) { <mask> if len(dnsr)...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/dnsrewrite.go
// NewCNAME rules have a higher priority than the other rules.
<mask> <mask> for _, nr := range dnsr { <mask> dr := nr.DNSRewrite <mask> if dr.NewCNAME != "" { <mask> // NewCNAME rules have a higher priority than <mask> // the other rules. <mask> rules = []*ResultRule{{ <mask> FilterListID: int64(nr.GetFilterListID()), <mask> Text: nr.RuleTe...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/dnsrewrite.go
// RcodeRefused and other such codes have higher priority. Return // immediately.
<mask> FilterListID: int64(nr.GetFilterListID()), <mask> Text: nr.RuleText, <mask> }) <mask> default: <mask> // RcodeRefused and other such codes have higher <mask> // priority. Return immediately. <mask> rules = []*ResultRule{{ <mask> FilterListID: int64(nr.GetFilterListID())...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/dnsrewrite.go
// // TODO(e.burkov): There is no need for AutoHosts-related fields any more // since the hosts container now uses $dnsrewrite rules. These fields are // only used in query log to decode old format.
<mask> <mask> // ReverseHosts is the reverse lookup rewrite result. It is empty unless <mask> // Reason is set to RewrittenAutoHosts. <mask> ReverseHosts []string `json:",omitempty"` <mask> <mask> // IPList is the lookup rewrite result. It is empty unless Reason is set to <mask> // RewrittenAutoHosts or...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/filtering.go
// database. err is always nil.
<mask> return Result{}, nil <mask> } <mask> <mask> // matchSysHosts tries to match the host against the operating system's hosts <mask> // database. <mask> func (d *DNSFilter) matchSysHosts( <mask> host string, <mask> qtype uint16, <mask> setts *Settings, <mask> ) (res Result, err error) { </s> Pull req...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/filtering.go
return res, nil
<mask> qtype uint16, <mask> setts *Settings, <mask> ) (res Result, err error) { <mask> if !setts.FilteringEnabled || d.EtcHosts == nil { <mask> return Result{}, nil <mask> } <mask> <mask> dnsres, _ := d.EtcHosts.MatchRequest(urlfilter.DNSRequest{ <mask> Hostname: host, <mask> SortedClientT...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/filtering.go
// TODO(e.burkov): Wait for urlfilter update to pass net.IP.
<mask> <mask> dnsres, _ := d.EtcHosts.MatchRequest(urlfilter.DNSRequest{ <mask> Hostname: host, <mask> SortedClientTags: setts.ClientTags, <mask> // TODO(e.burkov): Wait for urlfilter update to pass net.IP. <mask> ClientIP: setts.ClientIP.String(), <mask> ClientName: setts.ClientName, <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/filtering.go
return res, nil
<mask> ClientName: setts.ClientName, <mask> DNSType: qtype, <mask> }) <mask> if dnsres == nil { <mask> return Result{}, nil <mask> } <mask> <mask> dnsr := dnsres.DNSRewrites() <mask> if len(dnsr) == 0 { <mask> return Result{}, nil </s> Pull request: 3815 fix hosts container rewrites Merge i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/filtering.go
if dnsr := dnsres.DNSRewrites(); len(dnsr) > 0 { // Check DNS rewrites first, because the API there is a bit awkward. res = d.processDNSRewrites(dnsr) res.Reason = RewrittenAutoHosts // TODO(e.burkov): Put real hosts-syntax rules. // // See https://github.com/AdguardTeam/AdGuardHome/issues/3846. res.Rul...
<mask> if dnsres == nil { <mask> return Result{}, nil <mask> } <mask> <mask> dnsr := dnsres.DNSRewrites() <mask> if len(dnsr) == 0 { <mask> return Result{}, nil <mask> } <mask> <mask> var ips []net.IP <mask> var revHosts []string <mask> for _, nr := range dnsr { <mask> if nr.DNSRewrite == n...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "k...
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/filtering.go
return res, nil
<mask> revHosts = append(revHosts, val) <mask> } <mask> } <mask> <mask> return Result{ <mask> Reason: RewrittenAutoHosts, <mask> IPList: ips, <mask> ReverseHosts: revHosts, <mask> }, nil <mask> } <mask> <mask> // Process rewrites table <mask> // . Find CNAME for a domain name (e...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/filtering/filtering.go
names, ok := v.(*stringutil.Set)
<mask> clients.rmHostsBySrc(ClientSourceHostsFile) <mask> <mask> n := 0 <mask> hosts.Range(func(ip net.IP, v interface{}) (cont bool) { <mask> names, ok := v.([]string) <mask> if !ok { <mask> log.Error("dns: bad type %T in ipToRC for %s", v, ip) <mask> } <mask> <mask> for _, name := range name...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/home/clients.go
names.Range(func(name string) (cont bool) { if clients.addHostLocked(ip, name, ClientSourceHostsFile) {
<mask> if !ok { <mask> log.Error("dns: bad type %T in ipToRC for %s", v, ip) <mask> } <mask> <mask> for _, name := range names { <mask> ok = clients.addHostLocked(ip, name, ClientSourceHostsFile) <mask> if ok { <mask> n++ <mask> } <mask> } <mask> <mask> return true </s> Pull req...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/home/clients.go
return true })
<mask> ok = clients.addHostLocked(ip, name, ClientSourceHostsFile) <mask> if ok { <mask> n++ <mask> } <mask> } <mask> <mask> return true <mask> }) <mask> <mask> log.Debug("clients: added %d client aliases from system hosts-file", n) </s> Pull request: 3815 fix hosts container rewrites M...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a4b4715ca3b028c3efc9169f949f9a65bf5364c
internal/home/clients.go
"github.com/AdguardTeam/AdGuardHome/stats"
<mask> "sync" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> "github.com/miekg/dns" <mask>...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward.go
stats stats.Stats
<mask> dnsProxy *proxy.Proxy // DNS proxy instance <mask> dnsFilter *dnsfilter.Dnsfilter // DNS filter instance <mask> queryLog *queryLog // Query log instance <mask> <mask> AllowedClients map[string]bool // IP addresses of whitelist clients <mask> DisallowedClients map[str...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward.go
func NewServer(baseDir string, stats stats.Stats) *Server {
<mask> <mask> // NewServer creates a new instance of the dnsforward.Server <mask> // baseDir is the base directory for query logs <mask> // Note: this function must be called only once <mask> func NewServer(baseDir string) *Server { <mask> s := &Server{ <mask> queryLog: newQueryLog(baseDir), <mask> } <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward.go
s.stats = stats
<mask> s := &Server{ <mask> queryLog: newQueryLog(baseDir), <mask> } <mask> <mask> log.Printf("Start DNS server periodic jobs") <mask> go s.queryLog.periodicQueryLogRotate() <mask> return s <mask> } </s> + statistics: store in separate file + GET /control/stats handler </s> remove func NewServer(baseD...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward.go
elapsed := time.Since(start)
<mask> shouldLog = false <mask> } <mask> <mask> if s.conf.QueryLogEnabled && shouldLog { <mask> upstreamAddr := "" <mask> if d.Upstream != nil { <mask> upstreamAddr = d.Upstream.Address() <mask> } </s> + statistics: store in separate file + GET /control/stats handler </s> remove elapsed := tim...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward.go
<mask> shouldLog = false <mask> } <mask> <mask> if s.conf.QueryLogEnabled && shouldLog { <mask> elapsed := time.Since(start) <mask> upstreamAddr := "" <mask> if d.Upstream != nil { <mask> upstreamAddr = d.Upstream.Address() <mask> } <mask> _ = s.queryLog.logRequest(msg, d.Res, res, elapsed, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward.go
s.updateStats(d, elapsed, *res)
<mask> } <mask> _ = s.queryLog.logRequest(msg, d.Res, res, elapsed, d.Addr, upstreamAddr) <mask> } <mask> <mask> return nil <mask> } <mask> <mask> func (s *Server) updateStats(d *proxy.DNSContext, elapsed time.Duration, res dnsfilter.Result) { </s> + statistics: store in separate file + GET /control/s...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward.go
s := NewServer(createDataDir(t), nil)
<mask> } <mask> } <mask> <mask> func createTestServer(t *testing.T) *Server { <mask> s := NewServer(createDataDir(t)) <mask> s.conf.UDPListenAddr = &net.UDPAddr{Port: 0} <mask> s.conf.TCPListenAddr = &net.TCPAddr{Port: 0} <mask> <mask> s.conf.QueryLogEnabled = true <mask> s.conf.FilteringConfig.Filter...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
dnsforward/dnsforward_test.go
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf
<mask> github.com/AdguardTeam/dnsproxy v0.19.1 <mask> github.com/AdguardTeam/golibs v0.2.1 <mask> github.com/AdguardTeam/urlfilter v0.5.0 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 <mask> github.com/etcd-io/bbolt v1.3.3 <mask> github.com...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
go.mod
github.com/etcd-io/bbolt v1.3.3
<mask> github.com/AdguardTeam/urlfilter v0.5.0 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf <mask> github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 <mask> github.com/go-test/deep v1.0.1 <mask> github.com/gobuffalo/packr v...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
go.mod
go.etcd.io/bbolt v1.3.3 // indirect
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414 <mask> github.com/miekg/dns v1.1.8 <mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0 <mask> github.com/stretchr/testify v1.4.0 <mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859 <mask> golang.org/x/sys v0.0.0-2019062...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
go.mod
<mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0 <mask> github.com/stretchr/testify v1.4.0 <mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859 <mask> golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 <mask> gopkg.in/asaskevich/govalidator.v4 v4.0.0-20160518190739-766470278477 <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
go.mod
github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
<mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= <mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= <mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= <mask> github.com/go-ole/go-ole v1....
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
go.sum
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
<mask> github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= <mask> github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= <mask> github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= <mask> golang.org/x/crypto v0.0....
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
go.sum
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= <mask> golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= <mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= <mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/g...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
go.sum
"github.com/AdguardTeam/AdGuardHome/stats"
<mask> <mask> "github.com/AdguardTeam/AdGuardHome/dhcpd" <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter" <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/golibs/file" <mask> "github.com/AdguardTeam/golibs/log" <mask> yaml "gopkg.in/yaml.v2" <mask> ) <mask> <m...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/config.go
stats stats.Stats
<mask> transport *http.Transport <mask> client *http.Client <mask> <mask> // cached version.json to avoid hammering github.io for each page reload <mask> versionCheckJSON []byte <mask> versionCheckLastTime time.Time <mask> </s> + statistics: store in separate file + GET /control/sta...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/config.go
"github.com/AdguardTeam/AdGuardHome/stats"
<mask> "encoding/json" <mask> "net/http" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> type statsConfig struct { <mask> Interval uint `json:"interval"` </s> + statistics: store in separate file + GET /control/stats handler </s> remove log.Tracef("%s %v", r.Method, r.URL) </...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/control_stats.go
// Get stats configuration
<mask> } <mask> <mask> func handleStatsInfo(w http.ResponseWriter, r *http.Request) { <mask> resp := statsConfig{} <mask> resp.Interval = config.DNS.StatsInterval <mask> <mask> jsonVal, err := json.Marshal(resp) </s> + statistics: store in separate file + GET /control/stats handler </s> remove log.Tracef...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/control_stats.go
<mask> Interval uint `json:"interval"` <mask> } <mask> <mask> func handleStatsInfo(w http.ResponseWriter, r *http.Request) { <mask> log.Tracef("%s %v", r.Method, r.URL) <mask> <mask> resp := statsConfig{} <mask> resp.Interval = config.DNS.StatsInterval <mask> <mask> jsonVal, err := json.Marshal(resp) ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/control_stats.go
// Set stats configuration
<mask> } <mask> <mask> func handleStatsConfig(w http.ResponseWriter, r *http.Request) { <mask> reqData := statsConfig{} <mask> err := json.NewDecoder(r.Body).Decode(&reqData) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "json decode: %s", err) <mask> return </s> + statistics: store...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/control_stats.go
<mask> } <mask> } <mask> <mask> func handleStatsConfig(w http.ResponseWriter, r *http.Request) { <mask> log.Tracef("%s %v", r.Method, r.URL) <mask> <mask> reqData := statsConfig{} <mask> err := json.NewDecoder(r.Body).Decode(&reqData) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/control_stats.go
// RegisterStatsHandlers - register handlers func RegisterStatsHandlers() { httpRegister(http.MethodGet, "/control/stats", handleStats) httpRegister(http.MethodPost, "/control/stats_reset", handleStatsReset) httpRegister(http.MethodPost, "/control/stats_config", handleStatsConfig) httpRegister(http.MethodGet, "/con...
<mask> } <mask> <mask> config.DNS.StatsInterval = reqData.Interval <mask> <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func checkStatsInterval(i uint) bool { <mask> return i == 1 || i == 7 || i == 30 || i == 90 <mask> } </s> + statistics: store in separate file + GET /control...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/control_stats.go
"github.com/AdguardTeam/AdGuardHome/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter" <mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> "github.com/mi...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/dns.go
config.stats = stats.New("./data/stats.db", int(config.DNS.StatsInterval), nil) if config.stats == nil { log.Fatal("config.stats == nil") } config.dnsServer = dnsforward.NewServer(baseDir, config.stats)
<mask> if err != nil { <mask> log.Fatalf("Cannot create DNS data dir at %s: %s", baseDir, err) <mask> } <mask> <mask> config.dnsServer = dnsforward.NewServer(baseDir) <mask> <mask> initRDNS() <mask> } <mask> <mask> func isRunning() bool { </s> + statistics: store in separate file + GET /control/sta...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/dns.go
config.stats.Close()
<mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server") <mask> } <mask> <mask> return nil <mask> } </s> + statistics: store in separate file + GET /control/stats handler </s> remove log.Tracef("%s %v", r.Method, r.URL) </s> add </s> remove config.dnsServer = dnsforward.NewServer(baseD...
[ "keep", "keep", "add", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a58266ba37a0c34ff9b0d22a1c4f5442cef2d4b
home/dns.go
yobj = map[string]any
<mask> <mask> // These aliases are provided for convenience. <mask> type ( <mask> yarr = []any <mask> yobj = map[any]any <mask> ) <mask> <mask> // Performs necessary upgrade operations if needed <mask> func upgradeConfig() error { <mask> // read a config file into an interface map, so we can manipulate v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a7b4d03a1d81062bb6e708b51c42e64ee23618a
internal/home/upgrade.go
case yobj:
<mask> // Convert any to yobj <mask> newDNSConfig := make(yobj) <mask> <mask> switch v := dnsConfig.(type) { <mask> case map[any]any: <mask> for k, v := range v { <mask> newDNSConfig[fmt.Sprint(k)] = v <mask> } <mask> default: <mask> return fmt.Errorf("dns configuration is not a map") </s> Pul...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a7b4d03a1d81062bb6e708b51c42e64ee23618a
internal/home/upgrade.go
return fmt.Errorf("unexpected type of dns: %T", dnsConfig)
<mask> for k, v := range v { <mask> newDNSConfig[fmt.Sprint(k)] = v <mask> } <mask> default: <mask> return fmt.Errorf("dns configuration is not a map") <mask> } <mask> <mask> // Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside <mask> bootstrapDNS, ok := newDNSCon...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4a7b4d03a1d81062bb6e708b51c42e64ee23618a
internal/home/upgrade.go
github.com/AdguardTeam/dnsproxy v0.38.2
<mask> <mask> go 1.16 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.38.0 <mask> github.com/AdguardTeam/golibs v0.8.0 <mask> github.com/AdguardTeam/urlfilter v0.14.6 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.1.3 <mask> github.com/digineo/...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4b5a66ee617cc364c26a3d4293ae4dba378c3f26
go.mod
github.com/AdguardTeam/dnsproxy v0.38.2 h1:QHxvShAm4GwH0PyRN60xf18+5nAzmbvhPoEvhfVycSA= github.com/AdguardTeam/dnsproxy v0.38.2/go.mod h1:aNXKNdTyKfgAG2OS712SYSaGIM9AasZsZxfiY4YiR/0=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= <mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= <mask> github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4b5a66ee617cc364c26a3d4293ae4dba378c3f26
go.sum
<mask> github.com/AdguardTeam/dnsproxy v0.38.0 h1:7GyyNJOieIVOgdnhu47exqWjHPQro7wQhqzvQjaZt6M= <mask> github.com/AdguardTeam/dnsproxy v0.38.0/go.mod h1:xMfevPAwpK1ULoLO0CARg/OiUsPH92kfyliXhPTc62M= <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/Ad...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/4b5a66ee617cc364c26a3d4293ae4dba378c3f26
go.sum