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
Name: arpa,
<mask> Id: dns.Id(), <mask> RecursionDesired: true, <mask> }, <mask> Question: []dns.Question{{ <mask> Name: name, <mask> Qtype: dns.TypePTR, <mask> Qclass: dns.ClassINET, <mask> }}, <mask> }) <mask> if err != nil { </s> Pull request: 2704 local addresses vol.2 Merge ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
} var resp *dns.Msg if r.subnetDetector.IsLocallyServedNetwork(ip) { resp, err = r.localResolvers.Exchange(msg) } else { resp, err = r.dnsServer.Exchange(msg) }
<mask> Name: name, <mask> Qtype: dns.TypePTR, <mask> Qclass: dns.ClassINET, <mask> }}, <mask> }) <mask> if err != nil { <mask> log.Debug("Error while making an rDNS lookup for %s: %s", ip, err) <mask> return "" <mask> } <mask> if len(resp.Answer) == 0 { </s> Pull request: 2704 local add...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
return "", fmt.Errorf("performing lookup for %q: %w", arpa, err)
<mask> Qclass: dns.ClassINET, <mask> }}, <mask> }) <mask> if err != nil { <mask> log.Debug("Error while making an rDNS lookup for %s: %s", ip, err) <mask> return "" <mask> } <mask> if len(resp.Answer) == 0 { <mask> log.Debug("No answer for rDNS lookup of %s", ip) <mask> return "" <mask> } ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
<mask> log.Debug("Error while making an rDNS lookup for %s: %s", ip, err) <mask> return "" <mask> } <mask> if len(resp.Answer) == 0 { <mask> log.Debug("No answer for rDNS lookup of %s", ip) <mask> return "" <mask> } <mask> ptr, ok := resp.Answer[0].(*dns.PTR) <mask> if !ok { <mask> log.Debug("n...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
return "", fmt.Errorf("type checking: %w", rDNSNotPTRErr)
<mask> return "" <mask> } <mask> ptr, ok := resp.Answer[0].(*dns.PTR) <mask> if !ok { <mask> log.Debug("not a PTR response for %s", ip) <mask> return "" <mask> } <mask> <mask> log.Tracef("PTR response for %s: %s", ip, ptr.String()) <mask> if strings.HasSuffix(ptr.Ptr, ".") { <mask> ptr.Ptr = p...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
log.Tracef("rdns: ptr response for %q: %s", ip, ptr.String())
<mask> log.Debug("not a PTR response for %s", ip) <mask> return "" <mask> } <mask> <mask> log.Tracef("PTR response for %s: %s", ip, ptr.String()) <mask> if strings.HasSuffix(ptr.Ptr, ".") { <mask> ptr.Ptr = ptr.Ptr[:len(ptr.Ptr)-1] <mask> } <mask> <mask> return ptr.Ptr <mask> } <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
return strings.TrimSuffix(ptr.Ptr, "."), nil
<mask> if strings.HasSuffix(ptr.Ptr, ".") { <mask> ptr.Ptr = ptr.Ptr[:len(ptr.Ptr)-1] <mask> } <mask> <mask> return ptr.Ptr <mask> } <mask> <mask> // Wait for a signal and then synchronously resolve hostname by IP address <mask> // Add the hostname:IP pair to "Clients" array <mask> func (r *RDNS) worke...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
// workerLoop handles incoming IP addresses from ipChan and adds it into // clients.
<mask> <mask> return ptr.Ptr <mask> } <mask> <mask> // Wait for a signal and then synchronously resolve hostname by IP address <mask> // Add the hostname:IP pair to "Clients" array <mask> func (r *RDNS) workerLoop() { <mask> for { <mask> ip := <-r.ipChannel <mask> <mask> host := r.resolve(ip) </s> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
defer agherr.LogPanic("rdns") for ip := range r.ipCh { host, err := r.resolve(ip) if err != nil { log.Error("rdns: resolving %q: %s", ip, err)
<mask> <mask> // Wait for a signal and then synchronously resolve hostname by IP address <mask> // Add the hostname:IP pair to "Clients" array <mask> func (r *RDNS) workerLoop() { <mask> for { <mask> ip := <-r.ipChannel <mask> <mask> host := r.resolve(ip) <mask> if len(host) == 0 { <mask> continue...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
<mask> func (r *RDNS) workerLoop() { <mask> for { <mask> ip := <-r.ipChannel <mask> <mask> host := r.resolve(ip) <mask> if len(host) == 0 { <mask> continue <mask> } <mask> <mask> _, _ = r.clients.AddHost(ip.String(), host, ClientSourceRDNS) <mask> } </s> Pull request: 2704 local addresses v...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
// Don't handle any errors since AddHost doesn't return non-nil // errors for now.
<mask> } <mask> <mask> _, _ = r.clients.AddHost(ip.String(), host, ClientSourceRDNS) <mask> } <mask> } </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master Updates #2704. Updates #2829. Squashed commit of the following: commit 507d038c2709de59...
[ "keep", "add", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns.go
"bytes" "encoding/binary" "errors"
<mask> <mask> import ( <mask> "net" <mask> "sync" <mask> "testing" <mask> "time" <mask> </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master Updates #2704. Updates #2829. Squashed commit of the following: commit 507d038c2709de59246fc0b65c3c4...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
"sync"
<mask> "errors" <mask> "net" <mask> "testing" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master Updates #2704. Updates #2829. Squashed commit of the following:...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
"time"
<mask> "errors" <mask> "net" <mask> "sync" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" <mask> "github.com/AdguardTeam/dnsproxy/proxy" </...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "sync" <mask> "testing" <mask> "time" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest" <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" </s> Pull request: 2704 local...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
"github.com/AdguardTeam/golibs/cache" "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/require" <mask> ) <mask> <mask> func TestRDNS_Begin(t *testing.T) { </s> Pull request: 2704 local addresses vol.2 Merge in DNS/ad...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
"github.com/stretchr/testify/require"
<mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/stretchr/testify/assert" <mask> ) <mask> <mask> func TestRDNS_Begin(t *testing.T) { <mask> aghtest.ReplaceLogLevel(t, log.DEBUG) <mask> w := &bytes.Buffer{} </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home from 2704-local...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
func TestRDNS_Begin(t *testing.T) { aghtest.ReplaceLogLevel(t, log.DEBUG) w := &bytes.Buffer{} aghtest.ReplaceLogWriter(t, w) ip1234, ip1235 := net.IP{1, 2, 3, 4}, net.IP{1, 2, 3, 5} testCases := []struct { cliIDIndex map[string]*Client customChan chan net.IP name string wantLog stri...
<mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/stretchr/testify/assert" <mask> ) <mask> <mask> func TestResolveRDNS(t *testing.T) { <mask> ups := &aghtest.TestUpstream{ <mask> Reverse: map[string][]string{ <mask> "1.1.1.1.in-addr.arpa.": {"one.one.one.one"}, <mask> }, <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
locUpstream := &aghtest.TestUpstream{ Reverse: map[string][]string{ "1.1.168.192.in-addr.arpa.": {"local.domain"}, "2.1.168.192.in-addr.arpa.": {}, }, } upstreamErr := errors.New("upstream error") errUpstream := &aghtest.TestErrUpstream{ Err: upstreamErr, } nonPtrUpstream := &aghtest.TestBlockUpstream...
<mask> }, <mask> } <mask> dns := dnsforward.NewCustomServer(&proxy.Proxy{ <mask> Config: proxy.Config{ <mask> UpstreamConfig: &proxy.UpstreamConfig{ <mask> Upstreams: []upstream.Upstream{extUpstream}, <mask> }, <mask> }, </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
Upstreams: []upstream.Upstream{extUpstream},
<mask> } <mask> dns := dnsforward.NewCustomServer(&proxy.Proxy{ <mask> Config: proxy.Config{ <mask> UpstreamConfig: &proxy.UpstreamConfig{ <mask> Upstreams: []upstream.Upstream{ups}, <mask> }, <mask> }, <mask> }) <mask> <mask> clients := &clientsContainer{} </s> Pull request: 2704 local ad...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
cc := &clientsContainer{} snd, err := aghnet.NewSubnetDetector() require.NoError(t, err) localIP := net.IP{192, 168, 1, 1} testCases := []struct { name string want string wantErr error locUpstream upstream.Upstream req net.IP }{{ name: "external_good", want: ...
<mask> }, <mask> }, <mask> }) <mask> <mask> clients := &clientsContainer{} <mask> rdns := InitRDNS(dns, clients) <mask> r := rdns.resolve(net.IP{1, 1, 1, 1}) <mask> assert.Equal(t, "one.one.one.one", r, r) <mask> } </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home from 2704-l...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/home/rdns_test.go
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "runtime" <mask> "strings" <mask> "sync" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/fsnotify/fsnotify" <mask> "github.com/miekg/dns" <mask> ) </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master Updates #2704...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/util/autohosts.go
ipReal := aghnet.UnreverseAddr(addr)
<mask> if qtype != dns.TypePTR { <mask> return nil <mask> } <mask> <mask> ipReal := DNSUnreverseAddr(addr) <mask> if ipReal == nil { <mask> return nil <mask> } <mask> <mask> ipStr := ipReal.String() </s> Pull request: 2704 local addresses vol.2 Merge in DNS/adguard-home from 2704-local-addresses...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/86444eacc2d38666b949b37163e9e53b499119eb
internal/util/autohosts.go
<mask> require.Len(t, ips, 1) <mask> assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0])) <mask> }) <mask> } <mask> <mask> func TestDNSReverseAddr(t *testing.T) { <mask> testCases := []struct { <mask> name string <mask> have string <mask> want net.IP <mask> }{{ <mask> name: "good_ipv4", <mask...
[ "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/86444eacc2d38666b949b37163e9e53b499119eb
internal/util/autohosts_test.go
<mask> if host == "" { <mask> return Result{Reason: NotFilteredNotFound}, nil <mask> } <mask> host = strings.ToLower(host) <mask> // prevent recursion <mask> if host == d.parentalServer || host == d.safeBrowsingServer { <mask> return Result{}, nil <mask> } <mask> <mask> var result Result <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/864c91e52412c8dc7d47d6d550fa4e96f08e49b4
dnsfilter/dnsfilter.go
// Servers to use for resolution of SB/PC server name var bootstrapServers = []string{"176.103.130.130", "176.103.130.131"}
<mask> ) <mask> <mask> const dnsTimeout = 3 * time.Second <mask> const defaultSafebrowsingServer = "https://dns-family.adguard.com/dns-query" <mask> const defaultParentalServer = "https://dns-family.adguard.com/dns-query" <mask> const sbTXTSuffix = "sb.dns.adguard.com." <mask> const pcTXTSuffix = "pc.dns.adguar...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/864c91e52412c8dc7d47d6d550fa4e96f08e49b4
dnsfilter/security.go
opts := upstream.Options{Timeout: dnsTimeout, Bootstrap: bootstrapServers}
<mask> d.safeBrowsingServer = defaultSafebrowsingServer <mask> d.parentalServer = defaultParentalServer <mask> <mask> d.parentalUpstream, err = upstream.AddressToUpstream(d.parentalServer, opts) <mask> if err != nil { <mask> return err </s> Merge: - DNS: fix security checks via PC/SB services Squashed co...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/864c91e52412c8dc7d47d6d550fa4e96f08e49b4
dnsfilter/security.go
d.parentalUpstream, err = upstream.AddressToUpstream(d.parentalServer, opts)
<mask> var err error <mask> d.safeBrowsingServer = defaultSafebrowsingServer <mask> d.parentalServer = defaultParentalServer <mask> <mask> d.parentalUpstream, err = upstream.AddressToUpstream(d.parentalServer, upstream.Options{Timeout: dnsTimeout}) <mask> if err != nil { <mask> return err <mask> } <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/864c91e52412c8dc7d47d6d550fa4e96f08e49b4
dnsfilter/security.go
d.safeBrowsingUpstream, err = upstream.AddressToUpstream(d.safeBrowsingServer, opts)
<mask> if err != nil { <mask> return err <mask> } <mask> <mask> d.safeBrowsingUpstream, err = upstream.AddressToUpstream(d.safeBrowsingServer, upstream.Options{Timeout: dnsTimeout}) <mask> if err != nil { <mask> return err <mask> } <mask> <mask> return nil </s> Merge: - DNS: fix security checks v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/864c91e52412c8dc7d47d6d550fa4e96f08e49b4
dnsfilter/security.go
// Return TRUE of host name matches a wildcard pattern func matchDomainWildcard(host, wildcard string) bool { return len(wildcard) >= 2 && wildcard[0] == '*' && wildcard[1] == '.' && strings.HasSuffix(host, wildcard[1:]) }
<mask> } <mask> <mask> // Process rewrites table <mask> // . Find CNAME for a domain name <mask> // . if found, set domain name to canonical name <mask> // . Find A or AAAA record for a domain name </s> + DNS Rewrites: support wildcard domain name </s> remove continue </s> add if !matchDomainWildcard(ho...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8685584bf52450f255099617eb641ab636e97ff5
dnsfilter/dnsfilter.go
if !matchDomainWildcard(host, r.Domain) { continue }
<mask> defer d.confLock.RUnlock() <mask> <mask> for _, r := range d.Rewrites { <mask> if r.Domain != host { <mask> continue <mask> } <mask> <mask> ip := net.ParseIP(r.Answer) <mask> if ip == nil { <mask> log.Debug("Rewrite: CNAME for %s is %s", host, r.Answer) </s> + DNS Rewrites: support w...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8685584bf52450f255099617eb641ab636e97ff5
dnsfilter/dnsfilter.go
if !matchDomainWildcard(host, r.Domain) { continue }
<mask> } <mask> <mask> for _, r := range d.Rewrites { <mask> if r.Domain != host { <mask> continue <mask> } <mask> <mask> ip := net.ParseIP(r.Answer) <mask> if ip == nil { <mask> continue </s> + DNS Rewrites: support wildcard domain name </s> remove continue </s> add if !matchDomainW...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8685584bf52450f255099617eb641ab636e97ff5
dnsfilter/dnsfilter.go
"github.com/joomcode/errorx"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/hmage/golibs/log" <mask> "github.com/miekg/dns" <mask> govalidator "gopkg.in/asaskevich/govalidator.v4" <mask> ) <mask> <mask> const updatePeriod = time.Minute * 30 </s> /tls/config...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/876bec5a65acfd8eae3aa4c4fcb4692d19efc166
control.go
data, err := unmarshalTLS(r)
<mask> } <mask> } <mask> <mask> func handleTLSConfigure(w http.ResponseWriter, r *http.Request) { <mask> data := tlsConfig{} <mask> err := json.NewDecoder(r.Body).Decode(&data) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to parse new TLS config json: %s", err) <mask> retu...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/876bec5a65acfd8eae3aa4c4fcb4692d19efc166
control.go
httpError(w, http.StatusBadRequest, "Failed to unmarshal TLS config: %s", err)
<mask> func handleTLSConfigure(w http.ResponseWriter, r *http.Request) { <mask> data := tlsConfig{} <mask> err := json.NewDecoder(r.Body).Decode(&data) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to parse new TLS config json: %s", err) <mask> return <mask> } <mask> <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/876bec5a65acfd8eae3aa4c4fcb4692d19efc166
control.go
log.Printf("got certificate: %s", data.CertificateChain)
<mask> return <mask> } <mask> <mask> if data.CertificateChain != "" { <mask> certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to base64-decode certificate chain: %s", err) <mask> return <mask> } <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/876bec5a65acfd8eae3aa4c4fcb4692d19efc166
control.go
_, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
<mask> <mask> log.Printf("got certificate: %s", certPEM) <mask> <mask> if data.PrivateKey != "" { <mask> keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest, "Failed to base64-decode private key: %s", err) <mask> re...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/876bec5a65acfd8eae3aa4c4fcb4692d19efc166
control.go
pemblock := []byte(data.CertificateChain)
<mask> // now do a more extended validation <mask> var certs []*pem.Block // PEM-encoded certificates <mask> var skippedBytes []string // skipped bytes <mask> <mask> pemblock := []byte(certPEM) <mask> for { <mask> var decoded *pem.Block <mask> decoded, pemblock = pem.Decode(pemblock) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/876bec5a65acfd8eae3aa4c4fcb4692d19efc166
control.go
config.ourWorkingDir = "..." // set absolute path newver := "v0.96" data := `{ "version": "v0.96", "announcement": "AdGuard Home v0.96 is now available!", "announcement_url": "", "download_windows_amd64": "", "download_windows_386": "", "download_darwin_amd64": "", "download_linux_amd64": "https://git...
<mask> ) <mask> <mask> func TestDoUpdate(t *testing.T) { <mask> config.DNS.Port = 0 <mask> config.ourWorkingDir = "." <mask> u := updateInfo{ <mask> pkgURL: "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.95/AdGuardHome_v0.95_linux_amd64.tar.gz", <mask> pkgName: "./Ad...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/885b660808a848277f080c78dc7e6107afdbabb7
home/control_update_test.go
pkgURL: "https://github.com/AdguardTeam/AdGuardHome/releases/download/" + newver + "/AdGuardHome_linux_amd64.tar.gz", pkgName: config.ourWorkingDir + "/agh-update-" + newver + "/AdGuardHome_linux_amd64.tar.gz", newVer: newver, updateDir: config.ourWorkingDir + "/agh-update-" ...
<mask> func TestDoUpdate(t *testing.T) { <mask> config.DNS.Port = 0 <mask> config.ourWorkingDir = "." <mask> u := updateInfo{ <mask> pkgURL: "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.95/AdGuardHome_v0.95_linux_amd64.tar.gz", <mask> pkgName: "./AdGuardHome_v0.95_lin...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/885b660808a848277f080c78dc7e6107afdbabb7
home/control_update_test.go
if uu.pkgURL != u.pkgURL || uu.pkgName != u.pkgName || uu.newVer != u.newVer || uu.updateDir != u.updateDir || uu.backupDir != u.backupDir || uu.configName != u.configName || uu.updateConfigName != u.updateConfigName || uu.curBinName != u.curBinName || uu.bkpBinName != u.bkpBinName || uu.newBinName !...
<mask> curBinName: config.ourWorkingDir + "/AdGuardHome", <mask> bkpBinName: config.ourWorkingDir + "/agh-backup/AdGuardHome", <mask> newBinName: config.ourWorkingDir + "/agh-update-" + newver + "/AdGuardHome/AdGuardHome", <mask> } <mask> e := doUpdate(&u) <mask> if e != nil { <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/885b660808a848277f080c78dc7e6107afdbabb7
home/control_update_test.go
architectures: - build-on: amd64 - build-on: armhf - build-on: i386 - build-on: arm64
<mask> of common code. <mask> grade: stable <mask> confinement: strict <mask> <mask> parts: <mask> web-launcher: <mask> plugin: dump <mask> source: snap/local <mask> adguard-home: <mask> plugin: make </s> Add web launcher for desktop users </s> remove restart-condition: always </s> add...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8863e61e8e1394c0f590b179953989953bf620b5
packaging/snap/snapcraft.yaml
web-launcher: plugin: dump source: snap/local
<mask> - build-on: arm64 <mask> <mask> parts: <mask> adguard-home: <mask> plugin: make <mask> source: . <mask> build-snaps: [ node/13/stable, go ] </s> Add web launcher for desktop users </s> remove restart-condition: always </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8863e61e8e1394c0f590b179953989953bf620b5
packaging/snap/snapcraft.yaml
<mask> adguard-home: <mask> command: AdGuardHome -w ${SNAP_DATA} --no-check-update <mask> plugs: [ network-bind ] <mask> daemon: simple <mask> restart-condition: always </s> Add web launcher for desktop users
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8863e61e8e1394c0f590b179953989953bf620b5
packaging/snap/snapcraft.yaml
restart-condition: always adguard-home-web: command: adguard-home-web.sh plugs: [desktop]
<mask> command: AdGuardHome -w ${SNAP_DATA} --no-check-update <mask> plugs: [ network-bind ] <mask> daemon: simple <mask> restart-condition: always </s> Add web launcher for desktop users </s> remove restart-condition: always </s> add
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8863e61e8e1394c0f590b179953989953bf620b5
packaging/snap/snapcraft.yaml
github.com/AdguardTeam/golibs v0.2.3
<mask> go 1.12 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.19.5 <mask> github.com/AdguardTeam/golibs v0.2.1 <mask> github.com/AdguardTeam/urlfilter v0.6.1 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 <mask> github.c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/887c8a905f311bf74bdcc53753937c39fa7efa77
go.mod
github.com/AdguardTeam/golibs v0.2.3 h1:BYiXjZJdthxB+f1dq55yWLwYjCz161VPtfI6cEzFivw= github.com/AdguardTeam/golibs v0.2.3/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/golibs v0.2.1 h1:jGCnbM5UOUq/GrG+8eLN7Y+OTfEo5F/8L0wq3ur2h4E= <mask> github.com/AdguardTeam/golibs v0.2.1/go.mod h1:caAJ5knSHbR6vV6qfRDgAfXVia4hHgLqeztAY4UX0fw= <mask> github.com/AdguardTeam/urlfilter v0.6.0 h1:HVPfAsGcHW47HasmqcLNA/VJ41GaR/SzUufuIj70ouA= <mask> github.com/AdguardTeam/...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/887c8a905f311bf74bdcc53753937c39fa7efa77
go.sum
github.com/AdguardTeam/urlfilter v0.6.1 h1:JX3gNYmgD9TCWE+G0C4MOn8WHYLAoVt0agltSvfldkY=
<mask> github.com/AdguardTeam/golibs v0.2.3/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U= <mask> github.com/AdguardTeam/urlfilter v0.6.0 h1:HVPfAsGcHW47HasmqcLNA/VJ41GaR/SzUufuIj70ouA= <mask> github.com/AdguardTeam/urlfilter v0.6.0/go.mod h1:y+XdxBdbRG9v7pfjznlvv4Ufi2HTG8D0YMqR22OVy0Y= <mask> github.com/Ad...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/887c8a905f311bf74bdcc53753937c39fa7efa77
go.sum
ClientName string ClientIP string ClientTags []string ServicesRules []ServiceEntry
<mask> FilteringEnabled bool <mask> SafeSearchEnabled bool <mask> SafeBrowsingEnabled bool <mask> ParentalEnabled bool <mask> ClientTags []string <mask> ServicesRules []ServiceEntry <mask> } <mask> <mask> // Config allows you to configure DNS filtering with New() or just change v...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsfilter/dnsfilter.go
return d.matchHost(host, qtype, *setts)
<mask> if !setts.FilteringEnabled { <mask> return Result{}, nil <mask> } <mask> <mask> return d.matchHost(host, qtype, setts.ClientTags) <mask> } <mask> <mask> // CheckHost tries to match the host against filtering rules, <mask> // then safebrowsing and parental if they are enabled <mask> func (d *Dnsf...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsfilter/dnsfilter.go
result, err = d.matchHost(host, qtype, *setts)
<mask> } <mask> <mask> // try filter lists first <mask> if setts.FilteringEnabled { <mask> result, err = d.matchHost(host, qtype, setts.ClientTags) <mask> if err != nil { <mask> return result, err <mask> } <mask> if result.Reason.Matched() { <mask> return result, nil </s> + pass client Name...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsfilter/dnsfilter.go
func (d *Dnsfilter) matchHost(host string, qtype uint16, setts RequestFilteringSettings) (Result, error) {
<mask> return nil <mask> } <mask> <mask> // matchHost is a low-level way to check only if hostname is filtered by rules, skipping expensive safebrowsing and parental lookups <mask> func (d *Dnsfilter) matchHost(host string, qtype uint16, ctags []string) (Result, error) { <mask> d.engineLock.RLock() <mask> //...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsfilter/dnsfilter.go
ureq := urlfilter.DNSRequest{} ureq.Hostname = host ureq.ClientIP = setts.ClientIP ureq.ClientName = setts.ClientName ureq.SortedClientTags = setts.ClientTags
<mask> defer d.engineLock.RUnlock() <mask> <mask> if d.filteringEngineWhite != nil { <mask> rr, ok := d.filteringEngineWhite.MatchRequest(ureq) <mask> if ok { <mask> var rule rules.Rule <mask> if rr.NetworkRule != nil { </s> + pass client Name and IP to dnsfilter * use urlfilter v0.11.0 </s> remov...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsfilter/dnsfilter.go
rr, ok := d.filteringEngineWhite.MatchRequest(ureq)
<mask> // but also while using the rules returned by it. <mask> defer d.engineLock.RUnlock() <mask> <mask> if d.filteringEngineWhite != nil { <mask> rr, ok := d.filteringEngineWhite.Match(host, ctags) <mask> if ok { <mask> var rule rules.Rule <mask> if rr.NetworkRule != nil { <mask> rule = r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsfilter/dnsfilter.go
rr, ok := d.filteringEngine.MatchRequest(ureq)
<mask> if d.filteringEngine == nil { <mask> return Result{}, nil <mask> } <mask> <mask> rr, ok := d.filteringEngine.Match(host, ctags) <mask> if !ok { <mask> return Result{}, nil <mask> } <mask> <mask> if rr.NetworkRule != nil { </s> + pass client Name and IP to dnsfilter * use urlfilter v0.11.0...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsfilter/dnsfilter.go
_, ok := a.blockedHostsEngine.Match(host)
<mask> <mask> // IsBlockedDomain - return TRUE if this domain should be blocked <mask> func (a *accessCtx) IsBlockedDomain(host string) bool { <mask> a.lock.Lock() <mask> _, ok := a.blockedHostsEngine.Match(host, nil) <mask> a.lock.Unlock() <mask> return ok <mask> } <mask> <mask> type accessListJSON str...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
dnsforward/access.go
github.com/AdguardTeam/urlfilter v0.11.0
<mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.29.0 <mask> github.com/AdguardTeam/golibs v0.4.2 <mask> github.com/AdguardTeam/urlfilter v0.10.1 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/fsnotify/fsnotify v1.4.7 <mask> github.com/gobuffalo/packr v1.30.1 <mask> git...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
go.mod
github.com/AdguardTeam/urlfilter v0.11.0 h1:tgZss6uZs1UZAaxpovD/QuX+VVIQLDOlKc7rdF8dwNw= github.com/AdguardTeam/urlfilter v0.11.0/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o= <mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/AdguardT...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
go.sum
setts.ClientIP = clientAddr
<mask> return <mask> } <mask> <mask> c, ok := Context.clients.Find(clientAddr) <mask> if !ok { <mask> return <mask> } </s> + pass client Name and IP to dnsfilter * use urlfilter v0.11.0 </s> remove rr, ok := d.filteringEngine.Match(host, ctags) </s> add rr, ok := d.filteringEngine.MatchRequest(ureq...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
home/dns.go
setts.ClientName = c.Name
<mask> } <mask> <mask> setts.ClientTags = c.Tags <mask> <mask> if !c.UseOwnSettings { <mask> return <mask> } <mask> </s> + pass client Name and IP to dnsfilter * use urlfilter v0.11.0 </s> remove result, err = d.matchHost(host, qtype, setts.ClientTags) </s> add result, err = d.matchHost(host, qt...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/890876cb0539d4916a21c0e0771a9d4e8322b9be
home/dns.go
github.com/AdguardTeam/dnsproxy v0.37.6
<mask> <mask> go 1.16 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.37.5 <mask> github.com/AdguardTeam/golibs v0.8.0 <mask> github.com/AdguardTeam/urlfilter v0.14.5 <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/89694763f57d3cfa0a5f6cdaa47abdd485bcd558
go.mod
github.com/AdguardTeam/dnsproxy v0.37.6 h1:qN9KX/fxLIR5TZKtpPHmMx/AUJLAdeXbQ5sjdqHXWW0= github.com/AdguardTeam/dnsproxy v0.37.6/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
<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/89694763f57d3cfa0a5f6cdaa47abdd485bcd558
go.sum
m.SetReply(r)
<mask> } <mask> <mask> m := &dns.Msg{} <mask> m.Answer = []dns.RR{ <mask> &dns.TXT{ <mask> Hdr: dns.RR_Header{ <mask> Name: r.Question[0].Name, </s> Pull request: all: upd dnsproxy, fix test, minor imp Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89694763f57d3cfa0a5f6cdaa47abdd485bcd558
internal/aghtest/upstream.go
func TestNullBool_UnmarshalJSON(t *testing.T) {
<mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/require" <mask> ) <mask> <mask> func TestNullBool_UnmarshalText(t *testing.T) { <mask> testCases := []struct { <mask> name string <mask> data []byte <mask> wantErrMsg string <mask> want nullBool </s>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89694763f57d3cfa0a5f6cdaa47abdd485bcd558
internal/dhcpd/nullbool_test.go
return code, data, nil
<mask> if err != nil { <mask> return 0, nil, err <mask> } <mask> <mask> return uint8(code), data, nil <mask> } </s> Pull request: all: upd dnsproxy, fix test, minor imp Merge in DNS/adguard-home from upd-dnsproxy to master Squashed commit of the following: commit 52365328a4c653b0d3bf6d11d8f66a3bf8e0f402...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89694763f57d3cfa0a5f6cdaa47abdd485bcd558
internal/dhcpd/options.go
err := checkPlainDNS(host)
<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 := checkBootstrapDNS(host) <mask> if err != nil { <mask> httpError(w, http.StatusBadRequest...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89b6323f03a476f0c1d3ffecbb8bb372a4951e18
control.go
// checkPlainDNS checks if host is plain DNS func checkPlainDNS(host string) error {
<mask> config.DNS.AllServers = newconfig.AllServers <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> // checkBootstrapDNS checks if host is plain DNS <mask> func checkBootstrapDNS(host string) error { <mask> // Check if host is ip without port <mask> if net.ParseIP(host) != nil { <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89b6323f03a476f0c1d3ffecbb8bb372a4951e18
control.go
ip, port, err := net.SplitHostPort(host) if err != nil { return err } if net.ParseIP(ip) == nil { return fmt.Errorf("%s is not valid IP", ip) } _, err = strconv.ParseInt(port, 0, 64) if err != nil { return fmt.Errorf("%s is not valid port: %s", port, err) } return nil
<mask> return nil <mask> } <mask> <mask> // Check if host is ip with port <mask> _, _, err := net.SplitHostPort(host) <mask> return err <mask> } <mask> <mask> func handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) { <mask> log.Tracef("%s %v", r.Method, r.URL) <mask> upstreamConfig := up...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89b6323f03a476f0c1d3ffecbb8bb372a4951e18
control.go
'dockerGo': 'adguard/golang-ubuntu:4.2'
<mask> 'name': 'AdGuard Home - Build and publish release' <mask> # Make sure to sync any changes with the branch overrides below. <mask> 'variables': <mask> 'channel': 'edge' <mask> 'dockerGo': 'adguard/golang-ubuntu:4.1' <mask> <mask> 'stages': <mask> - 'Make release': <mask> 'manual': false <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89d9b03dfec8a5f1406507d45e582e852e748859
bamboo-specs/release.yaml
'dockerGo': 'adguard/golang-ubuntu:4.2'
<mask> # Set the default release channel on the release branch to beta, as we may <mask> # need to build a few of these. <mask> 'variables': <mask> 'channel': 'beta' <mask> 'dockerGo': 'adguard/golang-ubuntu:4.1' <mask> # release-vX.Y.Z branches are the branches from which the actual final...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89d9b03dfec8a5f1406507d45e582e852e748859
bamboo-specs/release.yaml
'dockerGo': 'adguard/golang-ubuntu:4.2'
<mask> # Set the default release channel on the final branch to release, as these <mask> # are the ones that actually get released. <mask> 'variables': <mask> 'channel': 'release' <mask> 'dockerGo': 'adguard/golang-ubuntu:4.1' </s> Pull request: all: upd go Merge in DNS/adguard-home from ...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89d9b03dfec8a5f1406507d45e582e852e748859
bamboo-specs/release.yaml
'dockerGo': 'adguard/golang-ubuntu:4.2'
<mask> 'project-key': 'AGH' <mask> 'key': 'AHBRTSPECS' <mask> 'name': 'AdGuard Home - Build and run tests' <mask> 'variables': <mask> 'dockerGo': 'adguard/golang-ubuntu:4.1' <mask> <mask> 'stages': <mask> - 'Tests': <mask> 'manual': false <mask> 'final': false </s> Pull request: all: upd go ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/89d9b03dfec8a5f1406507d45e582e852e748859
bamboo-specs/test.yaml
hostsFn string // path to the main hosts-file hostsDirs []string // paths to OS-specific directories with hosts-files watcher *fsnotify.Watcher // file and directory watcher object // onlyWritesChan used to contain only writing events from watcher. onlyWritesChan chan fsnotify.Event
<mask> // <mask> // TODO(a.garipov): Make better use of newtypes. Perhaps a custom map. <mask> tableReverse map[string][]string <mask> <mask> hostsFn string // path to the main hosts-file <mask> hostsDirs []string // paths to OS-specific directories with hosts-files <mask> watcher...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
a.onlyWritesChan = make(chan fsnotify.Event, 2)
<mask> // Init - initialize <mask> // hostsFn: Override default name for the hosts-file (optional) <mask> func (a *AutoHosts) Init(hostsFn string) { <mask> a.table = make(map[string][]net.IP) <mask> a.updateChan = make(chan bool, 2) <mask> <mask> a.hostsFn = "/etc/hosts" <mask> if runtime.GOOS == "windows"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
a.updateHosts()
<mask> // Start - start module <mask> func (a *AutoHosts) Start() { <mask> log.Debug("Start AutoHosts module") <mask> <mask> go a.updateLoop() <mask> a.updateChan <- true <mask> <mask> if a.watcher != nil { <mask> go a.watcherLoop() <mask> <mask> err := a.watcher.Add(a.hostsFn) </s> Pull request:...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
<mask> } <mask> <mask> // Close - close module <mask> func (a *AutoHosts) Close() { <mask> a.updateChan <- false <mask> close(a.updateChan) <mask> if a.watcher != nil { <mask> _ = a.watcher.Close() <mask> } <mask> } <mask> </s> Pull request: data race Merge in DNS/adguard-home from 2489-data-race t...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
close(a.onlyWritesChan)
<mask> func (a *AutoHosts) Close() { <mask> if a.watcher != nil { <mask> _ = a.watcher.Close() <mask> } <mask> } <mask> <mask> // Process returns the list of IP addresses for the hostname or nil if nothing <mask> // found. </s> Pull request: data race Merge in DNS/adguard-home from 2489-data-race to mast...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
// onlyWrites is a filter for (*fsnotify.Watcher).Events. func (a *AutoHosts) onlyWrites() { for event := range a.watcher.Events { if event.Op&fsnotify.Write == fsnotify.Write { a.onlyWritesChan <- event } } }
<mask> } <mask> } <mask> } <mask> <mask> // Receive notifications from fsnotify package <mask> func (a *AutoHosts) watcherLoop() { <mask> go a.onlyWrites() <mask> for { <mask> select { <mask> case event, ok := <-a.onlyWritesChan: </s> Pull request: data race Merge in DNS/adguard-home from 2489-dat...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
go a.onlyWrites()
<mask> // Receive notifications from fsnotify package <mask> func (a *AutoHosts) watcherLoop() { <mask> for { <mask> select { <mask> case event, ok := <-a.onlyWritesChan: <mask> if !ok { <mask> return <mask> } </s> Pull request: data race Merge in DNS/adguard-home from 2489-data-race to master ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
case event, ok := <-a.onlyWritesChan:
<mask> // Receive notifications from fsnotify package <mask> func (a *AutoHosts) watcherLoop() { <mask> for { <mask> select { <mask> case event, ok := <-a.watcher.Events: <mask> if !ok { <mask> return <mask> } <mask> <mask> repeat := true </s> Pull request: data race Merge in DNS/adguard-...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
// Assume that we sometimes have the same event occurred // several times.
<mask> return <mask> } <mask> <mask> repeat := true <mask> for repeat { <mask> select { <mask> case _, ok = <-a.onlyWritesChan: <mask> repeat = ok </s> Pull request: data race Merge in DNS/adguard-home from 2489-data-race to master Closes #2489. Squashed commit of the following: ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
case _, ok = <-a.onlyWritesChan: repeat = ok
<mask> <mask> repeat := true <mask> for repeat { <mask> select { <mask> case <-a.watcher.Events: <mask> // Skip this duplicating event <mask> default: <mask> repeat = false <mask> } <mask> } <mask> </s> Pull request: data race Merge in DNS/adguard-home from 2489-data-ra...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
a.updateHosts()
<mask> } <mask> <mask> if event.Op&fsnotify.Write == fsnotify.Write { <mask> log.Debug("AutoHosts: modified: %s", event.Name) <mask> select { <mask> case a.updateChan <- true: <mask> // sent a signal to 'updateLoop' goroutine <mask> default: <mask> // queue is full <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
<mask> } <mask> } <mask> } <mask> <mask> // updateLoop reads static hosts from system files. <mask> func (a *AutoHosts) updateLoop() { <mask> for ok := range a.updateChan { <mask> if !ok { <mask> log.Debug("Finished AutoHosts update loop") <mask> return <mask> } <mask> <mask> a.updateHost...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a1d86aa7d8e9dd73f5d3f04c010adbd537ae817
internal/util/autohosts.go
"blocked_by_cname_or_ip": "Blocked by CNAME or IP",
<mask> "whois": "Whois", <mask> "filtering_rules_learn_more": "<0>Learn more</0> about creating your own hosts lists.", <mask> "blocked_by_response": "Blocked by CNAME or IP in response", <mask> "try_again": "Try again", <mask> "domain_desc": "Enter the domain name or wildcard you want to be re...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/__locales/en.json
"filter_category_other_desc": "Other blocklists", "original_response": "Original response"
<mask> "filter_category_other": "Other", <mask> "filter_category_general_desc": "Lists that block tracking and advertising on most of the devices", <mask> "filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains", <mask> "filter_category_regional_desc": "...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/__locales/en.json
{getHintElement({
<mask> }; <mask> <mask> return ( <mask> <div className="logs__row o-hidden h-100"> <mask> {processedData && getHintElement({ <mask> className: hintClass, <mask> columnClass: 'grid grid--limited', <mask> tooltipClass: 'px-5 pb-5 pt-4 mw...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getClientCell.js
<mask> 'icon--disabled': !hasTracker, <mask> 'my-3': isDetailed, <mask> }); <mask> <mask> const dnssecHint = getHintElement({ <mask> className: lockIconClass, <mask> tooltipClass: 'py-4 px-5 pb-45', <mask> canShowTooltip: answer_dnssec, <mask> xlinkHref:...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getDomainCell.js
{dnssec_enabled && getHintElement({ className: lockIconClass, tooltipClass: 'py-4 px-5 pb-45', canShowTooltip: answer_dnssec, xlinkHref: 'lock', columnClass: 'w-100', content: 'validated_with_dnssec', ...
<mask> .join(', '); <mask> <mask> return ( <mask> <div className="logs__row o-hidden"> <mask> {dnssec_enabled && dnssecHint} <mask> {trackerHint} <mask> <div className={valueClass}> <mask> <div className="text-truncate" title={domain}>{dom...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getDomainCell.js
import { processContent } from '../../../helpers/helpers';
<mask> import './Tooltip.css'; <mask> import 'react-popper-tooltip/dist/styles.css'; <mask> import { HIDE_TOOLTIP_DELAY } from '../../../helpers/constants'; <mask> <mask> const getHintElement = ({ <mask> className, <mask> contentItemClass, <mask> columnClass, <mask> canShowTooltip = true, </s...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getHintElement.js
</TooltipTrigger>;
<mask> {xlinkHref && <svg className={className}> <mask> <use xlinkHref={`#${xlinkHref}`} /> <mask> </svg>} <mask> </span>} <mask> </TooltipTrigger>; <mask> <mask> getHintElement.propTypes = { <mask> className: PropTypes.string, <mask> contentItemClass: Pro...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getHintElement.js
reason, filterId, rule, status, upstream, elapsedMs, domain, response, originalResponse,
<mask> import getHintElement from './getHintElement'; <mask> <mask> const getResponseCell = (row, filtering, t, isDetailed, getFilterName) => { <mask> const { <mask> reason, filterId, rule, status, upstream, elapsedMs, domain, response, <mask> } = row.original; <mask> <mask> const { filter...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST || reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE; const isBlockedByResponse = originalResponse.length > 0 && isBlocked; const statusLabel = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?...
<mask> <mask> const { filters, whitelistFilters } = filtering; <mask> const formattedElapsedMs = formatElapsedMs(elapsedMs, t); <mask> <mask> const statusLabel = t(FILTERED_STATUS_TO_META_MAP[reason]?.label || reason); <mask> const boldStatusLabel = <span className="font-weight-bold">{statusLabe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
if (responseArr?.length === 0) {
<mask> const boldStatusLabel = <span className="font-weight-bold">{statusLabel}</span>; <mask> const filter = getFilterName(filters, whitelistFilters, filterId, t); <mask> <mask> const renderResponses = (responseArr) => { <mask> if (responseArr.length === 0) { <mask> return ''; <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
original_response: renderResponses(originalResponse),
<mask> rule_label: rule, <mask> response_code: status, <mask> }, <mask> [FILTERED_STATUS.NOT_FILTERED_WHITE_LIST]: { <mask> domain, <mask> encryption_status: boldStatusLabel, </s> - client: Fix query logs UI issues Close #1828 Squashed commit of th...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
rule_label: rule,
<mask> domain, <mask> encryption_status: boldStatusLabel, <mask> filter, <mask> install_settings_dns: upstream, <mask> elapsed: formattedElapsedMs, <mask> response_code: status, <mask> original_response: renderResponses(originalR...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
original_response: renderResponses(originalResponse),
<mask> install_settings_dns: upstream, <mask> elapsed: formattedElapsedMs, <mask> response_code: status, <mask> }, <mask> }; <mask> <mask> const fields = FILTERED_STATUS_TO_FIELDS_MAP[reason] <mask> ? Object.entries(FILTERED_STATUS_TO_FIELDS_MAP[reaso...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
const detailedInfo = isBlocked ? filter : formattedElapsedMs;
<mask> const fields = FILTERED_STATUS_TO_FIELDS_MAP[reason] <mask> ? Object.entries(FILTERED_STATUS_TO_FIELDS_MAP[reason]) <mask> : Object.entries(FILTERED_STATUS_TO_FIELDS_MAP.NotFilteredNotFound); <mask> <mask> const detailedInfo = reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
{getHintElement({
<mask> ? filter : formattedElapsedMs; <mask> <mask> return ( <mask> <div className="logs__row"> <mask> {fields && getHintElement({ <mask> className: classNames('icons mr-4 icon--small cursor--pointer icon--light-gray', { 'my-3': isDetailed }), <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js
className="detailed-info d-none d-sm-block pt-1 text-truncate" title={detailedInfo}>{detailedInfo}</div>}
<mask> })} <mask> <div className="text-truncate"> <mask> <div className="text-truncate" title={statusLabel}>{statusLabel}</div> <mask> {isDetailed && <div <mask> className="detailed-info d-none d-sm-block pt-1 text-truncate" title={detaile...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/8a417604a94d90ada57141d5601490531fc2e009
client/src/components/Logs/Cells/getResponseCell.js