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
<code>tls://unfiltered.adguard-dns.com</code>: <Trans components={[ <a href="https://en.wikipedia.org/wiki/DNS_over_TLS" target="_blank" rel="noopener noreferrer" ...
<mask> <li> <mask> <code>tcp://unfiltered.adguard-dns.com</code>: <Trans>example_upstream_tcp_hostname</Trans> <mask> </li> <mask> <li> <mask> <code>tls://unfiltered.adguard-dns.com</code>: <mask> <span> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "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/1afd73ad0b50037bdb58130c7a21e080de88ea7d
client/src/components/Settings/Dns/Upstream/Examples.js
<code>https://unfiltered.adguard-dns.com/dns-query</code>: <Trans components={[ <a href="https://en.wikipedia.org/wiki/DNS_over_HTTPS" target="_blank" rel="noopener noreferrer"...
<mask> </Trans> <mask> </span> <mask> </li> <mask> <li> <mask> <code>https://unfiltered.adguard-dns.com/dns-query</code>: <mask> <span> <mask> <Trans <mask> components={[ <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "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/1afd73ad0b50037bdb58130c7a21e080de88ea7d
client/src/components/Settings/Dns/Upstream/Examples.js
<code>quic://unfiltered.adguard-dns.com</code>: <Trans components={[ <a href="https://datatracker.ietf.org/doc/html/rfc9250" target="_blank" rel="noopener noreferrer" ...
<mask> </Trans> <mask> </span> <mask> </li> <mask> <li> <mask> <code>quic://unfiltered.adguard-dns.com:784</code>: <mask> <span> <mask> <Trans <mask> components={[ <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "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/1afd73ad0b50037bdb58130c7a21e080de88ea7d
client/src/components/Settings/Dns/Upstream/Examples.js
<code>sdns://...</code>: <Trans components={[ <a href="https://dnscrypt.info/stamps/" target="_blank" rel="noopener noreferrer" key="0" ...
<mask> </Trans> <mask> </span> <mask> </li> <mask> <li> <mask> <code>sdns://...</code>: <mask> <span> <mask> <Trans <mask> components={[ <mask> <a ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
client/src/components/Settings/Dns/Upstream/Examples.js
<code>[/example.local/]94.140.14.140</code>: <Trans components={[ <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains" target="_blank" ...
<mask> </Trans> <mask> </span> <mask> </li> <mask> <li> <mask> <code>[/example.local/]94.140.14.140</code>: <mask> <span> <mask> <Trans <mask> components={[ <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "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/1afd73ad0b50037bdb58130c7a21e080de88ea7d
client/src/components/Settings/Dns/Upstream/Examples.js
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <Trans> example_upstream_comment </Trans>
<mask> </Trans> <mask> </span> <mask> </li> <mask> <li> <mask> <code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>: <mask> <span> <mask> <Trans>example_upstream_comment</Trans> <mask> </...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
client/src/components/Settings/Dns/Upstream/Examples.js
export const DNS_OVER_QUIC_PORT = 853;
<mask> export const STANDARD_DNS_PORT = 53; <mask> export const STANDARD_WEB_PORT = 80; <mask> export const STANDARD_HTTPS_PORT = 443; <mask> export const DNS_OVER_TLS_PORT = 853; <mask> export const DNS_OVER_QUIC_PORT = 784; <mask> export const MAX_PORT = 65535; <mask> <mask> export const EMPTY_DATE = '0001-0...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
client/src/helpers/constants.js
'port_dns_over_quic': 853
<mask> 'description': > <mask> Validatable TLS settings. <mask> 'example': <mask> 'certificate_path': '/etc/ssl/example.com.cert' <mask> 'port_dns_over_quic': 784 <mask> 'port_dns_over_tls': 853 <mask> 'port_https': 443 <mask> 'private_key_path': '/etc...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
openapi/v1.yaml
'default': 853
<mask> Should not be sent if `certificate` is sent. Otherwise, must be <mask> sent. <mask> 'type': 'string' <mask> 'port_dns_over_quic': <mask> 'default': 784 <mask> 'description': > <mask> The DNS-over-QUIC port. If `0`, DNS-over-QUIC i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
openapi/v1.yaml
'port_dns_over_quic': 853
<mask> TLS and encryption settings. <mask> 'example': <mask> 'certificate_path': '/etc/ssl/example.com.cert' <mask> 'enabled': true <mask> 'port_dns_over_quic': 784 <mask> 'port_dns_over_tls': 853 <mask> 'port_https': 443 <mask> 'priv...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
openapi/v1.yaml
'default': 853
<mask> over HTTPS, and the DNS server will listen requests over <mask> DNS-over-TLS and other protocols. <mask> 'type': 'boolean' <mask> 'port_dns_over_quic': <mask> 'default': 784 <mask> 'description': > <mask> The DNS-over-QUIC port. If...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
openapi/v1.yaml
* `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC.
<mask> <mask> * `https://unfiltered.adguard-dns.com/dns-query`: encrypted <mask> DNS-over-HTTPS. <mask> <mask> * `quic://unfiltered.adguard-dns.com:784`: encrypted DNS-over-QUIC <mask> (experimental). <mask> <mask> * `tcp://94.140.14.140`: plain DNS-ove...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
openapi/v1.yaml
# # TODO(a.garipov): Remove the old, non-standard 784 and 8853 ports for # DNS-over-QUIC in a future release.
<mask> # 6060 : TCP : HTTP (pprof) <mask> # 8853 : UDP : DNS-over-QUIC (experimental) <mask> EXPOSE 53/tcp 53/udp 67/udp 68/udp 80/tcp 443/tcp 443/udp 784/udp\ <mask> 853/tcp 853/udp 3000/tcp 3000/udp 3001/tcp 3001/udp 5443/tcp\ <mask> 5443/udp 6060/tcp 8853/udp <mask> </s> Pull request #1572: 4...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1afd73ad0b50037bdb58130c7a21e080de88ea7d
scripts/make/Dockerfile
for _, u := range newconfig.Upstreams { if err = validateUpstream(u); err != nil { httpError(w, http.StatusBadRequest, "%s can not be used as upstream cause: %s", u, err) return } }
<mask> httpError(w, http.StatusBadRequest, "Failed to parse new upstreams config json: %s", err) <mask> return <mask> } <mask> <mask> config.DNS.UpstreamDNS = defaultDNS <mask> if len(newconfig.Upstreams) > 0 { <mask> config.DNS.UpstreamDNS = newconfig.Upstreams <mask> } <mask> <mask> // bootstra...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
// bootstrap servers are plain DNS only.
<mask> if len(newconfig.Upstreams) > 0 { <mask> config.DNS.UpstreamDNS = newconfig.Upstreams <mask> } <mask> <mask> // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice <mask> for _, host := range newconfig.BootstrapDNS { <mask> err ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
if err := checkPlainDNS(host); err != nil {
<mask> } <mask> <mask> // bootstrap servers are plain DNS only. We should return http error if there are tls:// https:// or sdns:// hosts in slice <mask> for _, host := range newconfig.BootstrapDNS { <mask> err := checkPlainDNS(host) <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/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
func validateUpstream(upstream string) error { if strings.HasPrefix(upstream, "tls://") || strings.HasPrefix(upstream, "https://") || strings.HasPrefix(upstream, "sdns://") || strings.HasPrefix(upstream, "tcp://") { return nil } if strings.Contains(upstream, "://") { return fmt.Errorf("wrong protocol") } ret...
<mask> } <mask> <mask> // checkPlainDNS checks if host is plain DNS <mask> func checkPlainDNS(upstream string) error { <mask> // Check if host is ip without port <mask> if net.ParseIP(upstream) != nil { <mask> return nil </s> [change] control: add upstreams validation </s> remove func checkPlainDNS(host st...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
func checkPlainDNS(upstream string) error {
<mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> // checkPlainDNS checks if host is plain DNS <mask> func checkPlainDNS(host string) error { <mask> // Check if host is ip without port <mask> if net.ParseIP(host) != nil { <mask> return nil <mask> } <mask> </s> [change] control: ad...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
if net.ParseIP(upstream) != nil {
<mask> <mask> // checkPlainDNS checks if host is plain DNS <mask> func checkPlainDNS(host string) error { <mask> // Check if host is ip without port <mask> if net.ParseIP(host) != nil { <mask> return nil <mask> } <mask> <mask> // Check if host is ip with port <mask> ip, port, err := net.SplitHostPort...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
ip, port, err := net.SplitHostPort(upstream)
<mask> return nil <mask> } <mask> <mask> // Check if host is ip with port <mask> ip, port, err := net.SplitHostPort(host) <mask> if err != nil { <mask> return err <mask> } <mask> <mask> if net.ParseIP(ip) == nil { </s> [change] control: add upstreams validation </s> remove if net.ParseIP(host) !...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
return fmt.Errorf("%s is not a valid IP", ip)
<mask> return err <mask> } <mask> <mask> if net.ParseIP(ip) == nil { <mask> return fmt.Errorf("%s is not valid IP", ip) <mask> } <mask> <mask> _, err = strconv.ParseInt(port, 0, 64) <mask> if err != nil { <mask> return fmt.Errorf("%s is not valid port: %s", port, err) </s> [change] control: add ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
return fmt.Errorf("%s is not a valid port: %s", port, err)
<mask> } <mask> <mask> _, err = strconv.ParseInt(port, 0, 64) <mask> if err != nil { <mask> return fmt.Errorf("%s is not valid port: %s", port, err) <mask> } <mask> <mask> return nil <mask> } <mask> </s> [change] control: add upstreams validation </s> remove return fmt.Errorf("%s is not valid IP"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1b15bee2b09df5b2c31edf6d6d594aa53ac9124c
control.go
// RequestFilteringSettings is custom filtering settings
<mask> const defaultParentalURL = "%s://%s/check-parental-control-hash?prefixes=%s&sensitivity=%d" <mask> const defaultParentalSensitivity = 13 // use "TEEN" by default <mask> const maxDialCacheSize = 2 // the number of host names for safebrowsing and parental control <mask> <mask> // Custom filtering ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsfilter/dnsfilter.go
// RewriteEntry is a rewrite array element type RewriteEntry struct { Domain string `yaml:"domain"` Answer string `yaml:"answer"` // IP address or canonical name }
<mask> } <mask> <mask> // Config allows you to configure DNS filtering with New() or just change variables directly. <mask> type Config struct { <mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17 <mask> ParentalEnabled bool `yaml:"parental_enabled"` <mask> ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsfilter/dnsfilter.go
Rewrites []RewriteEntry `yaml:"rewrites"`
<mask> SafeBrowsingCacheSize int `yaml:"safebrowsing_cache_size"` <mask> SafeSearchCacheSize int `yaml:"safesearch_cache_size"` <mask> ParentalCacheSize int `yaml:"parental_cache_size"` <mask> <mask> // Filtering callback function <mask> FilterHandler func(clientAddr string, settings *RequestFiltering...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsfilter/dnsfilter.go
// ReasonRewrite - rewrite rule was applied ReasonRewrite
<mask> // FilteredSafeSearch - the host was replaced with safesearch variant <mask> FilteredSafeSearch <mask> ) <mask> <mask> func (i Reason) String() string { <mask> names := []string{ </s> + dnsforward: use Rewrites table </s> remove // Custom filtering settings </s> add // RequestFilteringSettings is cus...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsfilter/dnsfilter.go
"Rewrite",
<mask> "FilteredSafeBrowsing", <mask> "FilteredParental", <mask> "FilteredInvalid", <mask> "FilteredSafeSearch", <mask> } <mask> if uint(i) >= uint(len(names)) { <mask> return "" <mask> } <mask> return names[i] <mask> } </s> + dnsforward: use Rewrites table </s> remove var res dnsfilter.Result...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsfilter/dnsfilter.go
// for ReasonRewrite: CanonName string `json:",omitempty"` // CNAME value IPList []net.IP `json:",omitempty"` // list of IP addresses
<mask> IP net.IP `json:",omitempty"` // Not nil only in the case of a hosts file syntax <mask> FilterID int64 `json:",omitempty"` // Filter ID the rule belongs to <mask> } <mask> <mask> // Matched can be used to see if any match at all was found, no matter filtered or not <mask> func (r Reason) Matc...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsfilter/dnsfilter.go
result = d.processRewrites(host, qtype) if result.Reason == ReasonRewrite { return result, nil }
<mask> <mask> var result Result <mask> var err error <mask> // try filter lists first <mask> if setts.FilteringEnabled { <mask> result, err = d.matchHost(host, qtype) <mask> if err != nil { </s> + dnsforward: use Rewrites table </s> remove var res dnsfilter.Result </s> add if host != origHost { lo...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsfilter/dnsfilter.go
answer := []dns.RR{} originalQuestion := d.Req.Question[0] if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName)) // resolve canonical name, not the original host name d.Req.Question[0].Name = dns.Fqdn(res.CanonName) }
<mask> <mask> if d.Res == nil { <mask> // request was not filtered so let it be processed further <mask> err = p.Resolve(d) <mask> if err != nil { <mask> return err <mask> } </s> + dnsforward: use Rewrites table </s> remove var res dnsfilter.Result </s> add if host != origHost { log.Debug("Rew...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsforward/dnsforward.go
if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 { d.Req.Question[0] = originalQuestion d.Res.Question[0] = originalQuestion if len(d.Res.Answer) != 0 { answer = append(answer, d.Res.Answer...) // host -> IP d.Res.Answer = answer } }
<mask> return err <mask> } <mask> } <mask> <mask> shouldLog := true <mask> msg := d.Req <mask> </s> + dnsforward: use Rewrites table </s> remove msg := d.Req host := strings.TrimSuffix(msg.Question[0].Name, ".") </s> add var res dnsfilter.Result req := d.Req host := strings.TrimSuffix(req.Questi...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsforward/dnsforward.go
var res dnsfilter.Result req := d.Req host := strings.TrimSuffix(req.Question[0].Name, ".") origHost := host
<mask> } <mask> <mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered <mask> func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error) { <mask> msg := d.Req <mask> host := strings.TrimSuffix(msg.Question[0].Name, ".") <mask> <mask> s.RLock() <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsforward/dnsforward.go
if host != origHost { log.Debug("Rewrite: not supported: CNAME for %s is %s", origHost, host) }
<mask> if !protectionEnabled { <mask> return nil, nil <mask> } <mask> <mask> var res dnsfilter.Result <mask> var err error <mask> <mask> clientAddr := "" <mask> if d.Addr != nil { <mask> clientAddr, _, _ = net.SplitHostPort(d.Addr.String()) </s> + dnsforward: use Rewrites table </s> remove msg :...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsforward/dnsforward.go
// Make a CNAME response func (s *Server) genCNAMEAnswer(req *dns.Msg, cname string) *dns.CNAME { answer := new(dns.CNAME) answer.Hdr = dns.RR_Header{ Name: req.Question[0].Name, Rrtype: dns.TypeCNAME, Ttl: s.conf.BlockedResponseTTL, Class: dns.ClassINET, } answer.Target = dns.Fqdn(cname) return answ...
<mask> <mask> return &resp <mask> } <mask> <mask> func (s *Server) genNXDomain(request *dns.Msg) *dns.Msg { <mask> resp := dns.Msg{} <mask> resp.SetRcode(request, dns.RcodeNameError) <mask> resp.RecursionAvailable = true </s> + dnsforward: use Rewrites table </s> remove msg := d.Req host := strings.Tri...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1bb6638db796bd733a4b3a0066e7d045579119ec
dnsforward/dnsforward.go
func TestParseDisableMemoryOptimization(t *testing.T) { if testParseOk(t).disableMemoryOptimization { t.Fatal("empty is not disable update") } if !testParseOk(t, "--no-mem-optimization").disableMemoryOptimization { t.Fatal("--no-mem-optimization is disable update") } }
<mask> } <mask> } <mask> <mask> func TestParseService(t *testing.T) { <mask> if testParseOk(t).serviceControlAction != "" { <mask> t.Fatal("empty is no service command") <mask> } </s> * (home): added tests for no-mem-optimization flag </s> remove serviceControlAction: "run", configFilename: "con...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f
home/options_test.go
func TestSerializeDisableMemoryOptimization(t *testing.T) { testSerialize(t, options{disableMemoryOptimization: true}, "--no-mem-optimization") }
<mask> func TestSerializeGLInet(t *testing.T) { <mask> testSerialize(t, options{glinetMode: true}, "--glinet") <mask> } <mask> <mask> func TestSerializeMultiple(t *testing.T) { <mask> testSerialize(t, options{ <mask> serviceControlAction: "run", <mask> configFilename: "config", <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f
home/options_test.go
serviceControlAction: "run", configFilename: "config", workDir: "work", pidFile: "pid", disableUpdate: true, disableMemoryOptimization: true, }, "-c", "config", "-w", "work", "-s", "run", "--pidfile", "pid", "--no-check-update", "--no-mem-opti...
<mask> } <mask> <mask> func TestSerializeMultiple(t *testing.T) { <mask> testSerialize(t, options{ <mask> serviceControlAction: "run", <mask> configFilename: "config", <mask> workDir: "work", <mask> pidFile: "pid", <mask> disableUpdate: true, <mask> }, "-c",...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1c88667306e7a52d36a6a1cbf3eca86fd612bd7f
home/options_test.go
const ( safeBrowsingBlockHost = "standard-block.dns.adguard.com" parentalBlockHost = "family-block.dns.adguard.com" )
<mask> sync.RWMutex <mask> ServerConfig <mask> } <mask> <mask> // uncomment this block to have tracing of locks <mask> /* <mask> func (s *Server) Lock() { <mask> pc := make([]uintptr, 10) // at least 1 entry needed <mask> runtime.Callers(2, pc) <mask> f := runtime.FuncForPC(pc[0]) </s> Resolve into a s...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd
dnsforward/dnsforward.go
// we need upstream to resolve A records upstream := s.chooseUpstream()
<mask> return s.genNotImpl(msg), nil, nil, nil <mask> } <mask> <mask> host := strings.TrimSuffix(msg.Question[0].Name, ".") <mask> // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise <mask> var res dnsfilter.Result <mask> var err error </s> Resolve int...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd
dnsforward/dnsforward.go
switch res.Reason { case dnsfilter.FilteredSafeBrowsing: return s.genArecord(msg, safeBrowsingBlockHost, upstream), &res, nil, nil case dnsfilter.FilteredParental: return s.genArecord(msg, parentalBlockHost, upstream), &res, nil, nil }
<mask> log.Printf("dnsfilter failed to check host '%s': %s", host, err) <mask> return s.genServerFailure(msg), &res, nil, err <mask> } else if res.IsFiltered { <mask> log.Printf("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule) <mask> return s.genNXDomain(msg), &re...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd
dnsforward/dnsforward.go
<mask> } <mask> } <mask> <mask> // TODO: replace with single-socket implementation <mask> upstream := s.chooseUpstream() <mask> reply, err := upstream.Exchange(msg) <mask> if err != nil { <mask> log.Printf("talking to upstream failed for host '%s': %s", host, err) <mask> return s.genServerFailure(m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1c89e1df32d5fcb9d69156c9bfcc1680f733d1dd
dnsforward/dnsforward.go
safebrowsingCache gcache.Cache parentalCache gcache.Cache
<mask> <mask> // these variables need to survive coredns reload <mask> var ( <mask> stats Stats <mask> safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build() <mask> parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build() <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66
dnsfilter/dnsfilter.go
if safebrowsingCache == nil { safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build() }
<mask> return result, nil <mask> } <mask> result, err := d.lookupCommon(host, &stats.Safebrowsing, safebrowsingCache, true, format, handleBody) <mask> return result, err <mask> } <mask> <mask> func (d *Dnsfilter) checkParental(host string) (Result, error) { <mask> // prevent recursion -- checking the hos...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66
dnsfilter/dnsfilter.go
if parentalCache == nil { parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build() }
<mask> return result, nil <mask> } <mask> result, err := d.lookupCommon(host, &stats.Parental, parentalCache, false, format, handleBody) <mask> return result, err <mask> } <mask> <mask> // real implementation of lookup/check </s> dnsfilter -- lazily initialize safebrowsing and parental lookup cache </s> r...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66
dnsfilter/dnsfilter.go
if d != nil && d.transport != nil { d.transport.CloseIdleConnections() }
<mask> <mask> // Destroy is optional if you want to tidy up goroutines without waiting for them to die off <mask> // right now it closes idle HTTP connections if there are any <mask> func (d *Dnsfilter) Destroy() { <mask> d.transport.CloseIdleConnections() <mask> } <mask> <mask> // <mask> // config manipula...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cc1e3749df6ccefb741232d7949fd5893d84f66
dnsfilter/dnsfilter.go
import { formatTime } from '../../helpers/helpers';
<mask> import { saveAs } from 'file-saver/FileSaver'; <mask> import escapeRegExp from 'lodash/escapeRegExp'; <mask> import endsWith from 'lodash/endsWith'; <mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../ui/Card'; <mask> import Loading from '../ui/Loading'; <mask> import Tooltip from ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820
client/src/components/Logs/index.js
Cell: ({ value }) => (<div className="logs__row"><span className="logs__text" title={value}>{formatTime(value)}</span></div>),
<mask> Header: 'Time', <mask> accessor: 'time', <mask> maxWidth: 110, <mask> filterable: false, <mask> }, { <mask> Header: 'Domain name', <mask> accessor: 'domain', <mask> Cell: (row) => { <mask> const r...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820
client/src/components/Logs/index.js
{queryLogEnabled && queryLogs.getLogsProcessing && <Loading />} {queryLogEnabled && !queryLogs.getLogsProcessing &&
<mask> {this.renderButtons(queryLogEnabled)} <mask> </div> <mask> </PageTitle> <mask> <Card> <mask> {queryLogEnabled && queryLogs.processing && <Loading />} <mask> {queryLogEnabled && !queryLogs.pro...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820
client/src/components/Logs/index.js
export const formatTime = (time) => {
<mask> import round from 'lodash/round'; <mask> <mask> import { STATS_NAMES } from './constants'; <mask> <mask> const formatTime = (time) => { <mask> const parsedTime = dateParse(time); <mask> return dateFormat(parsedTime, 'HH:mm:ss'); <mask> }; <mask> <mask> export const normalizeLogs = logs => lo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820
client/src/helpers/helpers.js
time,
<mask> const { value, type, ttl } = response; <mask> return `${type}: ${value} (ttl=${ttl})`; <mask> }) : []; <mask> return { <mask> time: formatTime(time), <mask> domain, <mask> type, <mask> response: responsesArray, <mask> reason, <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1cdbe3f879566f8e08ad0fa88daad5b568750820
client/src/helpers/helpers.js
minWidth: 160,
<mask> columns={[ <mask> { <mask> Header: 'MAC', <mask> accessor: 'mac', <mask> Cell: this.cellWrap, <mask> }, { <mask> Header: 'IP', <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c
client/src/components/Settings/Dhcp/Leases.js
minWidth: 230,
<mask> Cell: this.cellWrap, <mask> }, { <mask> Header: 'IP', <mask> accessor: 'ip', <mask> Cell: this.cellWrap, <mask> sortMethod: sortIp, <mask> }, { <...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c
client/src/components/Settings/Dhcp/Leases.js
minWidth: 230,
<mask> }, { <mask> Header: <Trans>dhcp_table_hostname</Trans>, <mask> accessor: 'hostname', <mask> Cell: this.cellWrap, <mask> }, { <mask> Header: <Trans>dhcp_table_expires</Tran...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c
client/src/components/Settings/Dhcp/Leases.js
minWidth: 130,
<mask> Cell: this.cellWrap, <mask> }, { <mask> Header: <Trans>dhcp_table_expires</Trans>, <mask> accessor: 'expires', <mask> Cell: this.cellWrap, <mask> }, <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c
client/src/components/Settings/Dhcp/Leases.js
minWidth: 160,
<mask> { <mask> Header: 'MAC', <mask> accessor: 'mac', <mask> Cell: cellWrap, <mask> }, <mask> { <mask> Header: 'IP', </s> Pull request 1775: 5581-leases-ta...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c
client/src/components/Settings/Dhcp/StaticLeases/index.js
minWidth: 230,
<mask> Header: 'IP', <mask> accessor: 'ip', <mask> sortMethod: sortIp, <mask> Cell: cellWrap, <mask> }, <mask> { </s> Pull request 1775: 5581-leases-table-mobile Updates #5581....
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c
client/src/components/Settings/Dhcp/StaticLeases/index.js
minWidth: 230,
<mask> Header: <Trans>dhcp_table_hostname</Trans>, <mask> accessor: 'hostname', <mask> Cell: cellWrap, <mask> }, <mask> { <mask> Header: <Trans>actions_table_header</Trans>, <ma...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c
client/src/components/Settings/Dhcp/StaticLeases/index.js
"local_ptr_default_resolver": "By default, AdGuard Home will use the following DNS resolvers: {{ip}}", "local_ptr_no_default_resolver": "AdGuard Home could not determine suitable private rDNS resolvers for this system.",
<mask> "local_ptr_title": "Private reverse DNS servers", <mask> "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the de...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
client/src/__locales/en.json
const defaultLocalPtrUpstreams = useSelector( (state) => state.dnsConfig.default_local_ptr_upstreams, );
<mask> const { t } = useTranslation(); <mask> const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns); <mask> const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream); <mask> const processingSetConfig = useSelector((state) =...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
client/src/components/Settings/Dns/Upstream/Form.js
<div className="form__desc form__desc--top"> {/** TODO: Add internazionalization for "" */} {defaultLocalPtrUpstreams?.length > 0 ? ( <Trans values={{ ip: defaultLocalPtrUpstreams.map((s) => `"${s}"`).join(', ') }}>local_ptr_default_resolve...
<mask> <Trans>local_ptr_desc</Trans> <mask> </div> <mask> <Field <mask> id="local_ptr_upstreams" <mask> name="local_ptr_upstreams" <mask> component={renderTextareaField} <mask> type...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
client/src/components/Settings/Dns/Upstream/Form.js
// Get returns the slice of local resolvers' addresses. It should be // safe for concurrent use.
<mask> type HostGenFunc func() (host string) <mask> <mask> // SystemResolvers helps to work with local resolvers' addresses provided by OS. <mask> type SystemResolvers interface { <mask> // Get returns the slice of local resolvers' addresses. <mask> // It should be safe for concurrent use. <mask> Get() (rs [...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/aghnet/systemresolvers.go
sysResolvers aghnet.SystemResolvers
<mask> ipset ipsetCtx <mask> subnetDetector *aghnet.SubnetDetector <mask> localResolvers *proxy.Proxy <mask> recDetector *recursionDetector <mask> <mask> tableHostToIP hostToIPTable <mask> tableHostToIPLock sync.Mutex <mask> </s> Pull request: 3136 show default resolvers Merge in DNS/a...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/dnsforward.go
// TODO(e.burkov): Enable the refresher after the actual implementation // passes the public testing. s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil) if err != nil { return nil, fmt.Errorf("initializing system resolvers: %w", err) }
<mask> localDomainSuffix: localDomainSuffix, <mask> recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReqNum), <mask> } <mask> <mask> if p.DHCPServer != nil { <mask> s.dhcpServer = p.DHCPServer <mask> s.dhcpServer.SetOnLeaseChanged(s.onDHCPLeaseChanged) <mask> s.onDHCPLeaseChange...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/dnsforward.go
func (s *Server) filterOurDNSAddrs(addrs []string) (filtered []string, err error) { var ourAddrs []string ourAddrs, err = s.collectDNSIPAddrs() if err != nil { return nil, err } ourAddrsSet := aghstrings.NewSet(ourAddrs...) // TODO(e.burkov): The approach of subtracting sets of strings is not // really appli...
<mask> <mask> return addrs[:i], nil <mask> } <mask> <mask> // setupResolvers initializes the resolvers for local addresses. For internal <mask> // use only. <mask> func (s *Server) setupResolvers(localAddrs []string) (err error) { <mask> bootstraps := s.conf.BootstrapDNS <mask> if len(localAddrs) == 0 { ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/dnsforward.go
localAddrs = s.sysResolvers.Get()
<mask> // use only. <mask> func (s *Server) setupResolvers(localAddrs []string) (err error) { <mask> bootstraps := s.conf.BootstrapDNS <mask> if len(localAddrs) == 0 { <mask> var sysRes aghnet.SystemResolvers <mask> // TODO(e.burkov): Enable the refresher after the actual <mask> // implementation passes ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/dnsforward.go
<mask> <mask> localAddrs = sysRes.Get() <mask> bootstraps = nil <mask> } <mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) <mask> <mask> var ourAddrs []string <mask> ourAddrs, err = s.collectDNSIPAddrs() <mask> if err != nil { <mask> return err </s> Pull request: 3...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/dnsforward.go
localAddrs, err = s.filterOurDNSAddrs(localAddrs)
<mask> bootstraps = nil <mask> } <mask> log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs) <mask> <mask> var ourAddrs []string <mask> ourAddrs, err = s.collectDNSIPAddrs() <mask> if err != nil { <mask> return err <mask> } <mask> <mask> ourAddrsSet := aghstrings.NewSet(ourA...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/dnsforward.go
log.Debug("upstreams to resolve PTR for local addresses: %v", localAddrs)
<mask> if err != nil { <mask> return err <mask> } <mask> <mask> ourAddrsSet := aghstrings.NewSet(ourAddrs...) <mask> <mask> // TODO(e.burkov): The approach of subtracting sets of strings is not <mask> // really applicable here since in case of listening on all network <mask> // interfaces we should c...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/dnsforward.go
defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get()) if err != nil { log.Debug("getting dns configuration: %s", err) } resp := struct { dnsConfig // DefautLocalPTRUpstreams is used to pass the addresses from // systemResolvers to the front-end. It's not a pointer to the slice // since there ...
<mask> } <mask> } <mask> <mask> func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) { <mask> resp := s.getDNSConfig() <mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> <mask> enc := json.NewEncoder(w) <mask> if err := enc.Encode(resp); err != nil { </s> Pull...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/http.go
if err = json.NewEncoder(w).Encode(resp); err != nil {
<mask> resp := s.getDNSConfig() <mask> <mask> w.Header().Set("Content-Type", "application/json") <mask> <mask> enc := json.NewEncoder(w) <mask> if err := enc.Encode(resp); err != nil { <mask> httpError(r, w, http.StatusInternalServerError, "json.Encoder: %s", err) <mask> return <mask> } <mask> } <...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/http.go
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/require" <mask> ) <mask> <mask> // fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests. </s> Pull request: 3136 ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/http_test.go
// fakeSystemResolvers is a mock aghnet.SystemResolvers implementation for tests. type fakeSystemResolvers struct { // SystemResolvers is embedded here simply to make *fakeSystemResolvers // an aghnet.SystemResolvers without actually implementing all methods. aghnet.SystemResolvers } // Get implements the aghnet.Sy...
<mask> ) <mask> <mask> func loadTestData(t *testing.T, casesFileName string, cases interface{}) { <mask> t.Helper() <mask> <mask> var f *os.File <mask> f, err := os.Open(filepath.Join("testdata", casesFileName)) </s> Pull request: 3136 show default resolvers Merge in DNS/adguard-home from 3136-show-defaul...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/http_test.go
s.sysResolvers = &fakeSystemResolvers{}
<mask> } <mask> s := createTestServer(t, filterConf, forwardConf, nil) <mask> require.Nil(t, s.Start()) <mask> t.Cleanup(func() { <mask> require.Nil(t, s.Stop()) <mask> }) <mask> </s> Pull request: 3136 show default resolvers Merge in DNS/adguard-home from 3136-show-default to master Closes #3136. Sq...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/http_test.go
s.sysResolvers = &fakeSystemResolvers{}
<mask> ConfigModified: func() {}, <mask> } <mask> s := createTestServer(t, filterConf, forwardConf, nil) <mask> <mask> defaultConf := s.conf <mask> <mask> err := s.Start() </s> Pull request: 3136 show default resolvers Merge in DNS/adguard-home from 3136-show-default to master Closes #3136. Squashed ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
internal/dnsforward/http_test.go
'allOf': - '$ref': '#/components/schemas/DNSConfig' - 'type': 'object' 'properties': 'default_local_ptr_upstreams': 'type': 'array' 'items': 'type': 'string' ...
<mask> 'description': 'OK' <mask> 'content': <mask> 'application/json': <mask> 'schema': <mask> '$ref': '#/components/schemas/DNSConfig' <mask> '/dns_config': <mask> 'post': <mask> 'tags': <mask> - 'global' <mask> 'operation...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e55db408f78eccb36f2bd4afa719c1c9d88c470
openapi/openapi.yaml
github.com/AdguardTeam/dnsproxy v0.33.1
<mask> <mask> go 1.14 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.33.0 <mask> github.com/AdguardTeam/golibs v0.4.2 <mask> github.com/AdguardTeam/urlfilter v0.12.3 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39
go.mod
github.com/joomcode/errorx v1.0.3 // indirect
<mask> github.com/fsnotify/fsnotify v1.4.9 <mask> github.com/gobuffalo/packr v1.30.1 <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 <mask> github.com/insomniacslk/dhcp v0.0.0-20200621044212-d74cd86ad5b8 <mask> github.com/kardianos/service v1.1.0 <mask> github.com/mdlayher/ethernet...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39
go.mod
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf
<mask> go.etcd.io/bbolt v1.3.4 <mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 <mask> golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 <mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect <mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 <mask> golang.org/x/text ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39
go.mod
github.com/AdguardTeam/dnsproxy v0.33.1 h1:rEAS1fBEQ3JslzsfkcyMRV96OeBWFnKzXvksduI0ous= github.com/AdguardTeam/dnsproxy v0.33.1/go.mod h1:kLi6lMpErnZThy5haiRSis4q0KTB8uPWO4JQsU1EDJA=
<mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= <mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= <mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39
go.sum
github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw= github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
<mask> github.com/joomcode/errorx v1.0.1 h1:CalpDWz14ZHd68fIqluJasJosAewpz2TFaJALrUxjrk= <mask> github.com/joomcode/errorx v1.0.1/go.mod h1:kgco15ekB6cs+4Xjzo7SPeXzx38PbJzBwbnu9qfVNHQ= <mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= <mask> github.com/jstemmer/go-juni...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39
go.sum
golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s= golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= <mask> golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9Dt...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1e583315a867fdd0aeaf787ff95bd7525faf9b39
go.sum
// Retain the current absolute path of the executable, since the updater is // likely to change the position current one to the backup directory. // // See https://github.com/AdguardTeam/AdGuardHome/issues/4735. execPath, err := os.Executable() if err != nil { aghhttp.Error(r, w, http.StatusInternalServerError,...
<mask> <mask> return <mask> } <mask> <mask> err := Context.updater.Update() <mask> if err != nil { <mask> aghhttp.Error(r, w, http.StatusInternalServerError, "%s", err) <mask> <mask> return <mask> } </s> Pull request: home: fix exe path finding Closes #4735. Squashed commit of the following: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
// The background context is used because the underlying functions wrap it // with timeout and shut down the server, which handles current request. It // also should be done in a separate goroutine for the same reason. go finishUpdate(context.Background(), execPath)
<mask> if f, ok := w.(http.Flusher); ok { <mask> f.Flush() <mask> } <mask> <mask> // The background context is used because the underlying functions wrap <mask> // it with timeout and shut down the server, which handles current <mask> // request. It also should be done in a separate goroutine due to the ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
func finishUpdate(ctx context.Context, execPath string) { var err error log.Info("stopping all tasks")
<mask> return c.Enabled && (c.PortHTTPS < 1024 || c.PortDNSOverTLS < 1024 || c.PortDNSOverQUIC < 1024) <mask> } <mask> <mask> // finishUpdate completes an update procedure. <mask> func finishUpdate(ctx context.Context) { <mask> log.Info("Stopping all tasks") <mask> cleanup(ctx) <mask> cleanupAlways() <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
<mask> log.Info("Stopping all tasks") <mask> cleanup(ctx) <mask> cleanupAlways() <mask> <mask> curBinName, err := os.Executable() <mask> if err != nil { <mask> log.Fatalf("executable path request failed: %s", err) <mask> } <mask> <mask> if runtime.GOOS == "windows" { <mask> if Context.runningAsS...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
// NOTE: We can't restart the service via "kardianos/service" // package, because it kills the process first we can't start a new // instance, because Windows doesn't allow it. // // TODO(a.garipov): Recheck the claim above.
<mask> } <mask> <mask> if runtime.GOOS == "windows" { <mask> if Context.runningAsService { <mask> // Note: <mask> // we can't restart the service via "kardianos/service" package - it kills the process first <mask> // we can't start a new instance - Windows doesn't allow it <mask> cmd := exec.Co...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
log.Fatalf("restarting: stopping: %s", err)
<mask> // we can't start a new instance - Windows doesn't allow it <mask> cmd := exec.Command("cmd", "/c", "net stop AdGuardHome & net start AdGuardHome") <mask> err = cmd.Start() <mask> if err != nil { <mask> log.Fatalf("exec.Command() failed: %s", err) <mask> } <mask> os.Exit(0) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
cmd := exec.Command(execPath, os.Args[1:]...) log.Info("restarting: %q %q", execPath, os.Args[1:])
<mask> } <mask> os.Exit(0) <mask> } <mask> <mask> cmd := exec.Command(curBinName, os.Args[1:]...) <mask> log.Info("Restarting: %v", cmd.Args) <mask> cmd.Stdin = os.Stdin <mask> cmd.Stdout = os.Stdout <mask> cmd.Stderr = os.Stderr <mask> err = cmd.Start() <mask> if err != nil { </s> Pu...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
log.Fatalf("restarting:: %s", err)
<mask> cmd.Stdout = os.Stdout <mask> cmd.Stderr = os.Stderr <mask> err = cmd.Start() <mask> if err != nil { <mask> log.Fatalf("exec.Command() failed: %s", err) <mask> } <mask> os.Exit(0) <mask> } else { <mask> log.Info("Restarting: %v", os.Args) <mask> err = syscall.Exec(curBinName, os.Arg...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
} log.Info("restarting: %q %q", execPath, os.Args[1:]) err = syscall.Exec(execPath, os.Args, os.Environ()) if err != nil { log.Fatalf("restarting: %s", err)
<mask> if err != nil { <mask> log.Fatalf("exec.Command() failed: %s", err) <mask> } <mask> os.Exit(0) <mask> } else { <mask> log.Info("Restarting: %v", os.Args) <mask> err = syscall.Exec(curBinName, os.Args, os.Environ()) <mask> if err != nil { <mask> log.Fatalf("syscall.Exec() failed: %s", ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1eafb4e7cf64f0027674e59e4a4b5ccc33c44c43
internal/home/controlupdate.go
func getReversedSlice(input [statsHistoryElements]float64, start int, end int) []float64 {
<mask> <mask> // -------------------------- <mask> // helper functions for stats <mask> // -------------------------- <mask> func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 { <mask> output := make([]float64, 0) <mask> for i := start; i <= end; i++ { <mask> output = append(o...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61
helpers.go
output = append([]float64{input[i]}, output...)
<mask> // -------------------------- <mask> func getSlice(input [statsHistoryElements]float64, start int, end int) []float64 { <mask> output := make([]float64, 0) <mask> for i := start; i <= end; i++ { <mask> output = append(output, input[i]) <mask> } <mask> return output <mask> } <mask> <mask> func ge...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61
helpers.go
count := getReversedSlice(stats.entries[processingTimeCount], start, end) sum := getReversedSlice(stats.entries[processingTimeSum], start, end)
<mask> end = clamp(end, 0, statsHistoryElements) <mask> <mask> avgProcessingTime := make([]float64, 0) <mask> <mask> count := getSlice(stats.entries[processingTimeCount], start, end) <mask> sum := getSlice(stats.entries[processingTimeSum], start, end) <mask> for i := 0; i < len(count); i++ { <mask> var...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61
helpers.go
"dns_queries": getReversedSlice(stats.entries[totalRequests], start, end), "blocked_filtering": getReversedSlice(stats.entries[filteredLists], start, end), "replaced_safebrowsing": getReversedSlice(stats.entries[filteredSafebrowsing], start, end), "replaced_safesearch": getReversedSlice(stats.en...
<mask> avgProcessingTime = append(avgProcessingTime, avg) <mask> } <mask> <mask> result := map[string]interface{}{ <mask> "dns_queries": getSlice(stats.entries[totalRequests], start, end), <mask> "blocked_filtering": getSlice(stats.entries[filteredLists], start, end), <mask> "replaced_sa...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f0fdef8d6b2ce324e7009bb3f95626d87438d61
helpers.go
if (payload && versionCompare(currentVersion, payload.new_version) === -1) {
<mask> [actions.getVersionFailure]: state => ({ ...state, processingVersion: false }), <mask> [actions.getVersionSuccess]: (state, { payload }) => { <mask> const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion; <mask> <mask> if (payload && versionCompare(currentVer...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702
client/src/reducers/index.js
<mask> const currentVersion = state.dnsVersion === 'undefined' ? 0 : state.dnsVersion; <mask> <mask> if (payload && versionCompare(currentVersion, payload.version) === -1) { <mask> const { <mask> version, <mask> announcement_url: announcementUrl, <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702
client/src/reducers/index.js
<mask> } = payload; <mask> <mask> const newState = { <mask> ...state, <mask> version, <mask> announcementUrl, <mask> newVersion, <mask> canAutoUpdate, <mask> isUpdateAvailable: true, <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f164c70059a8f2f8d6e33b805243dbcd6ce4702
client/src/reducers/index.js
if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") && config.RlimitNoFile != 0 { setRlimit(config.RlimitNoFile) }
<mask> log.Fatal(err) <mask> } <mask> <mask> // override bind host/port from the console <mask> if args.bindHost != "" { <mask> config.BindHost = args.bindHost <mask> } <mask> if args.bindPort != 0 { </s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process </s> remove B...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b
app.go
// Set user-specified limit of how many fd's we can use // https://github.com/AdguardTeam/AdGuardHome/issues/659 func setRlimit(val uint) { var rlim syscall.Rlimit rlim.Max = uint64(val) rlim.Cur = uint64(val) err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlim) if err != nil { log.Error("Setrlimit() failed: %...
<mask> } <mask> } <mask> <mask> func cleanup() { <mask> log.Info("Stopping AdGuard Home") <mask> <mask> err := stopDNSServer() <mask> if err != nil { <mask> log.Error("Couldn't stop DNS server: %s", err) </s> + config: add "rlimit_nofile" setting - Maximum number of opened fd's per process </s> remove...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b
app.go
BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server AuthName string `yaml:"auth_name"` // AuthName is the basic auth username AuthPass string `yaml:"auth_pass"` // Au...
<mask> ourConfigFilename string // Config filename (can be overridden via the command line arguments) <mask> ourWorkingDir string // Location of our directory, used to protect against CWD being somewhere else <mask> firstRun bool // if set to true, don't run any services except HTTP web inteface, a...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/1f1e26f67b00ee4983c65e4e3aabf59a488f687b
config.go