docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
"github.com/AdguardTeam/AdGuardHome/internal/testutil"
"github.com/AdguardTeam/golibs/log" | <mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestDecode_decodeQueryLog(t *testing.T) {
</s> Pull request: cover with tests
Merge in DNS/adguard-home from 2271-cover-with-tests to master
Updates #2271.
Squashed commit of the following:
commit db6440efe05171bc15367a2996521848ca348053
Merge: db7fa726b bf4c256c7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 19:23:09 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit db7fa726bb91b08ec7aaa6c0c818c88b5feb87cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 18:26:51 2020 +0300
all: clean dependencies sum
commit b8dc6078c4bcc0de1b7e9073832de122f6fe38a4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:46:00 2020 +0300
testutil: improve code quality
commit 001b7194682b1f00aa54dc5a28236faed5a5b02d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:29:49 2020 +0300
testutil: enhance functionality
commit f6ccd91a4df6c56778eab8ae50e88e3818b20dd3
Merge: 43fa2eefb 6358240e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:57:37 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit 43fa2eefbc10ef361603cacc1ca12092b12a057a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 14:55:15 2020 +0300
querylog: replace fake log with real in tests
commit b95bee7565a14a02c80c78131b3ced224663dd8a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 12:38:59 2020 +0300
dnsfilter: replace thoughtless declaration with idiomatic one
commit a210b1586092e7ae91a9e67c972fa2d2f6baded6
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 19:00:25 2020 +0300
all: refresh golibs dependencies
commit 4ff97bd1ade6c80e274ff5716e44df4eba55bdd9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 18:38:47 2020 +0300
all: remove std log
commit 542dbda10fefce9f46d15489712b163d919b1291
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 13:46:39 2020 +0300
querylog: improve test logic and readability
commit 796d402385925e8e62a1b4c7bf56e4ceec22418c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 19:06:42 2020 +0300
all: improve code quality
commit e81894c11ef15b0453e8e5297f1349936a32f9dd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 18:32:30 2020 +0300
all: cover with tests
commit 252d81fc8a50a91b02cf0f6f35cc22178a2a4d90
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 17:32:01 2020 +0300
all: cover with tests | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b | internal/querylog/decode_test.go |
res := dnsfilter.Result{
IsFiltered: true,
Rule: "SomeRule",
Reason: dnsfilter.ReasonRewrite,
ServiceName: "SomeService",
FilterID: 1,
} | <mask> Class: dns.ClassINET,
<mask> }
<mask> answer.A = net.ParseIP(answerStr)
<mask> a.Answer = append(a.Answer, answer)
<mask> res := dnsfilter.Result{}
<mask> params := AddParams{
<mask> Question: &q,
<mask> Answer: &a,
<mask> Result: &res,
<mask> ClientIP: net.ParseIP(client),
</s> Pull request: cover with tests
Merge in DNS/adguard-home from 2271-cover-with-tests to master
Updates #2271.
Squashed commit of the following:
commit db6440efe05171bc15367a2996521848ca348053
Merge: db7fa726b bf4c256c7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 19:23:09 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit db7fa726bb91b08ec7aaa6c0c818c88b5feb87cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 18:26:51 2020 +0300
all: clean dependencies sum
commit b8dc6078c4bcc0de1b7e9073832de122f6fe38a4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:46:00 2020 +0300
testutil: improve code quality
commit 001b7194682b1f00aa54dc5a28236faed5a5b02d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:29:49 2020 +0300
testutil: enhance functionality
commit f6ccd91a4df6c56778eab8ae50e88e3818b20dd3
Merge: 43fa2eefb 6358240e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:57:37 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit 43fa2eefbc10ef361603cacc1ca12092b12a057a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 14:55:15 2020 +0300
querylog: replace fake log with real in tests
commit b95bee7565a14a02c80c78131b3ced224663dd8a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 12:38:59 2020 +0300
dnsfilter: replace thoughtless declaration with idiomatic one
commit a210b1586092e7ae91a9e67c972fa2d2f6baded6
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 19:00:25 2020 +0300
all: refresh golibs dependencies
commit 4ff97bd1ade6c80e274ff5716e44df4eba55bdd9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 18:38:47 2020 +0300
all: remove std log
commit 542dbda10fefce9f46d15489712b163d919b1291
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 13:46:39 2020 +0300
querylog: improve test logic and readability
commit 796d402385925e8e62a1b4c7bf56e4ceec22418c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 19:06:42 2020 +0300
all: improve code quality
commit e81894c11ef15b0453e8e5297f1349936a32f9dd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 18:32:30 2020 +0300
all: cover with tests
commit 252d81fc8a50a91b02cf0f6f35cc22178a2a4d90
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 17:32:01 2020 +0300
all: cover with tests </s> remove Question: &q,
Answer: &a,
Result: &res,
ClientIP: net.ParseIP(client),
Upstream: "upstream",
</s> add Question: &q,
Answer: &a,
OrigAnswer: &a,
Result: &res,
ClientIP: net.ParseIP(client),
Upstream: "upstream", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b | internal/querylog/qlog_test.go |
Question: &q,
Answer: &a,
OrigAnswer: &a,
Result: &res,
ClientIP: net.ParseIP(client),
Upstream: "upstream", | <mask> answer.A = net.ParseIP(answerStr)
<mask> a.Answer = append(a.Answer, answer)
<mask> res := dnsfilter.Result{}
<mask> params := AddParams{
<mask> Question: &q,
<mask> Answer: &a,
<mask> Result: &res,
<mask> ClientIP: net.ParseIP(client),
<mask> Upstream: "upstream",
<mask> }
<mask> l.Add(params)
<mask> }
<mask>
<mask> func assertLogEntry(t *testing.T, entry *logEntry, host, answer, client string) bool {
</s> Pull request: cover with tests
Merge in DNS/adguard-home from 2271-cover-with-tests to master
Updates #2271.
Squashed commit of the following:
commit db6440efe05171bc15367a2996521848ca348053
Merge: db7fa726b bf4c256c7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 19:23:09 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit db7fa726bb91b08ec7aaa6c0c818c88b5feb87cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 18:26:51 2020 +0300
all: clean dependencies sum
commit b8dc6078c4bcc0de1b7e9073832de122f6fe38a4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:46:00 2020 +0300
testutil: improve code quality
commit 001b7194682b1f00aa54dc5a28236faed5a5b02d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:29:49 2020 +0300
testutil: enhance functionality
commit f6ccd91a4df6c56778eab8ae50e88e3818b20dd3
Merge: 43fa2eefb 6358240e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:57:37 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit 43fa2eefbc10ef361603cacc1ca12092b12a057a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 14:55:15 2020 +0300
querylog: replace fake log with real in tests
commit b95bee7565a14a02c80c78131b3ced224663dd8a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 12:38:59 2020 +0300
dnsfilter: replace thoughtless declaration with idiomatic one
commit a210b1586092e7ae91a9e67c972fa2d2f6baded6
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 19:00:25 2020 +0300
all: refresh golibs dependencies
commit 4ff97bd1ade6c80e274ff5716e44df4eba55bdd9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 18:38:47 2020 +0300
all: remove std log
commit 542dbda10fefce9f46d15489712b163d919b1291
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 13:46:39 2020 +0300
querylog: improve test logic and readability
commit 796d402385925e8e62a1b4c7bf56e4ceec22418c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 19:06:42 2020 +0300
all: improve code quality
commit e81894c11ef15b0453e8e5297f1349936a32f9dd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 18:32:30 2020 +0300
all: cover with tests
commit 252d81fc8a50a91b02cf0f6f35cc22178a2a4d90
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 17:32:01 2020 +0300
all: cover with tests </s> remove res := dnsfilter.Result{}
</s> add res := dnsfilter.Result{
IsFiltered: true,
Rule: "SomeRule",
Reason: dnsfilter.ReasonRewrite,
ServiceName: "SomeService",
FilterID: 1,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b | internal/querylog/qlog_test.go |
"io" | <mask> package testutil
<mask>
<mask> import (
<mask> "io/ioutil"
<mask> "os"
<mask> "testing"
<mask>
</s> Pull request: cover with tests
Merge in DNS/adguard-home from 2271-cover-with-tests to master
Updates #2271.
Squashed commit of the following:
commit db6440efe05171bc15367a2996521848ca348053
Merge: db7fa726b bf4c256c7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 19:23:09 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit db7fa726bb91b08ec7aaa6c0c818c88b5feb87cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 18:26:51 2020 +0300
all: clean dependencies sum
commit b8dc6078c4bcc0de1b7e9073832de122f6fe38a4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:46:00 2020 +0300
testutil: improve code quality
commit 001b7194682b1f00aa54dc5a28236faed5a5b02d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:29:49 2020 +0300
testutil: enhance functionality
commit f6ccd91a4df6c56778eab8ae50e88e3818b20dd3
Merge: 43fa2eefb 6358240e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:57:37 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit 43fa2eefbc10ef361603cacc1ca12092b12a057a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 14:55:15 2020 +0300
querylog: replace fake log with real in tests
commit b95bee7565a14a02c80c78131b3ced224663dd8a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 12:38:59 2020 +0300
dnsfilter: replace thoughtless declaration with idiomatic one
commit a210b1586092e7ae91a9e67c972fa2d2f6baded6
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 19:00:25 2020 +0300
all: refresh golibs dependencies
commit 4ff97bd1ade6c80e274ff5716e44df4eba55bdd9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 18:38:47 2020 +0300
all: remove std log
commit 542dbda10fefce9f46d15489712b163d919b1291
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 13:46:39 2020 +0300
querylog: improve test logic and readability
commit 796d402385925e8e62a1b4c7bf56e4ceec22418c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 19:06:42 2020 +0300
all: improve code quality
commit e81894c11ef15b0453e8e5297f1349936a32f9dd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 18:32:30 2020 +0300
all: cover with tests
commit 252d81fc8a50a91b02cf0f6f35cc22178a2a4d90
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 17:32:01 2020 +0300
all: cover with tests | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8a9c6e8a02c6fd7805a6d6100f9e57b2e6bbca8b | internal/testutil/testutil.go |
<mask> package dnsforward
<mask>
<mask> import (
<mask> "errors"
<mask> "net"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
localAddrs,
bootstraps,
defaultLocalTimeout,
); err != nil {
return err
</s> add var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, </s> remove // TODO(e.burkov): The approach of subtracting sets of strings
// is not really applicable here since in case of listening on
// all network interfaces we should check the whole interface's
// network to cut off all the loopback addresses as well.
</s> add // TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well. </s> remove
resp = ctx.Res
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dns.go | |
err := s.localResolvers.Resolve(d) | <mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> req := d.Req
<mask> resp, err := s.localResolvers.Exchange(req)
<mask> if err != nil {
<mask> if errors.Is(err, aghnet.NoUpstreamsErr) {
<mask> d.Res = s.genNXDomain(req)
<mask>
<mask> return resultCodeFinish
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove d.Res = resp
</s> add if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} </s> remove ctx := &proxy.DNSContext{
Proto: "udp",
Req: req,
StartTime: time.Now(),
}
</s> add </s> remove resp, err = s.localResolvers.Exchange(req)
</s> add err = s.localResolvers.Resolve(ctx) </s> remove
resp = ctx.Res
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dns.go |
<mask>
<mask> req := d.Req
<mask> resp, err := s.localResolvers.Exchange(req)
<mask> if err != nil {
<mask> if errors.Is(err, aghnet.NoUpstreamsErr) {
<mask> d.Res = s.genNXDomain(req)
<mask>
<mask> return resultCodeFinish
<mask> }
<mask>
<mask> ctx.err = err
<mask>
<mask> return resultCodeError
<mask> }
<mask>
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove req := d.Req
resp, err := s.localResolvers.Exchange(req)
</s> add err := s.localResolvers.Resolve(d) </s> remove d.Res = resp
</s> add if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} </s> remove ctx := &proxy.DNSContext{
Proto: "udp",
Req: req,
StartTime: time.Now(),
}
</s> add </s> remove
resp = ctx.Res
</s> add </s> remove resp, err = s.localResolvers.Exchange(req)
</s> add err = s.localResolvers.Resolve(ctx) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dns.go | |
if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} | <mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> d.Res = resp
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // Apply filtering logic
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove req := d.Req
resp, err := s.localResolvers.Exchange(req)
</s> add err := s.localResolvers.Resolve(d) </s> remove
resp = ctx.Res
</s> add </s> remove if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
localAddrs,
bootstraps,
defaultLocalTimeout,
); err != nil {
return err
</s> add var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dns.go |
<mask> }
<mask> }
<mask>
<mask> func TestLocalRestriction(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> })
<mask> ups := &aghtest.TestUpstream{
<mask> Reverse: map[string][]string{
<mask> "251.252.253.254.in-addr.arpa.": {"host1.example.net."},
<mask> "1.1.168.192.in-addr.arpa.": {"some.local-client."},
<mask> },
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s.localResolvers = &aghtest.Exchanger{Ups: ups}
</s> add s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
}, ups) </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dns_test.go | |
s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
}, ups) | <mask> "251.252.253.254.in-addr.arpa.": {"host1.example.net."},
<mask> "1.1.168.192.in-addr.arpa.": {"some.local-client."},
<mask> },
<mask> }
<mask> s.localResolvers = &aghtest.Exchanger{Ups: ups}
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ups}
<mask> startDeferStop(t, s)
<mask>
<mask> testCases := []struct {
<mask> name string
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove dns.localResolvers = &aghtest.Exchanger{
Ups: tc.locUpstream,
</s> add pcfg := proxy.Config{
UpstreamConfig: &proxy.UpstreamConfig{
Upstreams: []upstream.Upstream{tc.locUpstream},
},
}
dns.localResolvers = &proxy.Proxy{
Config: pcfg, </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s.localResolvers = &aghtest.Exchanger{}
</s> add if localUps != nil {
s.localResolvers.Config.UpstreamConfig.Upstreams = []upstream.Upstream{localUps}
} </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dns_test.go |
"github.com/AdguardTeam/dnsproxy/upstream" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // DefaultTimeout is the default upstream timeout
<mask> const DefaultTimeout = 10 * time.Second
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove // TODO(e.burkov): The approach of subtracting sets of strings
// is not really applicable here since in case of listening on
// all network interfaces we should check the whole interface's
// network to cut off all the loopback addresses as well.
</s> add // TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well. </s> remove if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
localAddrs,
bootstraps,
defaultLocalTimeout,
); err != nil {
return err
</s> add var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, </s> remove func createTestServer(t *testing.T, filterConf *dnsfilter.Config, forwardConf ServerConfig) *Server {
</s> add func createTestServer(
t *testing.T,
filterConf *dnsfilter.Config,
forwardConf ServerConfig,
localUps upstream.Upstream,
) (s *Server) { </s> remove d.Res = resp
</s> add if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} </s> remove localResolvers aghnet.Exchanger
</s> add localResolvers *proxy.Proxy | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go |
localResolvers *proxy.Proxy | <mask> autohostSuffix string
<mask>
<mask> ipset ipsetCtx
<mask> subnetDetector *aghnet.SubnetDetector
<mask> localResolvers aghnet.Exchanger
<mask>
<mask> tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tablePTR map[string]string // "IP -> hostname" table for reverse lookup
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove // TODO(e.burkov): The approach of subtracting sets of strings
// is not really applicable here since in case of listening on
// all network interfaces we should check the whole interface's
// network to cut off all the loopback addresses as well.
</s> add // TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well. </s> remove dns.localResolvers = &aghtest.Exchanger{
Ups: tc.locUpstream,
</s> add pcfg := proxy.Config{
UpstreamConfig: &proxy.UpstreamConfig{
Upstreams: []upstream.Upstream{tc.locUpstream},
},
}
dns.localResolvers = &proxy.Proxy{
Config: pcfg, </s> remove if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
localAddrs,
bootstraps,
defaultLocalTimeout,
); err != nil {
return err
</s> add var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, </s> remove s.localResolvers = &aghtest.Exchanger{Ups: ups}
</s> add s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
}, ups) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go |
ctx := &proxy.DNSContext{
Proto: "udp",
Req: req,
StartTime: time.Now(),
} | <mask> }},
<mask> }
<mask>
<mask> var resp *dns.Msg
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> err = s.localResolvers.Resolve(ctx)
<mask> } else {
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove resp, err = s.localResolvers.Exchange(req)
</s> add err = s.localResolvers.Resolve(ctx) </s> remove ctx := &proxy.DNSContext{
Proto: "udp",
Req: req,
StartTime: time.Now(),
}
</s> add </s> remove
resp = ctx.Res
</s> add </s> remove d.Res = resp
</s> add if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go |
err = s.localResolvers.Resolve(ctx) | <mask> }
<mask>
<mask> var resp *dns.Msg
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> resp, err = s.localResolvers.Exchange(req)
<mask> } else {
<mask> ctx := &proxy.DNSContext{
<mask> Proto: "udp",
<mask> Req: req,
<mask> StartTime: time.Now(),
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove ctx := &proxy.DNSContext{
Proto: "udp",
Req: req,
StartTime: time.Now(),
}
</s> add </s> remove
resp = ctx.Res
</s> add </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove req := d.Req
resp, err := s.localResolvers.Exchange(req)
</s> add err := s.localResolvers.Resolve(d) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go |
<mask> var resp *dns.Msg
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> resp, err = s.localResolvers.Exchange(req)
<mask> } else {
<mask> ctx := &proxy.DNSContext{
<mask> Proto: "udp",
<mask> Req: req,
<mask> StartTime: time.Now(),
<mask> }
<mask> err = s.internalProxy.Resolve(ctx)
<mask>
<mask> resp = ctx.Res
<mask> }
<mask> if err != nil {
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove resp, err = s.localResolvers.Exchange(req)
</s> add err = s.localResolvers.Resolve(ctx) </s> remove
resp = ctx.Res
</s> add </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove req := d.Req
resp, err := s.localResolvers.Exchange(req)
</s> add err := s.localResolvers.Resolve(d) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go | |
<mask> Req: req,
<mask> StartTime: time.Now(),
<mask> }
<mask> err = s.internalProxy.Resolve(ctx)
<mask>
<mask> resp = ctx.Res
<mask> }
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove ctx := &proxy.DNSContext{
Proto: "udp",
Req: req,
StartTime: time.Now(),
}
</s> add </s> remove resp, err = s.localResolvers.Exchange(req)
</s> add err = s.localResolvers.Resolve(ctx) </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go | |
resp = ctx.Res
| <mask> return "", err
<mask> }
<mask>
<mask> if len(resp.Answer) == 0 {
<mask> return "", fmt.Errorf("lookup for %q: %w", arpa, rDNSEmptyAnswerErr)
<mask> }
<mask>
<mask> ptr, ok := resp.Answer[0].(*dns.PTR)
<mask> if !ok {
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove
resp = ctx.Res
</s> add </s> remove d.Res = resp
</s> add if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} </s> remove req := d.Req
resp, err := s.localResolvers.Exchange(req)
</s> add err := s.localResolvers.Resolve(d) </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
localAddrs,
bootstraps,
defaultLocalTimeout,
); err != nil {
return err
</s> add var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go |
// TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well. | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> // TODO(e.burkov): The approach of subtracting sets of strings
<mask> // is not really applicable here since in case of listening on
<mask> // all network interfaces we should check the whole interface's
<mask> // network to cut off all the loopback addresses as well.
<mask> localAddrs = stringSetSubtract(localAddrs, ourAddrs)
<mask>
<mask> if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
<mask> localAddrs,
<mask> bootstraps,
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
localAddrs,
bootstraps,
defaultLocalTimeout,
); err != nil {
return err
</s> add var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove
resp = ctx.Res
</s> add </s> remove d.Res = resp
</s> add if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go |
var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, | <mask> // all network interfaces we should check the whole interface's
<mask> // network to cut off all the loopback addresses as well.
<mask> localAddrs = stringSetSubtract(localAddrs, ourAddrs)
<mask>
<mask> if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
<mask> localAddrs,
<mask> bootstraps,
<mask> defaultLocalTimeout,
<mask> ); err != nil {
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove // TODO(e.burkov): The approach of subtracting sets of strings
// is not really applicable here since in case of listening on
// all network interfaces we should check the whole interface's
// network to cut off all the loopback addresses as well.
</s> add // TODO(e.burkov): The approach of subtracting sets of strings is not
// really applicable here since in case of listening on all network
// interfaces we should check the whole interface's network to cut off
// all the loopback addresses as well. </s> remove
resp = ctx.Res
</s> add </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove req := d.Req
resp, err := s.localResolvers.Exchange(req)
</s> add err := s.localResolvers.Resolve(d) </s> remove d.Res = resp
</s> add if d.Res == nil {
d.Res = s.genNXDomain(d.Req)
return resultCodeFinish
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward.go |
func createTestServer(
t *testing.T,
filterConf *dnsfilter.Config,
forwardConf ServerConfig,
localUps upstream.Upstream,
) (s *Server) { | <mask> require.NoErrorf(t, serr, "dns server failed to stop: %s", serr)
<mask> })
<mask> }
<mask>
<mask> func createTestServer(t *testing.T, filterConf *dnsfilter.Config, forwardConf ServerConfig) *Server {
<mask> t.Helper()
<mask>
<mask> rules := `||nxdomain.example.org
<mask> ||null.example.org^
<mask> 127.0.0.1 host.example.org
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove })
</s> add }, nil) </s> remove var s *Server
</s> add </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove if s.localResolvers, err = aghnet.NewMultiAddrExchanger(
localAddrs,
bootstraps,
defaultLocalTimeout,
); err != nil {
return err
</s> add var upsConfig proxy.UpstreamConfig
upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
Bootstrap: bootstraps,
Timeout: defaultLocalTimeout,
// TODO(e.burkov): Should we verify server's ceritificates?
})
if err != nil {
return fmt.Errorf("parsing upstreams: %w", err)
}
s.localResolvers = &proxy.Proxy{
Config: proxy.Config{
UpstreamConfig: &upsConfig,
}, </s> remove resp, err = s.localResolvers.Exchange(req)
</s> add err = s.localResolvers.Resolve(ctx) </s> remove ctx := &proxy.DNSContext{
Proto: "udp",
Req: req,
StartTime: time.Now(),
}
</s> add </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go | |
if localUps != nil {
s.localResolvers.Config.UpstreamConfig.Upstreams = []upstream.Upstream{localUps}
} | <mask>
<mask> s.Lock()
<mask> defer s.Unlock()
<mask>
<mask> s.localResolvers = &aghtest.Exchanger{}
<mask>
<mask> return s
<mask> }
<mask>
<mask> func createServerTLSConfig(t *testing.T) (*tls.Config, []byte, []byte) {
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove s.localResolvers = &aghtest.Exchanger{Ups: ups}
</s> add s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
}, ups) </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
}, nil) | <mask>
<mask> s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> })
<mask>
<mask> tlsConf.CertificateChainData, tlsConf.PrivateKeyData = certPem, keyPem
<mask> s.conf.TLSConfig = tlsConf
<mask>
<mask> err := s.Prepare(nil)
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove s.localResolvers = &aghtest.Exchanger{Ups: ups}
</s> add s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
}, ups) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
}, nil) | <mask> func TestServer(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> })
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> IPv4: map[string][]net.IP{
<mask> "google-public-dns-a.google.com.": {{8, 8, 8, 8}},
<mask> },
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
}, nil) | <mask> func TestServerWithProtectionDisabled(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> })
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> IPv4: map[string][]net.IP{
<mask> "google-public-dns-a.google.com.": {{8, 8, 8, 8}},
<mask> },
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, filterConf, forwardConf, nil) | <mask> UpstreamDNS: []string{"8.8.8.8:53", "8.8.4.4:53"},
<mask> },
<mask> ConfigModified: func() {},
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> IPv4: map[string][]net.IP{
<mask> "google-public-dns-a.google.com.": {{8, 8, 8, 8}},
<mask> },
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, filterConf, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf)
<mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP).String()
<mask> client := dns.Client{Net: proxy.ProtoUDP}
<mask>
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
}, nil) | <mask> func TestInvalidRequest(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> })
<mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP).String()
<mask> req := dns.Msg{
<mask> MsgHdr: dns.MsgHdr{
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
<mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Default blocking.
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
<mask> s.conf.GetCustomUpstreamByClient = func(_ string) *proxy.UpstreamConfig {
<mask> return &proxy.UpstreamConfig{
<mask> Upstreams: []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> IPv4: map[string][]net.IP{
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
}, nil) | <mask> func TestBlockCNAMEProtectionEnabled(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> })
<mask> testUpstm := &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
<mask> IPv4: testIPv4,
<mask> IPv6: nil,
<mask> }
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
<mask> IPv4: testIPv4,
<mask> },
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | <mask> settings.FilteringEnabled = false
<mask> },
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
<mask> IPv4: testIPv4,
<mask> },
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove })
</s> add }, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove })
</s> add }, nil) </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | <mask> ProtectionEnabled: true,
<mask> BlockingMode: "null_ip",
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
<mask> startDeferStop(t, s)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Nil filter blocking.
<mask> req := dns.Msg{
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove })
</s> add }, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
<mask> startDeferStop(t, s)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Hosts blocking.
<mask> req := createTestMessage("host.example.org.")
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, filterConf, forwardConf, nil) | <mask> SafeBrowsingBlockHost: ans4.String(),
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf)
<mask> s.dnsFilter.SetSafeBrowsingUpstream(sbUps)
<mask> startDeferStop(t, s)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // SafeBrowsing blocking.
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
pcfg := proxy.Config{
UpstreamConfig: &proxy.UpstreamConfig{
Upstreams: []upstream.Upstream{tc.locUpstream},
},
}
dns.localResolvers = &proxy.Proxy{
Config: pcfg, | <mask> req: localIP,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> dns.localResolvers = &aghtest.Exchanger{
<mask> Ups: tc.locUpstream,
<mask> }
<mask>
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> host, eerr := dns.Exchange(tc.req)
<mask>
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s.localResolvers = &aghtest.Exchanger{Ups: ups}
</s> add s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
}, ups) </s> remove if errors.Is(err, aghnet.NoUpstreamsErr) {
d.Res = s.genNXDomain(req)
return resultCodeFinish
}
</s> add </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add </s> remove req := d.Req
resp, err := s.localResolvers.Exchange(req)
</s> add err := s.localResolvers.Resolve(d) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/dnsforward_test.go |
s := createTestServer(t, filterConf, forwardConf, nil) | <mask> UpstreamDNS: []string{"8.8.8.8:53", "8.8.4.4:53"},
<mask> },
<mask> ConfigModified: func() {},
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf)
<mask> require.Nil(t, s.Start())
<mask> t.Cleanup(func() {
<mask> require.Nil(t, s.Stop())
<mask> })
<mask>
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
UDPListenAddrs: []*net.UDPAddr{{}},
TCPListenAddrs: []*net.TCPAddr{{}},
})
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/http_test.go |
s := createTestServer(t, filterConf, forwardConf, nil) | <mask> UpstreamDNS: []string{"8.8.8.8:53", "8.8.4.4:53"},
<mask> },
<mask> ConfigModified: func() {},
<mask> }
<mask> s := createTestServer(t, filterConf, forwardConf)
<mask>
<mask> defaultConf := s.conf
<mask>
<mask> err := s.Start()
<mask> assert.Nil(t, err)
</s> Pull request: 2704 local addresses vol.4
Updates #2704.
Squashed commit of the following:
commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 9 19:22:46 2021 +0300
all: replace exchanger with proxy </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, filterConf, forwardConf)
</s> add s := createTestServer(t, filterConf, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/http_test.go |
// MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { | <mask> Flags net.Flags `json:"flags"`
<mask> MTU int `json:"mtu"`
<mask> }
<mask>
<mask> // MarshalText implements the json.Marshaler interface for NetInterface.
<mask> func (iface NetInterface) MarshalText() ([]byte, error) {
<mask> type netInterface NetInterface
<mask> return json.Marshal(&struct {
<mask> HardwareAddr string `json:"hardware_address"`
<mask> Flags string `json:"flags"`
<mask> netInterface
</s> Pull request: 4465 fix ifaces resp
Merge in DNS/adguard-home from 4465-bad-ifaces-resp to master
Closes #4465.
Squashed commit of the following:
commit cc44252b2f12ba4b15df315253417aba2a3f98a6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Apr 6 19:21:40 2022 +0300
aghnet: fix get_addresses </s> remove func TestNetInterface_MarshalText(t *testing.T) {
</s> add func TestNetInterface_MarshalJSON(t *testing.T) { </s> remove testutil.AssertMarshalText(t, want, iface)
</s> add b := &bytes.Buffer{}
err := json.NewEncoder(b).Encode(iface)
require.NoError(t, err)
assert.Equal(t, want, b.String()) </s> remove `}`
</s> add `}` + "\n" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net.go |
"bytes"
"encoding/json" | <mask>
<mask> import (
<mask> "fmt"
<mask> "io/fs"
<mask> "net"
<mask> "os"
<mask> "strings"
</s> Pull request: 4465 fix ifaces resp
Merge in DNS/adguard-home from 4465-bad-ifaces-resp to master
Closes #4465.
Squashed commit of the following:
commit cc44252b2f12ba4b15df315253417aba2a3f98a6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Apr 6 19:21:40 2022 +0300
aghnet: fix get_addresses </s> remove testutil.AssertMarshalText(t, want, iface)
</s> add b := &bytes.Buffer{}
err := json.NewEncoder(b).Encode(iface)
require.NoError(t, err)
assert.Equal(t, want, b.String()) </s> remove `}`
</s> add `}` + "\n" </s> remove func TestNetInterface_MarshalText(t *testing.T) {
</s> add func TestNetInterface_MarshalJSON(t *testing.T) { </s> remove // MarshalText implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalText() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
func TestNetInterface_MarshalJSON(t *testing.T) { | <mask> assert.False(t, IsAddrInUse(anotherErr))
<mask> })
<mask> }
<mask>
<mask> func TestNetInterface_MarshalText(t *testing.T) {
<mask> const want = `{` +
<mask> `"hardware_address":"aa:bb:cc:dd:ee:ff",` +
<mask> `"flags":"up|multicast",` +
<mask> `"ip_addresses":["1.2.3.4","aaaa::1"],` +
<mask> `"name":"iface0",` +
</s> Pull request: 4465 fix ifaces resp
Merge in DNS/adguard-home from 4465-bad-ifaces-resp to master
Closes #4465.
Squashed commit of the following:
commit cc44252b2f12ba4b15df315253417aba2a3f98a6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Apr 6 19:21:40 2022 +0300
aghnet: fix get_addresses </s> remove `}`
</s> add `}` + "\n" </s> remove // MarshalText implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalText() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { </s> remove testutil.AssertMarshalText(t, want, iface)
</s> add b := &bytes.Buffer{}
err := json.NewEncoder(b).Encode(iface)
require.NoError(t, err)
assert.Equal(t, want, b.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
`}` + "\n" | <mask> `"flags":"up|multicast",` +
<mask> `"ip_addresses":["1.2.3.4","aaaa::1"],` +
<mask> `"name":"iface0",` +
<mask> `"mtu":1500` +
<mask> `}`
<mask>
<mask> ip4, ip6 := net.IP{1, 2, 3, 4}, net.IP{0xAA, 0xAA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}
<mask> mask4, mask6 := net.CIDRMask(24, netutil.IPv4BitLen), net.CIDRMask(8, netutil.IPv6BitLen)
<mask>
<mask> iface := &NetInterface{
</s> Pull request: 4465 fix ifaces resp
Merge in DNS/adguard-home from 4465-bad-ifaces-resp to master
Closes #4465.
Squashed commit of the following:
commit cc44252b2f12ba4b15df315253417aba2a3f98a6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Apr 6 19:21:40 2022 +0300
aghnet: fix get_addresses </s> remove func TestNetInterface_MarshalText(t *testing.T) {
</s> add func TestNetInterface_MarshalJSON(t *testing.T) { </s> remove testutil.AssertMarshalText(t, want, iface)
</s> add b := &bytes.Buffer{}
err := json.NewEncoder(b).Encode(iface)
require.NoError(t, err)
assert.Equal(t, want, b.String()) </s> remove // MarshalText implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalText() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
b := &bytes.Buffer{}
err := json.NewEncoder(b).Encode(iface)
require.NoError(t, err)
assert.Equal(t, want, b.String()) | <mask> Flags: net.FlagUp | net.FlagMulticast,
<mask> MTU: 1500,
<mask> }
<mask>
<mask> testutil.AssertMarshalText(t, want, iface)
<mask> }
</s> Pull request: 4465 fix ifaces resp
Merge in DNS/adguard-home from 4465-bad-ifaces-resp to master
Closes #4465.
Squashed commit of the following:
commit cc44252b2f12ba4b15df315253417aba2a3f98a6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Apr 6 19:21:40 2022 +0300
aghnet: fix get_addresses </s> remove func TestNetInterface_MarshalText(t *testing.T) {
</s> add func TestNetInterface_MarshalJSON(t *testing.T) { </s> remove // MarshalText implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalText() ([]byte, error) {
</s> add // MarshalJSON implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalJSON() ([]byte, error) { </s> remove `}`
</s> add `}` + "\n" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
// Custom filtering settings
type RequestFilteringSettings struct {
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
}
| <mask> const enableDelayedCompilation = true // flag for debugging, must be true in production for faster performance
<mask>
<mask> // Config allows you to configure DNS filtering with New() or just change variables directly.
<mask> type Config struct {
<mask> FilteringTempFilename string `yaml:"filtering_temp_filename"` // temporary file for storing unused filtering rules
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(test.hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(test.hostname, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16, clientAddr string) (Result, error) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
// Filtering callback function
FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"` | <mask> UsePlainHTTP bool `yaml:"-"` // use plain HTTP for requests to parental and safe browsing servers
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> ResolverAddress string // DNS server address
<mask> }
<mask>
<mask> type privateConfig struct {
<mask> parentalServer string // access via methods
</s> + dnsfilter: use callback function for applying per-client settings </s> remove func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16, clientAddr string) (Result, error) { </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { </s> remove if d.SafeSearchEnabled {
</s> add if setts.SafeSearchEnabled { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
func (d *Dnsfilter) CheckHost(host string, qtype uint16, clientAddr string) (Result, error) { | <mask> return r != NotFilteredNotFound
<mask> }
<mask>
<mask> // CheckHost tries to match host against rules, then safebrowsing and parental if they are enabled
<mask> func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) {
<mask> // sometimes DNS clients will try to resolve ".", which is a request to get root servers
<mask> if host == "" {
<mask> return Result{Reason: NotFilteredNotFound}, nil
<mask> }
<mask> host = strings.ToLower(host)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(hostname, qtype)
</s> add ret, err := d.CheckHost(hostname, qtype, "") </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) | <mask> if host == d.parentalServer || host == d.safeBrowsingServer {
<mask> return Result{}, nil
<mask> }
<mask>
<mask> // try filter lists first
<mask> result, err := d.matchHost(host, qtype)
<mask> if err != nil {
<mask> return result, err
<mask> }
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
<mask>
</s> + dnsfilter: use callback function for applying per-client settings </s> remove if result.Reason.Matched() {
return result, nil
</s> add var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
} </s> remove if d.SafeSearchEnabled {
</s> add if setts.SafeSearchEnabled { </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") </s> remove func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16, clientAddr string) (Result, error) { </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
} | <mask> result, err := d.matchHost(host, qtype)
<mask> if err != nil {
<mask> return result, err
<mask> }
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
<mask>
<mask> // check safeSearch if no match
<mask> if d.SafeSearchEnabled {
<mask> result, err = d.checkSafeSearch(host)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove if d.SafeSearchEnabled {
</s> add if setts.SafeSearchEnabled { </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { </s> remove res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype)
</s> add clientAddr := ""
if d.Addr != nil {
clientAddr, _, _ = net.SplitHostPort(d.Addr.String())
}
res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, clientAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
if setts.SafeSearchEnabled { | <mask> return result, nil
<mask> }
<mask>
<mask> // check safeSearch if no match
<mask> if d.SafeSearchEnabled {
<mask> result, err = d.checkSafeSearch(host)
<mask> if err != nil {
<mask> log.Printf("Failed to safesearch HTTP lookup, ignoring check: %v", err)
<mask> return Result{}, nil
<mask> }
</s> + dnsfilter: use callback function for applying per-client settings </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { </s> remove if result.Reason.Matched() {
return result, nil
</s> add var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
} </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
if setts.SafeBrowsingEnabled { | <mask> }
<mask> }
<mask>
<mask> // check safebrowsing if no match
<mask> if d.SafeBrowsingEnabled {
<mask> result, err = d.checkSafeBrowsing(host)
<mask> if err != nil {
<mask> // failed to do HTTP lookup -- treat it as if we got empty response, but don't save cache
<mask> log.Printf("Failed to do safebrowsing HTTP lookup, ignoring check: %v", err)
<mask> return Result{}, nil
</s> + dnsfilter: use callback function for applying per-client settings </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { </s> remove if d.SafeSearchEnabled {
</s> add if setts.SafeSearchEnabled { </s> remove if result.Reason.Matched() {
return result, nil
</s> add var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
} </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) </s> remove func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16, clientAddr string) (Result, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
if setts.ParentalEnabled { | <mask> }
<mask> }
<mask>
<mask> // check parental if no match
<mask> if d.ParentalEnabled {
<mask> result, err = d.checkParental(host)
<mask> if err != nil {
<mask> // failed to do HTTP lookup -- treat it as if we got empty response, but don't save cache
<mask> log.Printf("Failed to do parental HTTP lookup, ignoring check: %v", err)
<mask> return Result{}, nil
</s> + dnsfilter: use callback function for applying per-client settings </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { </s> remove if d.SafeSearchEnabled {
</s> add if setts.SafeSearchEnabled { </s> remove if result.Reason.Matched() {
return result, nil
</s> add var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
} </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) </s> remove res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype)
</s> add clientAddr := ""
if d.Addr != nil {
clientAddr, _, _ = net.SplitHostPort(d.Addr.String())
}
res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, clientAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
// CLIENTS SETTINGS | <mask> // SAFE BROWSING
<mask> // SAFE SEARCH
<mask> // PARENTAL
<mask> // FILTERING
<mask> // BENCHMARKS
<mask>
<mask> // HELPERS
<mask>
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
ret, err := d.CheckHost(hostname, dns.TypeA, "") | <mask> }
<mask>
<mask> func (d *Dnsfilter) checkMatch(t *testing.T, hostname string) {
<mask> t.Helper()
<mask> ret, err := d.CheckHost(hostname, dns.TypeA)
<mask> if err != nil {
<mask> t.Errorf("Error while matching host %s: %s", hostname, err)
<mask> }
<mask> if !ret.IsFiltered {
<mask> t.Errorf("Expected hostname %s to match", hostname)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, qtype)
</s> add ret, err := d.CheckHost(hostname, qtype, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(test.hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(test.hostname, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
ret, err := d.CheckHost(hostname, qtype, "") | <mask> }
<mask>
<mask> func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname string, ip string, qtype uint16) {
<mask> t.Helper()
<mask> ret, err := d.CheckHost(hostname, qtype)
<mask> if err != nil {
<mask> t.Errorf("Error while matching host %s: %s", hostname, err)
<mask> }
<mask> if !ret.IsFiltered {
<mask> t.Errorf("Expected hostname %s to match", hostname)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove func (d *Dnsfilter) CheckHost(host string, qtype uint16) (Result, error) {
</s> add func (d *Dnsfilter) CheckHost(host string, qtype uint16, clientAddr string) (Result, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
ret, err := d.CheckHost(hostname, dns.TypeA, "") | <mask> }
<mask>
<mask> func (d *Dnsfilter) checkMatchEmpty(t *testing.T, hostname string) {
<mask> t.Helper()
<mask> ret, err := d.CheckHost(hostname, dns.TypeA)
<mask> if err != nil {
<mask> t.Errorf("Error while matching host %s: %s", hostname, err)
<mask> }
<mask> if ret.IsFiltered {
<mask> t.Errorf("Expected hostname %s to not match", hostname)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, qtype)
</s> add ret, err := d.CheckHost(hostname, qtype, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(test.hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(test.hostname, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
result, err := d.CheckHost(host, dns.TypeA, "") | <mask> yandex := []string{"yAndeX.ru", "YANdex.COM", "yandex.ua", "yandex.by", "yandex.kz", "www.yandex.com"}
<mask>
<mask> // Check host for each domain
<mask> for _, host := range yandex {
<mask> result, err := d.CheckHost(host, dns.TypeA)
<mask> if err != nil {
<mask> t.Errorf("SafeSearch doesn't work for yandex domain `%s` cause %s", host, err)
<mask> }
<mask>
<mask> if result.IP.String() != "213.180.193.56" {
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
result, err := d.CheckHost(host, dns.TypeA, "") | <mask> googleDomains := []string{"www.google.com", "www.google.im", "www.google.co.in", "www.google.iq", "www.google.is", "www.google.it", "www.google.je"}
<mask>
<mask> // Check host for each domain
<mask> for _, host := range googleDomains {
<mask> result, err := d.CheckHost(host, dns.TypeA)
<mask> if err != nil {
<mask> t.Errorf("SafeSearch doesn't work for %s cause %s", host, err)
<mask> }
<mask>
<mask> if result.IP == nil {
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
result, err = d.CheckHost(domain, dns.TypeA, "") | <mask> var result Result
<mask> var err error
<mask>
<mask> // Check host with disabled safesearch
<mask> result, err = d.CheckHost(domain, dns.TypeA)
<mask> if err != nil {
<mask> t.Fatalf("Cannot check host due to %s", err)
<mask> }
<mask> if result.IP != nil {
<mask> t.Fatalf("SafeSearch is not enabled but there is an answer for `%s` !", domain)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") </s> remove res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype)
</s> add clientAddr := ""
if d.Addr != nil {
clientAddr, _, _ = net.SplitHostPort(d.Addr.String())
}
res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, clientAddr) </s> remove if result.Reason.Matched() {
return result, nil
</s> add var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
} </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
result, err = d.CheckHost(domain, dns.TypeA, "") | <mask> }
<mask>
<mask> // Enable safesearch
<mask> d.SafeSearchEnabled = true
<mask> result, err = d.CheckHost(domain, dns.TypeA)
<mask> if err != nil {
<mask> t.Fatalf("CheckHost for safesearh domain %s failed cause %s", domain, err)
<mask> }
<mask>
<mask> // Fir yandex we already know valid ip
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove if d.SafeSearchEnabled {
</s> add if setts.SafeSearchEnabled { </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
result, err := d.CheckHost(domain, dns.TypeA, "") | <mask> func TestSafeSearchCacheGoogle(t *testing.T) {
<mask> d := NewForTest()
<mask> defer d.Destroy()
<mask> domain := "www.google.ru"
<mask> result, err := d.CheckHost(domain, dns.TypeA)
<mask> if err != nil {
<mask> t.Fatalf("Cannot check host due to %s", err)
<mask> }
<mask> if result.IP != nil {
<mask> t.Fatalf("SafeSearch is not enabled but there is an answer!")
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove ret, err := d.CheckHost(test.hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(test.hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
result, err = d.CheckHost(domain, dns.TypeA, "") | <mask> ip = i
<mask> }
<mask> }
<mask>
<mask> result, err = d.CheckHost(domain, dns.TypeA)
<mask> if err != nil {
<mask> t.Fatalf("CheckHost for safesearh domain %s failed cause %s", domain, err)
<mask> }
<mask>
<mask> if result.IP.String() != ip.String() {
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") </s> remove result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
ret, err := d.CheckHost(test.hostname, dns.TypeA, "") | <mask> filters[0] = test.rules
<mask> d := NewForTestFilters(filters)
<mask> defer d.Destroy()
<mask>
<mask> ret, err := d.CheckHost(test.hostname, dns.TypeA)
<mask> if err != nil {
<mask> t.Errorf("Error while matching host %s: %s", test.hostname, err)
<mask> }
<mask> if ret.IsFiltered != test.isFiltered {
<mask> t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret.IsFiltered, test.isFiltered)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, qtype)
</s> add ret, err := d.CheckHost(hostname, qtype, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
ret, err := d.CheckHost(hostname, dns.TypeA, "") | <mask> defer d.Destroy()
<mask> d.SafeBrowsingEnabled = true
<mask> for n := 0; n < b.N; n++ {
<mask> hostname := "wmconvirus.narod.ru"
<mask> ret, err := d.CheckHost(hostname, dns.TypeA)
<mask> if err != nil {
<mask> b.Errorf("Error while matching host %s: %s", hostname, err)
<mask> }
<mask> if !ret.IsFiltered {
<mask> b.Errorf("Expected hostname %s to match", hostname)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, qtype)
</s> add ret, err := d.CheckHost(hostname, qtype, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(test.hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(test.hostname, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
ret, err := d.CheckHost(hostname, dns.TypeA, "") | <mask> d.SafeBrowsingEnabled = true
<mask> b.RunParallel(func(pb *testing.PB) {
<mask> for pb.Next() {
<mask> hostname := "wmconvirus.narod.ru"
<mask> ret, err := d.CheckHost(hostname, dns.TypeA)
<mask> if err != nil {
<mask> b.Errorf("Error while matching host %s: %s", hostname, err)
<mask> }
<mask> if !ret.IsFiltered {
<mask> b.Errorf("Expected hostname %s to match", hostname)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(hostname, qtype)
</s> add ret, err := d.CheckHost(hostname, qtype, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") </s> remove ret, err := d.CheckHost(test.hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(test.hostname, dns.TypeA, "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
clientAddr := ""
if d.Addr != nil {
clientAddr, _, _ = net.SplitHostPort(d.Addr.String())
}
res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, clientAddr) | <mask>
<mask> var res dnsfilter.Result
<mask> var err error
<mask>
<mask> res, err = dnsFilter.CheckHost(host, d.Req.Question[0].Qtype)
<mask> if err != nil {
<mask> // Return immediately if there's an error
<mask> return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
<mask> } else if res.IsFiltered {
<mask> // log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule)
</s> + dnsfilter: use callback function for applying per-client settings </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") </s> remove if result.Reason.Matched() {
return result, nil
</s> add var result Result
var err error
// try filter lists first
if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
} </s> remove // try filter lists first
result, err := d.matchHost(host, qtype)
if err != nil {
return result, err
</s> add var setts RequestFilteringSettings
setts.FilteringEnabled = true
setts.SafeSearchEnabled = d.SafeSearchEnabled
setts.SafeBrowsingEnabled = d.SafeBrowsingEnabled
setts.ParentalEnabled = d.ParentalEnabled
if len(clientAddr) != 0 && d.FilterHandler != nil {
d.FilterHandler(clientAddr, &setts) </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsforward/dnsforward.go |
// configure config filename
initConfigFilename(args) | <mask> // run initializes configuration and runs the AdGuard Home
<mask> // run is a blocking method!
<mask> // nolint
<mask> func run(args options) {
<mask> // config file path can be overridden by command-line arguments:
<mask> if args.configFilename != "" {
<mask> Context.configFilename = args.configFilename
<mask> } else {
<mask> // Default config file name
<mask> Context.configFilename = "AdGuardHome.yaml"
<mask> }
<mask>
<mask> // configure working dir and config path
<mask> initWorkingDir(args)
<mask>
<mask> // configure log level and output
</s> 2128 + service: Detect config file on service run correctly
Cose #2128
Squashed commit of the following:
commit cb7a58276fa97ac2e22bdbcb6d56c61415482e40
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Sep 24 21:03:43 2020 +0300
2128 + service: Detect config file on service run correctly | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c411c463030e0188a27c85db5ad545ab442cce8 | home/home.go |
func initConfigFilename(args options) {
// config file path can be overridden by command-line arguments:
if args.configFilename != "" {
Context.configFilename = args.configFilename
} else {
// Default config file name
Context.configFilename = "AdGuardHome.yaml"
}
}
| <mask> }
<mask>
<mask> // initWorkingDir initializes the workDir
<mask> // if no command-line arguments specified, we use the directory where our binary file is located
<mask> func initWorkingDir(args options) {
<mask> execPath, err := os.Executable()
</s> 2128 + service: Detect config file on service run correctly
Cose #2128
Squashed commit of the following:
commit cb7a58276fa97ac2e22bdbcb6d56c61415482e40
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Sep 24 21:03:43 2020 +0300
2128 + service: Detect config file on service run correctly </s> remove // config file path can be overridden by command-line arguments:
if args.configFilename != "" {
Context.configFilename = args.configFilename
} else {
// Default config file name
Context.configFilename = "AdGuardHome.yaml"
}
</s> add // configure config filename
initConfigFilename(args) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c411c463030e0188a27c85db5ad545ab442cce8 | home/home.go |
initConfigFilename(opts)
initWorkingDir(opts) | <mask> log.Fatalf("Failed to run service: %s", err)
<mask> }
<mask> } else if action == "install" {
<mask> handleServiceInstallCommand(s)
<mask> } else if action == "uninstall" {
<mask> handleServiceUninstallCommand(s)
<mask> } else {
<mask> err = svcAction(s, action)
</s> 2128 + service: Detect config file on service run correctly
Cose #2128
Squashed commit of the following:
commit cb7a58276fa97ac2e22bdbcb6d56c61415482e40
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Sep 24 21:03:43 2020 +0300
2128 + service: Detect config file on service run correctly </s> remove // config file path can be overridden by command-line arguments:
if args.configFilename != "" {
Context.configFilename = args.configFilename
} else {
// Default config file name
Context.configFilename = "AdGuardHome.yaml"
}
</s> add // configure config filename
initConfigFilename(args) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c411c463030e0188a27c85db5ad545ab442cce8 | home/service.go |
func (d *DNSFilter) ApplyBlockedServices(setts *FilteringSettings, list []string, global bool) { | <mask> return ok
<mask> }
<mask>
<mask> // ApplyBlockedServices - set blocked services settings for this DNS request
<mask> func (d *DNSFilter) ApplyBlockedServices(setts *RequestFilteringSettings, list []string, global bool) {
<mask> setts.ServicesRules = []ServiceEntry{}
<mask> if global {
<mask> d.confLock.RLock()
<mask> defer d.confLock.RUnlock()
<mask> list = d.Config.BlockedServices
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove func (d *DNSFilter) GetConfig() RequestFilteringSettings {
c := RequestFilteringSettings{}
</s> add func (d *DNSFilter) GetConfig() FilteringSettings {
c := FilteringSettings{} </s> remove func (d *DNSFilter) checkSafeSearch(host string) (Result, error) {
</s> add func (d *DNSFilter) checkSafeSearch(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.SafeSearchEnabled {
return Result{}, nil
}
</s> remove func matchBlockedServicesRules(host string, svcs []ServiceEntry) Result {
req := rules.NewRequestForHostname(host)
res := Result{}
</s> add // matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function.
func matchBlockedServicesRules(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
svcs := setts.ServicesRules
if len(svcs) == 0 {
return Result{}, nil
} </s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
</s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/blocked.go |
// FilteringSettings are custom filtering settings for a client.
type FilteringSettings struct { | <mask> Name string
<mask> Rules []*rules.NetworkRule
<mask> }
<mask>
<mask> // RequestFilteringSettings is custom filtering settings
<mask> type RequestFilteringSettings struct {
<mask> FilteringEnabled bool
<mask> SafeSearchEnabled bool
<mask> SafeBrowsingEnabled bool
<mask> ParentalEnabled bool
<mask>
<mask> ClientName string
<mask> ClientIP net.IP
<mask> ClientTags []string
<mask>
<mask> ServicesRules []ServiceEntry
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove testFunc func(string) (Result, error)
</s> add testFunc func(host string, _ uint16, _ *FilteringSettings) (res Result, err error) </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool | <mask> ClientTags []string
<mask>
<mask> ServicesRules []ServiceEntry
<mask> }
<mask>
<mask> // Resolver is the interface for net.Resolver to simplify testing.
<mask> type Resolver interface {
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // RequestFilteringSettings is custom filtering settings
type RequestFilteringSettings struct {
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
</s> add // FilteringSettings are custom filtering settings for a client.
type FilteringSettings struct { </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove func matchBlockedServicesRules(host string, svcs []ServiceEntry) Result {
req := rules.NewRequestForHostname(host)
res := Result{}
</s> add // matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function.
func matchBlockedServicesRules(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
svcs := setts.ServicesRules
if len(svcs) == 0 {
return Result{}, nil
} </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
type hostChecker struct {
check func(host string, qtype uint16, setts *FilteringSettings) (res Result, err error)
name string
}
| <mask> }
<mask>
<mask> // DNSFilter matches hostnames and DNS requests against filtering rules.
<mask> type DNSFilter struct {
<mask> rulesStorage *filterlist.RuleStorage
<mask> filteringEngine *urlfilter.DNSEngine
<mask> rulesStorageAllow *filterlist.RuleStorage
<mask> filteringEngineAllow *urlfilter.DNSEngine
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // RequestFilteringSettings is custom filtering settings
type RequestFilteringSettings struct {
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
</s> add // FilteringSettings are custom filtering settings for a client.
type FilteringSettings struct { </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add </s> remove return d.matchHost(host, qtype, *setts)
</s> add return d.matchHost(host, qtype, setts) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
hostCheckers []hostChecker | <mask> //
<mask> // TODO(e.burkov): Use upstream that configured in dnsforward instead.
<mask> resolver Resolver
<mask> }
<mask>
<mask> // Filter represents a filter list
<mask> type Filter struct {
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // RequestFilteringSettings is custom filtering settings
type RequestFilteringSettings struct {
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
</s> add // FilteringSettings are custom filtering settings for a client.
type FilteringSettings struct { </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"` </s> remove func (d *DNSFilter) matchHost(host string, qtype uint16, setts RequestFilteringSettings) (res Result, err error) {
</s> add func (d *DNSFilter) matchHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
func (d *DNSFilter) GetConfig() FilteringSettings {
c := FilteringSettings{} | <mask> return false
<mask> }
<mask>
<mask> // GetConfig - get configuration
<mask> func (d *DNSFilter) GetConfig() RequestFilteringSettings {
<mask> c := RequestFilteringSettings{}
<mask> // d.confLock.RLock()
<mask> c.SafeSearchEnabled = d.Config.SafeSearchEnabled
<mask> c.SafeBrowsingEnabled = d.Config.SafeBrowsingEnabled
<mask> c.ParentalEnabled = d.Config.ParentalEnabled
<mask> // d.confLock.RUnlock()
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *RequestFilteringSettings, list []string, global bool) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *FilteringSettings, list []string, global bool) { </s> remove func applyClientSettings(setts *RequestFilteringSettings) {
</s> add func applyClientSettings(setts *FilteringSettings) { </s> remove var setts RequestFilteringSettings
</s> add var setts FilteringSettings </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *FilteringSettings) (Result, error) { | <mask> return r != NotFilteredNotFound
<mask> }
<mask>
<mask> // CheckHostRules tries to match the host against filtering rules only.
<mask> func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
<mask> if !setts.FilteringEnabled {
<mask> return Result{}, nil
<mask> }
<mask>
<mask> return d.matchHost(host, qtype, *setts)
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove return d.matchHost(host, qtype, *setts)
</s> add return d.matchHost(host, qtype, setts) </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove func (d *DNSFilter) matchHost(host string, qtype uint16, setts RequestFilteringSettings) (res Result, err error) {
</s> add func (d *DNSFilter) matchHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
</s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
</s> remove func (d *DNSFilter) checkSafeBrowsing(host string) (Result, error) {
</s> add // TODO(a.garipov): Unify with checkParental.
func (d *DNSFilter) checkSafeBrowsing(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.SafeBrowsingEnabled {
return Result{}, nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/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)
<mask> }
<mask>
<mask> // CheckHost tries to match the host against filtering rules, then
<mask> // safebrowsing and parental control rules, if they are enabled.
<mask> func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
</s> add func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *FilteringSettings) (Result, error) { </s> remove func (d *DNSFilter) matchHost(host string, qtype uint16, setts RequestFilteringSettings) (res Result, err error) {
</s> add func (d *DNSFilter) matchHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
</s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
</s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
// CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. | <mask>
<mask> return d.matchHost(host, qtype, *setts)
<mask> }
<mask>
<mask> // CheckHost tries to match the host against filtering rules, then
<mask> // safebrowsing and parental control rules, if they are enabled.
<mask> func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
<mask> // sometimes DNS clients will try to resolve ".", which is a request to get root servers
<mask> if host == "" {
<mask> return Result{Reason: NotFilteredNotFound}, nil
<mask> }
<mask> host = strings.ToLower(host)
<mask>
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove return d.matchHost(host, qtype, *setts)
</s> add return d.matchHost(host, qtype, setts) </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add </s> remove func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
</s> add func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *FilteringSettings) (Result, error) { </s> remove func (d *DNSFilter) matchHost(host string, qtype uint16, setts RequestFilteringSettings) (res Result, err error) {
</s> add func (d *DNSFilter) matchHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
</s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
<mask> // sometimes DNS clients will try to resolve ".", which is a request to get root servers
<mask> if host == "" {
<mask> return Result{Reason: NotFilteredNotFound}, nil
<mask> }
<mask> host = strings.ToLower(host)
<mask>
<mask> var result Result
<mask> var err error
<mask>
<mask> // first - check rewrites, they have the highest priority
<mask> result = d.processRewrites(host, qtype)
<mask> if result.Reason == Rewritten {
<mask> return result, nil
<mask> }
<mask>
<mask> // Now check the hosts file -- do we have any rules for it?
<mask> // just like DNS rewrites, it has higher priority than filtering rules.
<mask> if d.Config.AutoHosts != nil {
<mask> matched := d.checkAutoHosts(host, qtype, &result)
<mask> if matched {
<mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> if setts.FilteringEnabled {
<mask> result, err = d.matchHost(host, qtype, *setts)
<mask> if err != nil {
<mask> return result, err
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) </s> remove // parental control web service
if setts.ParentalEnabled {
result, err = d.checkParental(host)
if err != nil {
log.Printf("Parental: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
</s> add res = d.processRewrites(host, qtype)
if res.Reason == Rewritten {
return res, nil </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
... | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go | |
host = strings.ToLower(host) | <mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> if setts.FilteringEnabled {
<mask> result, err = d.matchHost(host, qtype, *setts)
<mask> if err != nil {
<mask> return result, err
<mask> }
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> // are there any blocked services?
<mask> if len(setts.ServicesRules) != 0 {
<mask> result = matchBlockedServicesRules(host, setts.ServicesRules)
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> // browsing security web service
<mask> if setts.SafeBrowsingEnabled {
<mask> result, err = d.checkSafeBrowsing(host)
<mask> if err != nil {
<mask> log.Info("SafeBrowsing: failed: %v", err)
<mask> return Result{}, nil
<mask> }
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> // parental control web service
<mask> if setts.ParentalEnabled {
<mask> result, err = d.checkParental(host)
<mask> if err != nil {
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // parental control web service
if setts.ParentalEnabled {
result, err = d.checkParental(host)
if err != nil {
log.Printf("Parental: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
</s> add res = d.processRewrites(host, qtype)
if res.Reason == Rewritten {
return res, nil </s> remove log.Info("SafeSearch: failed: %v", err)
return Result{}, nil
</s> add return Result{}, fmt.Errorf("%s: %w", hc.name, err) </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add </s> remove if result.Reason.Matched() {
return result, nil
</s> add if res.Reason.Matched() {
return res, nil | [
"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/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
res = d.processRewrites(host, qtype)
if res.Reason == Rewritten {
return res, nil | <mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> // parental control web service
<mask> if setts.ParentalEnabled {
<mask> result, err = d.checkParental(host)
<mask> if err != nil {
<mask> log.Printf("Parental: failed: %v", err)
<mask> return Result{}, nil
<mask> }
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> // apply safe search if needed
<mask> if setts.SafeSearchEnabled {
<mask> result, err = d.checkSafeSearch(host)
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove log.Info("SafeSearch: failed: %v", err)
return Result{}, nil
</s> add return Result{}, fmt.Errorf("%s: %w", hc.name, err) </s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove if result.Reason.Matched() {
return result, nil
</s> add if res.Reason.Matched() {
return res, nil </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add | [
"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/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) | <mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> // apply safe search if needed
<mask> if setts.SafeSearchEnabled {
<mask> result, err = d.checkSafeSearch(host)
<mask> if err != nil {
<mask> log.Info("SafeSearch: failed: %v", err)
<mask> return Result{}, nil
<mask> }
<mask>
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove log.Info("SafeSearch: failed: %v", err)
return Result{}, nil
</s> add return Result{}, fmt.Errorf("%s: %w", hc.name, err) </s> remove // parental control web service
if setts.ParentalEnabled {
result, err = d.checkParental(host)
if err != nil {
log.Printf("Parental: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
</s> add res = d.processRewrites(host, qtype)
if res.Reason == Rewritten {
return res, nil </s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) </s> remove if result.Reason.Matched() {
return result, nil
</s> add if res.Reason.Matched() {
return res, nil </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
return Result{}, fmt.Errorf("%s: %w", hc.name, err) | <mask> // apply safe search if needed
<mask> if setts.SafeSearchEnabled {
<mask> result, err = d.checkSafeSearch(host)
<mask> if err != nil {
<mask> log.Info("SafeSearch: failed: %v", err)
<mask> return Result{}, nil
<mask> }
<mask>
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove // parental control web service
if setts.ParentalEnabled {
result, err = d.checkParental(host)
if err != nil {
log.Printf("Parental: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
</s> add res = d.processRewrites(host, qtype)
if res.Reason == Rewritten {
return res, nil </s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) </s> remove if result.Reason.Matched() {
return result, nil
</s> add if res.Reason.Matched() {
return res, nil </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
if res.Reason.Matched() {
return res, nil | <mask> log.Info("SafeSearch: failed: %v", err)
<mask> return Result{}, nil
<mask> }
<mask>
<mask> if result.Reason.Matched() {
<mask> return result, nil
<mask> }
<mask> }
<mask>
<mask> return Result{}, nil
<mask> }
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove log.Info("SafeSearch: failed: %v", err)
return Result{}, nil
</s> add return Result{}, fmt.Errorf("%s: %w", hc.name, err) </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove // parental control web service
if setts.ParentalEnabled {
result, err = d.checkParental(host)
if err != nil {
log.Printf("Parental: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
</s> add res = d.processRewrites(host, qtype)
if res.Reason == Rewritten {
return res, nil </s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) </s> remove res := Result{
</s> add res = Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
// checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
| <mask>
<mask> return Result{}, nil
<mask> }
<mask>
<mask> func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
<mask> ips := d.Config.AutoHosts.Process(host, qtype)
<mask> if ips != nil {
<mask> result.Reason = RewrittenAutoHosts
<mask> result.IPList = ips
<mask>
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} </s> remove return true
</s> add return res, nil </s> remove func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
</s> add func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *FilteringSettings) (Result, error) { </s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *RequestFilteringSettings, list []string, global bool) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *FilteringSettings, list []string, global bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} | <mask>
<mask> func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
<mask> ips := d.Config.AutoHosts.Process(host, qtype)
<mask> if ips != nil {
<mask> result.Reason = RewrittenAutoHosts
<mask> result.IPList = ips
<mask>
<mask> return true
<mask> }
<mask>
<mask> revHosts := d.Config.AutoHosts.ProcessReverse(host, qtype)
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove return true
</s> add return res, nil </s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
</s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </s> remove result.ReverseHosts = make([]string, len(revHosts))
</s> add res.ReverseHosts = make([]string, len(revHosts)) </s> remove func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
</s> add func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *FilteringSettings) (Result, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
return res, nil | <mask> if ips != nil {
<mask> result.Reason = RewrittenAutoHosts
<mask> result.IPList = ips
<mask>
<mask> return true
<mask> }
<mask>
<mask> revHosts := d.Config.AutoHosts.ProcessReverse(host, qtype)
<mask> if len(revHosts) != 0 {
<mask> result.Reason = RewrittenAutoHosts
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} </s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </s> remove result.ReverseHosts = make([]string, len(revHosts))
</s> add res.ReverseHosts = make([]string, len(revHosts)) </s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
</s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
res = Result{
Reason: RewrittenAutoHosts,
} | <mask> }
<mask>
<mask> revHosts := d.Config.AutoHosts.ProcessReverse(host, qtype)
<mask> if len(revHosts) != 0 {
<mask> result.Reason = RewrittenAutoHosts
<mask>
<mask> // TODO(a.garipov): Optimize this with a buffer.
<mask> result.ReverseHosts = make([]string, len(revHosts))
<mask> for i := range revHosts {
<mask> result.ReverseHosts[i] = revHosts[i] + "."
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove result.ReverseHosts = make([]string, len(revHosts))
</s> add res.ReverseHosts = make([]string, len(revHosts)) </s> remove result.ReverseHosts[i] = revHosts[i] + "."
</s> add res.ReverseHosts[i] = revHosts[i] + "." </s> remove return true
</s> add return res, nil </s> remove return true
</s> add return res, nil </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
res.ReverseHosts = make([]string, len(revHosts)) | <mask> if len(revHosts) != 0 {
<mask> result.Reason = RewrittenAutoHosts
<mask>
<mask> // TODO(a.garipov): Optimize this with a buffer.
<mask> result.ReverseHosts = make([]string, len(revHosts))
<mask> for i := range revHosts {
<mask> result.ReverseHosts[i] = revHosts[i] + "."
<mask> }
<mask>
<mask> return true
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </s> remove result.ReverseHosts[i] = revHosts[i] + "."
</s> add res.ReverseHosts[i] = revHosts[i] + "." </s> remove return true
</s> add return res, nil </s> remove return true
</s> add return res, nil </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
res.ReverseHosts[i] = revHosts[i] + "." | <mask>
<mask> // TODO(a.garipov): Optimize this with a buffer.
<mask> result.ReverseHosts = make([]string, len(revHosts))
<mask> for i := range revHosts {
<mask> result.ReverseHosts[i] = revHosts[i] + "."
<mask> }
<mask>
<mask> return true
<mask> }
<mask>
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove result.ReverseHosts = make([]string, len(revHosts))
</s> add res.ReverseHosts = make([]string, len(revHosts)) </s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </s> remove return true
</s> add return res, nil </s> remove return true
</s> add return res, nil </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
return res, nil | <mask> for i := range revHosts {
<mask> result.ReverseHosts[i] = revHosts[i] + "."
<mask> }
<mask>
<mask> return true
<mask> }
<mask>
<mask> return false
<mask> }
<mask>
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove result.ReverseHosts[i] = revHosts[i] + "."
</s> add res.ReverseHosts[i] = revHosts[i] + "." </s> remove result.ReverseHosts = make([]string, len(revHosts))
</s> add res.ReverseHosts = make([]string, len(revHosts)) </s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </s> remove return true
</s> add return res, nil </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
return Result{}, nil | <mask>
<mask> return true
<mask> }
<mask>
<mask> return false
<mask> }
<mask>
<mask> // Process rewrites table
<mask> // . Find CNAME for a domain name (exact match or by wildcard)
<mask> // . if found and CNAME equals to domain name - this is an exception; exit
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove func (d *DNSFilter) matchHost(host string, qtype uint16, setts RequestFilteringSettings) (res Result, err error) {
</s> add func (d *DNSFilter) matchHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
</s> remove return d.matchHost(host, qtype, *setts)
</s> add return d.matchHost(host, qtype, setts) </s> remove host = strings.ToLower(host)
var result Result
var err error
// first - check rewrites, they have the highest priority
result = d.processRewrites(host, qtype)
if result.Reason == Rewritten {
return result, nil
}
// Now check the hosts file -- do we have any rules for it?
// just like DNS rewrites, it has higher priority than filtering rules.
if d.Config.AutoHosts != nil {
matched := d.checkAutoHosts(host, qtype, &result)
if matched {
return result, nil
}
}
</s> add </s> remove return res
</s> add return res, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
// matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function.
func matchBlockedServicesRules(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
svcs := setts.ServicesRules
if len(svcs) == 0 {
return Result{}, nil
} | <mask>
<mask> return res
<mask> }
<mask>
<mask> func matchBlockedServicesRules(host string, svcs []ServiceEntry) Result {
<mask> req := rules.NewRequestForHostname(host)
<mask> res := Result{}
<mask>
<mask> for _, s := range svcs {
<mask> for _, rule := range s.Rules {
<mask> if rule.Match(req) {
<mask> res.Reason = FilteredBlockedService
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove var setts RequestFilteringSettings
</s> add var setts FilteringSettings </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </s> remove _, err = d.checkParental("smthng.com")
assert.NotNil(t, err)
</s> add _, err = d.checkParental("smthng.com", dns.TypeA, setts)
assert.Error(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
req := rules.NewRequestForHostname(host) | <mask> }
<mask>
<mask> for _, s := range svcs {
<mask> for _, rule := range s.Rules {
<mask> if rule.Match(req) {
<mask> res.Reason = FilteredBlockedService
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove func matchBlockedServicesRules(host string, svcs []ServiceEntry) Result {
req := rules.NewRequestForHostname(host)
res := Result{}
</s> add // matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function.
func matchBlockedServicesRules(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
svcs := setts.ServicesRules
if len(svcs) == 0 {
return Result{}, nil
} </s> remove var setts RequestFilteringSettings
</s> add var setts FilteringSettings </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove _, err = d.checkParental("smthng.com")
assert.NotNil(t, err)
</s> add _, err = d.checkParental("smthng.com", dns.TypeA, setts)
assert.Error(t, err) </s> remove result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
return res, nil | <mask>
<mask> log.Debug("blocked services: matched rule: %s host: %s service: %s",
<mask> ruleText, host, s.Name)
<mask>
<mask> return res
<mask> }
<mask> }
<mask> }
<mask> return res
<mask> }
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove return check(ctx, res, d.parentalUpstream)
</s> add return check(sctx, res, d.parentalUpstream) </s> remove return res
</s> add return res, nil </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove res := Result{
</s> add res = Result{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
return res, nil | <mask> return res
<mask> }
<mask> }
<mask> }
<mask> return res
<mask> }
<mask>
<mask> //
<mask> // Adding rule and matching against the rules
<mask> //
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove func matchBlockedServicesRules(host string, svcs []ServiceEntry) Result {
req := rules.NewRequestForHostname(host)
res := Result{}
</s> add // matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function.
func matchBlockedServicesRules(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
svcs := setts.ServicesRules
if len(svcs) == 0 {
return Result{}, nil
} </s> remove return res
</s> add return res, nil </s> remove return d.matchHost(host, qtype, *setts)
</s> add return d.matchHost(host, qtype, setts) </s> remove // parental control web service
if setts.ParentalEnabled {
result, err = d.checkParental(host)
if err != nil {
log.Printf("Parental: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
</s> add res = d.processRewrites(host, qtype)
if res.Reason == Rewritten {
return res, nil </s> remove func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
</s> add func (d *DNSFilter) CheckHostRules(host string, qtype uint16, setts *FilteringSettings) (Result, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
func (d *DNSFilter) matchHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.FilteringEnabled {
return Result{}, nil
}
| <mask> }
<mask>
<mask> // matchHost is a low-level way to check only if hostname is filtered by rules,
<mask> // skipping expensive safebrowsing and parental lookups.
<mask> func (d *DNSFilter) matchHost(host string, qtype uint16, setts RequestFilteringSettings) (res Result, err error) {
<mask> d.engineLock.RLock()
<mask> // Keep in mind that this lock must be held no just when calling Match()
<mask> // but also while using the rules returned by it.
<mask> defer d.engineLock.RUnlock()
<mask>
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove // CheckHost tries to match the host against filtering rules, then
// safebrowsing and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(host string, qtype uint16, setts *RequestFilteringSettings) (Result, error) {
// sometimes DNS clients will try to resolve ".", which is a request to get root servers
</s> add // CheckHost tries to match the host against filtering rules, then safebrowsing
// and parental control rules, if they are enabled.
func (d *DNSFilter) CheckHost(
host string,
qtype uint16,
setts *FilteringSettings,
) (res Result, err error) {
// Sometimes clients try to resolve ".", which is a request to get root
// servers. </s> remove return d.matchHost(host, qtype, *setts)
</s> add return d.matchHost(host, qtype, setts) </s> remove func (d *DNSFilter) checkAutoHosts(host string, qtype uint16, result *Result) (matched bool) {
</s> add // checkAutoHosts compares the host against our autohosts table. The err is
// always nil, it is only there to make this a valid hostChecker function.
func (d *DNSFilter) checkAutoHosts(
host string,
qtype uint16,
_ *FilteringSettings,
) (res Result, err error) {
if d.Config.AutoHosts == nil {
return Result{}, nil
}
</s> remove func matchBlockedServicesRules(host string, svcs []ServiceEntry) Result {
req := rules.NewRequestForHostname(host)
res := Result{}
</s> add // matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function.
func matchBlockedServicesRules(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
svcs := setts.ServicesRules
if len(svcs) == 0 {
return Result{}, nil
} </s> remove return false
</s> add return Result{}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
var setts FilteringSettings | <mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
<mask> var setts RequestFilteringSettings
<mask>
<mask> // Helpers.
<mask>
<mask> func purgeCaches() {
<mask> for _, c := range []cache.Cache{
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove func (d *DNSFilter) GetConfig() RequestFilteringSettings {
c := RequestFilteringSettings{}
</s> add func (d *DNSFilter) GetConfig() FilteringSettings {
c := FilteringSettings{} </s> remove func matchBlockedServicesRules(host string, svcs []ServiceEntry) Result {
req := rules.NewRequestForHostname(host)
res := Result{}
</s> add // matchBlockedServicesRules checks the host against the blocked services rules
// in settings, if any. The err is always nil, it is only there to make this
// a valid hostChecker function.
func matchBlockedServicesRules(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
svcs := setts.ServicesRules
if len(svcs) == 0 {
return Result{}, nil
} </s> remove // apply safe search if needed
if setts.SafeSearchEnabled {
result, err = d.checkSafeSearch(host)
</s> add for _, hc := range d.hostCheckers {
res, err = hc.check(host, qtype, setts) </s> remove setts = RequestFilteringSettings{
</s> add setts = FilteringSettings{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter_test.go |
setts = FilteringSettings{ | <mask> }
<mask> }
<mask>
<mask> func newForTest(c *Config, filters []Filter) *DNSFilter {
<mask> setts = RequestFilteringSettings{
<mask> FilteringEnabled: true,
<mask> }
<mask> setts.FilteringEnabled = true
<mask> if c != nil {
<mask> c.SafeBrowsingCacheSize = 10000
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) </s> remove func applyClientSettings(setts *RequestFilteringSettings) {
</s> add func applyClientSettings(setts *FilteringSettings) { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings { </s> remove return true
</s> add return res, nil </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter_test.go |
func applyClientSettings(setts *FilteringSettings) { | <mask> }
<mask>
<mask> // Client Settings.
<mask>
<mask> func applyClientSettings(setts *RequestFilteringSettings) {
<mask> setts.FilteringEnabled = false
<mask> setts.ParentalEnabled = false
<mask> setts.SafeBrowsingEnabled = true
<mask>
<mask> rule, _ := rules.NewNetworkRule("||facebook.com^", 0)
</s> Pull request: all: imp code, decr cyclo
Updates #2646.
Squashed commit of the following:
commit c83c230f3d2c542d7b1a4bc0e1c503d5bbc16cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 25 19:47:11 2021 +0300
all: imp code, decr cyclo </s> remove return true
</s> add return res, nil </s> remove func (d *DNSFilter) GetConfig() RequestFilteringSettings {
c := RequestFilteringSettings{}
</s> add func (d *DNSFilter) GetConfig() FilteringSettings {
c := FilteringSettings{} </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.RequestFilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) { </s> remove if setts.FilteringEnabled {
result, err = d.matchHost(host, qtype, *setts)
if err != nil {
return result, err
}
if result.Reason.Matched() {
return result, nil
}
}
// are there any blocked services?
if len(setts.ServicesRules) != 0 {
result = matchBlockedServicesRules(host, setts.ServicesRules)
if result.Reason.Matched() {
return result, nil
}
}
// browsing security web service
if setts.SafeBrowsingEnabled {
result, err = d.checkSafeBrowsing(host)
if err != nil {
log.Info("SafeBrowsing: failed: %v", err)
return Result{}, nil
}
if result.Reason.Matched() {
return result, nil
}
}
</s> add host = strings.ToLower(host) </s> remove setts = RequestFilteringSettings{
</s> add setts = FilteringSettings{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.