docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep | <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 </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <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) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</s> add s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/8b8319fca047c541d1813218a80f27cd28098bd1 | internal/dnsforward/http_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <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" </s> add "bytes"
"encoding/json" | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net.go |
keep add keep keep keep keep keep | <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) { | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
keep keep keep keep replace keep keep keep keep keep | <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()) </s> add "bytes"
"encoding/json" | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
keep keep keep keep replace keep keep keep keep keep | <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> add "bytes"
"encoding/json" </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) { | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
keep keep keep keep replace keep | <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" </s> add "bytes"
"encoding/json" | https://github.com/AdguardTeam/AdGuardHome/commit/8bb95469d92bac60811f3f76c59511e52d0ffadc | internal/aghnet/net_test.go |
keep add keep keep keep keep | <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> add // Filtering callback function
FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"` </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) { </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
keep keep keep add keep keep keep keep | <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> add // Custom filtering settings
type RequestFilteringSettings struct {
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
}
</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 { </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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 { </s> add // Filtering callback function
FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"` </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
keep keep keep keep replace replace replace replace keep replace replace keep keep keep | <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>
<mask> // check safeSearch if no match
</s> + dnsfilter: use callback function for applying per-client settings </s> remove if d.SafeSearchEnabled {
</s> add if setts.SafeSearchEnabled { </s> remove if d.SafeBrowsingEnabled {
</s> add if setts.SafeBrowsingEnabled { </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { </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 result, err := d.CheckHost(host, dns.TypeA)
</s> add result, err := d.CheckHost(host, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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) { </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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) </s> remove result, err = d.CheckHost(domain, dns.TypeA)
</s> add result, err = d.CheckHost(domain, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter.go |
keep keep keep add keep keep keep keep | <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> add // Filtering callback function
FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"` </s> add // Custom filtering settings
type RequestFilteringSettings struct {
FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool
}
</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 { </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
} | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </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) { | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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) { </s> remove ret, err := d.CheckHost(test.hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(test.hostname, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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) </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </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
} | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </s> remove ret, err := d.CheckHost(hostname, dns.TypeA)
</s> add ret, err := d.CheckHost(hostname, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </s> remove result, err := d.CheckHost(domain, dns.TypeA)
</s> add result, err := d.CheckHost(domain, dns.TypeA, "") | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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, "") </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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 { </s> remove if d.ParentalEnabled {
</s> add if setts.ParentalEnabled { | https://github.com/AdguardTeam/AdGuardHome/commit/8bf76c331d8a5244cd760bff5d7ed249de79478e | dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <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 </s> add 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"
}
}
</s> add initConfigFilename(opts)
initWorkingDir(opts) | https://github.com/AdguardTeam/AdGuardHome/commit/8c411c463030e0188a27c85db5ad545ab442cce8 | home/home.go |
keep add keep keep keep keep | <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) </s> add initConfigFilename(opts)
initWorkingDir(opts) | https://github.com/AdguardTeam/AdGuardHome/commit/8c411c463030e0188a27c85db5ad545ab442cce8 | home/home.go |
keep keep add keep keep keep keep keep | <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> add 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"
}
}
</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) | https://github.com/AdguardTeam/AdGuardHome/commit/8c411c463030e0188a27c85db5ad545ab442cce8 | home/service.go |
keep keep keep keep replace keep keep keep keep keep | <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 </s> remove result.Reason = RewrittenAutoHosts
result.IPList = ips
</s> add res = Result{
Reason: RewrittenAutoHosts,
IPList: ips,
} | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/blocked.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <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> add FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool </s> add setts := &FilteringSettings{
SafeBrowsingEnabled: true,
ParentalEnabled: true,
}
</s> remove testFunc func(string) (Result, error)
</s> add testFunc func(host string, _ uint16, _ *FilteringSettings) (res Result, err error) </s> add type hostChecker struct {
check func(host string, qtype uint16, setts *FilteringSettings) (res Result, err error)
name string
}
</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 var setts RequestFilteringSettings
</s> add var setts FilteringSettings | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep add keep keep keep keep | <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> add hostCheckers []hostChecker </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 </s> add type hostChecker struct {
check func(host string, qtype uint16, setts *FilteringSettings) (res Result, err error)
name string
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep add keep keep keep keep keep keep | <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> add hostCheckers []hostChecker </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) </s> remove return res
</s> add return res, nil | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep add keep keep keep keep | <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> add FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool </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> add type hostChecker struct {
check func(host string, qtype uint16, setts *FilteringSettings) (res Result, err error)
name string
}
</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) ApplyBlockedServices(setts *RequestFilteringSettings, list []string, global bool) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *FilteringSettings, list []string, global bool) { | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace replace keep keep keep keep keep | <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 </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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep replace keep keep keep keep replace keep keep keep | <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)
<mask> }
<mask>
<mask> // CheckHost tries to match the host against filtering rules, then
</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 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 </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
} | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace replace replace replace keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep | <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>
<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>
</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 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 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 (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) 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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep | <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 {
<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 {
</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 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 </s> remove return d.matchHost(host, qtype, *setts)
</s> add return d.matchHost(host, qtype, setts) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep replace replace replace keep replace replace | <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
</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 if result.Reason.Matched() {
return result, nil
</s> add if res.Reason.Matched() {
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 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) 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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace replace keep keep keep keep keep | <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{ </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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep replace keep keep keep keep keep keep keep keep replace replace | <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>
<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
</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 result.Reason = RewrittenAutoHosts
</s> add res = Result{
Reason: RewrittenAutoHosts,
} </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) ApplyBlockedServices(setts *RequestFilteringSettings, list []string, global bool) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *FilteringSettings, list []string, global bool) { </s> remove result.ReverseHosts = make([]string, len(revHosts))
</s> add res.ReverseHosts = make([]string, len(revHosts)) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep replace | <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.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) </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 | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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,
} </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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep replace keep keep replace | <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.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,
} </s> add req := rules.NewRequestForHostname(host) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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 </s> remove result.ReverseHosts[i] = revHosts[i] + "."
</s> add res.ReverseHosts[i] = revHosts[i] + "." | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <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> add req := rules.NewRequestForHostname(host) </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) </s> remove res := Result{
</s> add res = Result{ | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep add keep keep keep keep | <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,
} </s> remove return true
</s> add return res, nil | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep replace | <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
</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 ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove res := Result{
</s> add res = Result{ </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 | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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 </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) { | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <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> add req := rules.NewRequestForHostname(host) </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{ </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) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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,
} </s> remove func (d *DNSFilter) GetConfig() RequestFilteringSettings {
c := RequestFilteringSettings{}
</s> add func (d *DNSFilter) GetConfig() FilteringSettings {
c := FilteringSettings{} | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <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{ </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings { | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> @@||disable-all^$dnsrewrite
<mask> `
<mask>
<mask> f := newForTest(nil, []Filter{{ID: 0, Data: []byte(text)}})
<mask> setts := &RequestFilteringSettings{
<mask> FilteringEnabled: true,
<mask> }
<mask>
<mask> ipv4p1 := net.IPv4(127, 0, 0, 1)
<mask> ipv4p2 := net.IPv4(127, 0, 0, 2)
</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 _, err := d.checkSafeBrowsing("smthng.com")
assert.NotNil(t, err)
</s> add setts := &FilteringSettings{
SafeBrowsingEnabled: true,
ParentalEnabled: true,
}
_, err := d.checkSafeBrowsing("smthng.com", dns.TypeA, setts)
assert.Error(t, err) </s> add setts := &FilteringSettings{
SafeBrowsingEnabled: true,
ParentalEnabled: true,
}
</s> remove res, err := tc.testFunc(hostname)
require.Nil(t, err)
</s> add res, err := tc.testFunc(hostname, dns.TypeA, setts)
require.NoError(t, err)
</s> remove setts = RequestFilteringSettings{
</s> add setts = FilteringSettings{ </s> remove res := Result{
</s> add res = Result{ </s> remove res := Result{
</s> add res = Result{ | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/dnsrewrite_test.go |
keep keep keep keep replace keep keep keep keep replace keep keep | <mask>
<mask> return Result{}, nil
<mask> }
<mask>
<mask> func (d *DNSFilter) checkSafeBrowsing(host string) (Result, error) {
<mask> if log.GetLevel() >= log.DEBUG {
<mask> timer := log.StartTimer()
<mask> defer timer.LogElapsed("SafeBrowsing lookup for %s", host)
<mask> }
<mask> ctx := &sbCtx{
<mask> host: host,
<mask> svc: "SafeBrowsing",
</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 ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove func (d *DNSFilter) checkParental(host string) (Result, error) {
</s> add // TODO(a.garipov): Unify with checkSafeBrowsing.
func (d *DNSFilter) checkParental(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.ParentalEnabled {
return Result{}, nil
}
</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 return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) </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) { | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing.go |
keep keep keep keep replace keep keep keep keep keep | <mask> svc: "SafeBrowsing",
<mask> cache: gctx.safebrowsingCache,
<mask> cacheTime: d.Config.CacheTime,
<mask> }
<mask> res := Result{
<mask> IsFiltered: true,
<mask> Reason: FilteredSafeBrowsing,
<mask> Rules: []*ResultRule{{
<mask> Text: "adguard-malware-shavar",
<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 res := Result{
</s> add res = Result{ </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove res := Result{
</s> add res = Result{ </s> remove return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove return check(ctx, res, d.parentalUpstream)
</s> add return check(sctx, res, d.parentalUpstream) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing.go |
keep keep keep replace keep keep replace keep keep keep keep | <mask> Text: "adguard-malware-shavar",
<mask> }},
<mask> }
<mask> return check(ctx, res, d.safeBrowsingUpstream)
<mask> }
<mask>
<mask> func (d *DNSFilter) checkParental(host string) (Result, error) {
<mask> if log.GetLevel() >= log.DEBUG {
<mask> timer := log.StartTimer()
<mask> defer timer.LogElapsed("Parental lookup for %s", 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 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 (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
}
</s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove return check(ctx, res, d.parentalUpstream)
</s> add return check(sctx, res, d.parentalUpstream) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if log.GetLevel() >= log.DEBUG {
<mask> timer := log.StartTimer()
<mask> defer timer.LogElapsed("Parental lookup for %s", host)
<mask> }
<mask> ctx := &sbCtx{
<mask> host: host,
<mask> svc: "Parental",
<mask> cache: gctx.parentalCache,
<mask> cacheTime: d.Config.CacheTime,
<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 ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove func (d *DNSFilter) checkParental(host string) (Result, error) {
</s> add // TODO(a.garipov): Unify with checkSafeBrowsing.
func (d *DNSFilter) checkParental(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.ParentalEnabled {
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
}
</s> remove res := Result{
</s> add res = Result{ </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 return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing.go |
keep keep keep keep replace keep keep keep keep keep | <mask> svc: "Parental",
<mask> cache: gctx.parentalCache,
<mask> cacheTime: d.Config.CacheTime,
<mask> }
<mask> res := Result{
<mask> IsFiltered: true,
<mask> Reason: FilteredParental,
<mask> Rules: []*ResultRule{{
<mask> Text: "parental CATEGORY_BLACKLISTED",
<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 res := Result{
</s> add res = Result{ </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove res := Result{
</s> add res = Result{ </s> remove return check(ctx, res, d.parentalUpstream)
</s> add return check(sctx, res, d.parentalUpstream) </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Rules: []*ResultRule{{
<mask> Text: "parental CATEGORY_BLACKLISTED",
<mask> }},
<mask> }
<mask> return check(ctx, res, d.parentalUpstream)
<mask> }
<mask>
<mask> func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) {
<mask> text := fmt.Sprintf(format, args...)
<mask> log.Info("DNSFilter: %s %s: %s", r.Method, r.URL, text)
</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 res := Result{
</s> add res = Result{ </s> remove return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) </s> remove res := Result{
</s> add res = Result{ </s> remove return res
</s> add return res, nil </s> remove func (d *DNSFilter) checkParental(host string) (Result, error) {
</s> add // TODO(a.garipov): Unify with checkSafeBrowsing.
func (d *DNSFilter) checkParental(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.ParentalEnabled {
return Result{}, nil
}
</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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing.go |
keep keep add keep keep keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestSafeBrowsingHash(t *testing.T) {
<mask> // test hostnameToHashes()
</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 res, err := tc.testFunc(hostname)
require.Nil(t, err)
</s> add res, err := tc.testFunc(hostname, dns.TypeA, setts)
require.NoError(t, err)
</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 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
}
</s> remove func (d *DNSFilter) checkParental(host string) (Result, error) {
</s> add // TODO(a.garipov): Unify with checkSafeBrowsing.
func (d *DNSFilter) checkParental(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.ParentalEnabled {
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) 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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing_test.go |
keep keep keep replace replace keep keep keep keep keep keep keep keep replace replace keep keep keep | <mask> d.SetSafeBrowsingUpstream(ups)
<mask> d.SetParentalUpstream(ups)
<mask>
<mask> _, err := d.checkSafeBrowsing("smthng.com")
<mask> assert.NotNil(t, err)
<mask>
<mask> _, err = d.checkParental("smthng.com")
<mask> assert.NotNil(t, err)
<mask> }
<mask>
<mask> _, err := d.checkSafeBrowsing("smthng.com")
<mask> assert.NotNil(t, err)
<mask>
<mask> _, err = d.checkParental("smthng.com")
<mask> assert.NotNil(t, err)
<mask> }
<mask>
<mask> func TestSBPC(t *testing.T) {
</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> add req := rules.NewRequestForHostname(host) </s> remove res, err := tc.testFunc(hostname)
require.Nil(t, err)
</s> add res, err := tc.testFunc(hostname, dns.TypeA, setts)
require.NoError(t, err)
</s> remove log.Info("SafeSearch: failed: %v", err)
return Result{}, nil
</s> add return Result{}, fmt.Errorf("%s: %w", hc.name, err) </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
} | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing_test.go |
keep add keep keep keep keep | <mask> const hostname = "example.org"
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> block bool
<mask> testFunc func(host string, _ uint16, _ *FilteringSettings) (res Result, err 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 testFunc func(string) (Result, error)
</s> add testFunc func(host string, _ uint16, _ *FilteringSettings) (res Result, err error) </s> add type hostChecker struct {
check func(host string, qtype uint16, setts *FilteringSettings) (res Result, err error)
name string
}
</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 (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
}
</s> remove func (d *DNSFilter) checkParental(host string) (Result, error) {
</s> add // TODO(a.garipov): Unify with checkSafeBrowsing.
func (d *DNSFilter) checkParental(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.ParentalEnabled {
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
}
| https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> testCases := []struct {
<mask> name string
<mask> block bool
<mask> testFunc func(string) (Result, error)
<mask> testCache cache.Cache
<mask> }{{
<mask> name: "sb_no_block",
<mask> block: false,
<mask> testFunc: d.checkSafeBrowsing,
</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> add setts := &FilteringSettings{
SafeBrowsingEnabled: true,
ParentalEnabled: true,
}
</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> add type hostChecker struct {
check func(host string, qtype uint16, setts *FilteringSettings) (res Result, err error)
name string
}
</s> add FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool </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 return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> // Firstly, check the request blocking.
<mask> hits := 0
<mask> res, err := tc.testFunc(hostname)
<mask> require.Nil(t, err)
<mask> if tc.block {
<mask> assert.True(t, res.IsFiltered)
<mask> require.Len(t, res.Rules, 1)
<mask> hits++
<mask> } else {
</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 res, err = tc.testFunc(hostname)
require.Nil(t, err)
</s> add res, err = tc.testFunc(hostname, dns.TypeA, setts)
require.NoError(t, err)
</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 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 // 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 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 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) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> // There was one request to an upstream.
<mask> assert.Equal(t, 1, ups.RequestsCount())
<mask>
<mask> // Now make the same request to check the cache was used.
<mask> res, err = tc.testFunc(hostname)
<mask> require.Nil(t, err)
<mask> if tc.block {
<mask> assert.True(t, res.IsFiltered)
<mask> require.Len(t, res.Rules, 1)
<mask> } else {
<mask> require.False(t, res.IsFiltered)
</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 res, err := tc.testFunc(hostname)
require.Nil(t, err)
</s> add res, err := tc.testFunc(hostname, dns.TypeA, setts)
require.NoError(t, err)
</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 // 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 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 // 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 | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safebrowsing_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> val, ok := safeSearchDomains[host]
<mask> return val, ok
<mask> }
<mask>
<mask> func (d *DNSFilter) checkSafeSearch(host string) (Result, error) {
<mask> if log.GetLevel() >= log.DEBUG {
<mask> timer := log.StartTimer()
<mask> defer timer.LogElapsed("SafeSearch: lookup for %s", host)
<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 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
}
</s> remove func (d *DNSFilter) checkParental(host string) (Result, error) {
</s> add // TODO(a.garipov): Unify with checkSafeBrowsing.
func (d *DNSFilter) checkParental(
host string,
_ uint16,
setts *FilteringSettings,
) (res Result, err error) {
if !setts.ParentalEnabled {
return Result{}, nil
}
</s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove ctx := &sbCtx{
</s> add sctx := &sbCtx{ </s> remove return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) </s> remove func (d *DNSFilter) ApplyBlockedServices(setts *RequestFilteringSettings, list []string, global bool) {
</s> add func (d *DNSFilter) ApplyBlockedServices(setts *FilteringSettings, list []string, global bool) { | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safesearch.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if !ok {
<mask> return Result{}, nil
<mask> }
<mask>
<mask> res := Result{
<mask> IsFiltered: true,
<mask> Reason: FilteredSafeSearch,
<mask> Rules: []*ResultRule{{}},
<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 res := Result{
</s> add res = Result{ </s> remove res := Result{
</s> add res = Result{ </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 return check(ctx, res, d.safeBrowsingUpstream)
</s> add return check(sctx, res, d.safeBrowsingUpstream) </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 | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsfilter/safesearch.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Callbacks for other modules
<mask> // --
<mask>
<mask> // FilterHandler is an optional additional filtering callback.
<mask> FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
<mask>
<mask> // GetCustomUpstreamByClient - a callback function that returns upstreams configuration
<mask> // based on the client IP address. Returns nil if there are no custom upstreams for the client
<mask> //
<mask> // TODO(e.burkov): Replace argument type with net.IP.
</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 applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.RequestFilteringSettings) {
</s> add func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.FilteringSettings) { </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 setts *dnsfilter.RequestFilteringSettings
</s> add setts *dnsfilter.FilteringSettings </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings { </s> add hostCheckers []hostChecker </s> remove return false
</s> add return Result{}, nil | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsforward/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // *Server instead.
<mask> srv *Server
<mask> proxyCtx *proxy.DNSContext
<mask> // setts are the filtering settings for the client.
<mask> setts *dnsfilter.RequestFilteringSettings
<mask> startTime time.Time
<mask> result *dnsfilter.Result
<mask> // origResp is the response received from upstream. It is set when the
<mask> // response is modified by filters.
<mask> origResp *dns.Msg
</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 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 // 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 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 (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.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> add FilteringEnabled bool
SafeSearchEnabled bool
SafeBrowsingEnabled bool
ParentalEnabled bool | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsforward/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.RequestFilteringSettings) {
<mask> settings.FilteringEnabled = false
<mask> },
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf)
</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 applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.RequestFilteringSettings) {
</s> add func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.FilteringSettings) { </s> remove func applyClientSettings(setts *RequestFilteringSettings) {
</s> add func applyClientSettings(setts *FilteringSettings) { </s> add setts := &FilteringSettings{
SafeBrowsingEnabled: true,
ParentalEnabled: true,
}
</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> add req := rules.NewRequestForHostname(host) </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
} | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // getClientRequestFilteringSettings looks up client filtering settings using
<mask> // the client's IP address and ID, if any, from ctx.
<mask> func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings {
<mask> setts := s.dnsFilter.GetConfig()
<mask> setts.FilteringEnabled = true
<mask> if s.conf.FilterHandler != nil {
<mask> s.conf.FilterHandler(IPFromAddr(ctx.proxyCtx.Addr), ctx.clientID, &setts)
<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 applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.RequestFilteringSettings) {
</s> add func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.FilteringSettings) { </s> remove setts = RequestFilteringSettings{
</s> add setts = FilteringSettings{ </s> remove setts *dnsfilter.RequestFilteringSettings
</s> add setts *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 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 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 | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // applyAdditionalFiltering adds additional client information and settings if
<mask> // the client has them.
<mask> func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.RequestFilteringSettings) {
<mask> Context.dnsFilter.ApplyBlockedServices(setts, nil, true)
<mask>
<mask> if clientAddr == nil {
<mask> return
<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 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 (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.RequestFilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings { </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.RequestFilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.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 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) | https://github.com/AdguardTeam/AdGuardHome/commit/8c735d0dd5c2158e2230fa12a140e27960f89e0b | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> };
<mask>
<mask> handleCheck = (values) => {
<mask> this.props.checkHost(values);
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> filtering: {
</s> - client: Enabling or disabling a filter list triggers a "loading" screen </s> remove const loading = processingFilters
</s> add const loading = processingConfigFilter
|| processingFilters </s> remove const loading = processingFilters
</s> add const loading = processingConfigFilter
|| processingFilters | https://github.com/AdguardTeam/AdGuardHome/commit/8c74f983d1c08c03a9f131abdea8e712a5cf7505 | client/src/components/Filters/CustomRules.js |
keep keep keep keep replace keep keep keep keep keep | <mask> modalFilterUrl,
<mask> },
<mask> } = this.props;
<mask> const currentFilterData = getCurrentFilter(modalFilterUrl, whitelistFilters);
<mask> const loading = processingFilters
<mask> || processingAddFilter
<mask> || processingRemoveFilter
<mask> || processingRefreshFilters;
<mask> const whitelist = true;
<mask>
</s> - client: Enabling or disabling a filter list triggers a "loading" screen </s> remove }
</s> add }; </s> remove const loading = processingFilters
</s> add const loading = processingConfigFilter
|| processingFilters | https://github.com/AdguardTeam/AdGuardHome/commit/8c74f983d1c08c03a9f131abdea8e712a5cf7505 | client/src/components/Filters/DnsAllowlist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> modalFilterUrl,
<mask> },
<mask> } = this.props;
<mask> const currentFilterData = getCurrentFilter(modalFilterUrl, filters);
<mask> const loading = processingFilters
<mask> || processingAddFilter
<mask> || processingRemoveFilter
<mask> || processingRefreshFilters;
<mask>
<mask> return (
</s> - client: Enabling or disabling a filter list triggers a "loading" screen </s> remove }
</s> add }; </s> remove const loading = processingFilters
</s> add const loading = processingConfigFilter
|| processingFilters | https://github.com/AdguardTeam/AdGuardHome/commit/8c74f983d1c08c03a9f131abdea8e712a5cf7505 | client/src/components/Filters/DnsBlocklist.js |
keep replace keep keep keep replace replace | <mask> import { createAction } from 'redux-actions';
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeTextarea } from '../helpers/helpers';
<mask>
<mask> const apiClient = new Api();
<mask>
</s> - client: fix api client export | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/access.js |
keep keep replace keep keep keep replace replace keep keep keep keep | <mask> import { createAction } from 'redux-actions';
<mask> import { t } from 'i18next';
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast, getClients } from './index';
<mask> import { CLIENT_ID } from '../helpers/constants';
<mask>
<mask> const apiClient = new Api();
<mask>
<mask> export const toggleClientModal = createAction('TOGGLE_CLIENT_MODAL');
<mask>
<mask> export const addClientRequest = createAction('ADD_CLIENT_REQUEST');
<mask> export const addClientFailure = createAction('ADD_CLIENT_FAILURE');
</s> - client: fix api client export </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add </s> remove import Api from '../api/Api';
const apiClient = new Api();
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/clients.js |
keep replace keep keep keep replace replace keep keep keep | <mask> import { createAction } from 'redux-actions';
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { redirectToCurrentProtocol } from '../helpers/helpers';
<mask>
<mask> const apiClient = new Api();
<mask>
<mask> export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST');
<mask> export const getTlsStatusFailure = createAction('GET_TLS_STATUS_FAILURE');
<mask> export const getTlsStatusSuccess = createAction('GET_TLS_STATUS_SUCCESS');
</s> - client: fix api client export </s> remove const apiClient = new Api();
</s> add </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/encryption.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> import versionCompare from '../helpers/versionCompare';
<mask> import { normalizeFilteringStatus, normalizeTextarea, sortClients } from '../helpers/helpers';
<mask> import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
<mask> import { getTlsStatus } from './encryption';
<mask> import Api from '../api/Api';
<mask>
<mask> const apiClient = new Api();
<mask>
<mask> export const addErrorToast = createAction('ADD_ERROR_TOAST');
<mask> export const addSuccessToast = createAction('ADD_SUCCESS_TOAST');
<mask> export const addNoticeToast = createAction('ADD_NOTICE_TOAST');
<mask> export const removeToast = createAction('REMOVE_TOAST');
</s> - client: fix api client export </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/index.js |
keep replace keep keep replace replace | <mask> import { createAction } from 'redux-actions';
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask>
<mask> const apiClient = new Api();
<mask>
</s> - client: fix api client export | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/install.js |
keep replace keep keep keep replace replace keep | <mask>
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeLogs } from '../helpers/helpers';
<mask>
<mask> const apiClient = new Api();
<mask>
<mask> export const getLogsRequest = createAction('GET_LOGS_REQUEST');
</s> - client: fix api client export </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/queryLogs.js |
keep replace keep keep replace replace | <mask> import { t } from 'i18next';
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask>
<mask> const apiClient = new Api();
<mask>
</s> - client: fix api client export </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/rewrites.js |
keep replace keep keep replace replace keep keep keep | <mask> import { createAction } from 'redux-actions';
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask>
<mask> const apiClient = new Api();
<mask>
<mask> export const getBlockedServicesRequest = createAction('GET_BLOCKED_SERVICES_REQUEST');
<mask> export const getBlockedServicesFailure = createAction('GET_BLOCKED_SERVICES_FAILURE');
<mask> export const getBlockedServicesSuccess = createAction('GET_BLOCKED_SERVICES_SUCCESS');
</s> - client: fix api client export </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/services.js |
keep replace keep keep keep replace replace keep keep keep | <mask>
<mask> import Api from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask> import { normalizeTopStats, secondsToMilliseconds } from '../helpers/helpers';
<mask>
<mask> const apiClient = new Api();
<mask>
<mask> export const getStatsConfigRequest = createAction('GET_STATS_CONFIG_REQUEST');
<mask> export const getStatsConfigFailure = createAction('GET_STATS_CONFIG_FAILURE');
<mask> export const getStatsConfigSuccess = createAction('GET_STATS_CONFIG_SUCCESS');
</s> - client: fix api client export </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/actions/stats.js |
keep keep replace keep keep keep keep keep | <mask> import axios from 'axios';
<mask>
<mask> export default class Api {
<mask> baseUrl = 'control';
<mask>
<mask> async makeRequest(path, method = 'POST', config) {
<mask> try {
<mask> const response = await axios({
</s> - client: fix api client export </s> add const apiClient = new Api();
export default apiClient; </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/api/Api.js |
keep keep keep add | <mask> const { path, method } = this.QUERY_LOG_CLEAR;
<mask> return this.makeRequest(path, method);
<mask> }
<mask> }
</s> - client: fix api client export </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import { toggleLogStatus, clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs';
</s> add import { clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs'; </s> remove import Api from '../api/Api';
const apiClient = new Api();
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add </s> remove const apiClient = new Api();
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/api/Api.js |
keep keep keep keep replace keep keep keep keep keep | <mask> {enabled && (processingGetLogs || processingClients || processingGetConfig) && (
<mask> <Loading />
<mask> )}
<mask> {enabled && isDataReady && this.renderLogs(queryLogs.logs)}
<mask> {!enabled && isDataReady && (
<mask> <div className="lead text-center py-6">
<mask> <Trans components={[<Link to="/settings#logs-config" key="0">link</Link>]}>
<mask> query_log_disabled
<mask> </Trans>
<mask> </div>
</s> - client: fix api client export </s> remove toggleLogStatus,
</s> add </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/components/Logs/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import { connect } from 'react-redux';
<mask> import { initSettings, toggleSetting } from '../actions';
<mask> import { getBlockedServices, setBlockedServices } from '../actions/services';
<mask> import { getStatsConfig, setStatsConfig, resetStats } from '../actions/stats';
<mask> import { toggleLogStatus, clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs';
<mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> settings, services, stats, queryLogs,
</s> - client: fix api client export </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/containers/Settings.js |
keep keep keep keep replace keep keep keep keep keep | <mask> setBlockedServices,
<mask> getStatsConfig,
<mask> setStatsConfig,
<mask> resetStats,
<mask> toggleLogStatus,
<mask> clearLogs,
<mask> getLogsConfig,
<mask> setLogsConfig,
<mask> };
<mask>
</s> - client: fix api client export </s> remove import { toggleLogStatus, clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs';
</s> add import { clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs'; </s> remove const apiClient = new Api();
</s> add </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add </s> remove import Api from '../api/Api';
</s> add import apiClient from '../api/Api'; </s> remove const apiClient = new Api();
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/8c89973365e660d47fa5fce88113414011961acb | client/src/containers/Settings.js |
keep keep keep replace keep keep keep keep keep | <mask> package dnsfilter
<mask>
<mask> import (
<mask> "bytes"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
</s> * dnsfilter: change DNS answer for host rules
When matched by a host rule, return only the IP address specified in rule.
Respond with an empty IP list to another request type.
:: host -- return nothing to A, return :: to AAAA request
0.0.0.0 host -- return 0.0.0.0 to A, return nothing to AAAA request </s> remove } else if req.Question[0].Qtype == dns.TypeAAAA && ip.To4() == nil {
</s> add } else if req.Question[0].Qtype == dns.TypeAAAA &&
len(ip) == net.IPv6len && ip.To4() == nil { </s> remove d.checkMatchIP(t, "block.com", "::", dns.TypeAAAA)
</s> add // ...but empty IPv6
ret, err := d.CheckHost("block.com", dns.TypeAAAA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0)
// IPv6
d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
// ...but empty IPv4
ret, err = d.CheckHost("ipv6.com", dns.TypeA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0) </s> remove // IPv6 address
d.checkMatchIP(t, "google.com", addr6, dns.TypeAAAA)
// block both IPv4 and IPv6
</s> add // IPv4 </s> remove text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s google.com\n0.0.0.0 block.com\n",
</s> add text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s ipv6.com\n0.0.0.0 block.com\n", </s> remove continue
</s> add return res, nil </s> remove return res, nil
} else if qtype == dns.TypeAAAA {
ip4 := hostRule.IP.To4()
if ip4 == nil {
res.IP = hostRule.IP
return res, nil
}
if bytes.Equal(ip4, []byte{0, 0, 0, 0}) {
// send IP="::" response for a rule "0.0.0.0 blockdomain"
res.IP = net.IPv6zero
return res, nil
}
</s> add } else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP | https://github.com/AdguardTeam/AdGuardHome/commit/8d2a9ce923eae4673a74f4c4a7e1d9ef840f04d2 | dnsfilter/dnsfilter.go |
keep keep keep add keep keep keep keep keep | <mask> return res, nil
<mask>
<mask> } else if hostRule, ok := rule.(*rules.HostRule); ok {
<mask>
<mask> if qtype == dns.TypeA && hostRule.IP.To4() != nil {
<mask> // either IPv4 or IPv4-mapped IPv6 address
<mask> res.IP = hostRule.IP.To4()
<mask>
<mask> } else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
</s> * dnsfilter: change DNS answer for host rules
When matched by a host rule, return only the IP address specified in rule.
Respond with an empty IP list to another request type.
:: host -- return nothing to A, return :: to AAAA request
0.0.0.0 host -- return 0.0.0.0 to A, return nothing to AAAA request </s> remove return res, nil
} else if qtype == dns.TypeAAAA {
ip4 := hostRule.IP.To4()
if ip4 == nil {
res.IP = hostRule.IP
return res, nil
}
if bytes.Equal(ip4, []byte{0, 0, 0, 0}) {
// send IP="::" response for a rule "0.0.0.0 blockdomain"
res.IP = net.IPv6zero
return res, nil
}
</s> add } else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP </s> remove } else if req.Question[0].Qtype == dns.TypeAAAA && ip.To4() == nil {
</s> add } else if req.Question[0].Qtype == dns.TypeAAAA &&
len(ip) == net.IPv6len && ip.To4() == nil { </s> remove continue
</s> add return res, nil </s> remove d.checkMatchIP(t, "block.com", "::", dns.TypeAAAA)
</s> add // ...but empty IPv6
ret, err := d.CheckHost("block.com", dns.TypeAAAA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0)
// IPv6
d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
// ...but empty IPv4
ret, err = d.CheckHost("ipv6.com", dns.TypeA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0) </s> remove text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s google.com\n0.0.0.0 block.com\n",
</s> add text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s ipv6.com\n0.0.0.0 block.com\n", </s> remove // IPv6 address
d.checkMatchIP(t, "google.com", addr6, dns.TypeAAAA)
// block both IPv4 and IPv6
</s> add // IPv4 | https://github.com/AdguardTeam/AdGuardHome/commit/8d2a9ce923eae4673a74f4c4a7e1d9ef840f04d2 | dnsfilter/dnsfilter.go |
keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep replace keep keep keep keep | <mask> // either IPv4 or IPv4-mapped IPv6 address
<mask> res.IP = hostRule.IP.To4()
<mask> return res, nil
<mask>
<mask> } else if qtype == dns.TypeAAAA {
<mask> ip4 := hostRule.IP.To4()
<mask> if ip4 == nil {
<mask> res.IP = hostRule.IP
<mask> return res, nil
<mask> }
<mask> if bytes.Equal(ip4, []byte{0, 0, 0, 0}) {
<mask> // send IP="::" response for a rule "0.0.0.0 blockdomain"
<mask> res.IP = net.IPv6zero
<mask> return res, nil
<mask> }
<mask> }
<mask> continue
<mask>
<mask> } else {
<mask> log.Tracef("Rule type is unsupported: '%s' list_id: %d",
<mask> rule.Text(), rule.GetFilterListID())
</s> * dnsfilter: change DNS answer for host rules
When matched by a host rule, return only the IP address specified in rule.
Respond with an empty IP list to another request type.
:: host -- return nothing to A, return :: to AAAA request
0.0.0.0 host -- return 0.0.0.0 to A, return nothing to AAAA request </s> add res.IP = net.IP{} </s> remove } else if req.Question[0].Qtype == dns.TypeAAAA && ip.To4() == nil {
</s> add } else if req.Question[0].Qtype == dns.TypeAAAA &&
len(ip) == net.IPv6len && ip.To4() == nil { </s> remove d.checkMatchIP(t, "block.com", "::", dns.TypeAAAA)
</s> add // ...but empty IPv6
ret, err := d.CheckHost("block.com", dns.TypeAAAA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0)
// IPv6
d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
// ...but empty IPv4
ret, err = d.CheckHost("ipv6.com", dns.TypeA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0) </s> remove // IPv6 address
d.checkMatchIP(t, "google.com", addr6, dns.TypeAAAA)
// block both IPv4 and IPv6
</s> add // IPv4 </s> remove text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s google.com\n0.0.0.0 block.com\n",
</s> add text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s ipv6.com\n0.0.0.0 block.com\n", | https://github.com/AdguardTeam/AdGuardHome/commit/8d2a9ce923eae4673a74f4c4a7e1d9ef840f04d2 | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func TestEtcHostsMatching(t *testing.T) {
<mask> addr := "216.239.38.120"
<mask> addr6 := "::1"
<mask> text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s google.com\n0.0.0.0 block.com\n",
<mask> addr, addr6)
<mask> filters := make(map[int]string)
<mask> filters[0] = text
<mask> d := NewForTest(nil, filters)
<mask> defer d.Close()
</s> * dnsfilter: change DNS answer for host rules
When matched by a host rule, return only the IP address specified in rule.
Respond with an empty IP list to another request type.
:: host -- return nothing to A, return :: to AAAA request
0.0.0.0 host -- return 0.0.0.0 to A, return nothing to AAAA request </s> remove d.checkMatchIP(t, "block.com", "::", dns.TypeAAAA)
</s> add // ...but empty IPv6
ret, err := d.CheckHost("block.com", dns.TypeAAAA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0)
// IPv6
d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
// ...but empty IPv4
ret, err = d.CheckHost("ipv6.com", dns.TypeA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0) </s> add res.IP = net.IP{} </s> remove } else if req.Question[0].Qtype == dns.TypeAAAA && ip.To4() == nil {
</s> add } else if req.Question[0].Qtype == dns.TypeAAAA &&
len(ip) == net.IPv6len && ip.To4() == nil { </s> remove return res, nil
} else if qtype == dns.TypeAAAA {
ip4 := hostRule.IP.To4()
if ip4 == nil {
res.IP = hostRule.IP
return res, nil
}
if bytes.Equal(ip4, []byte{0, 0, 0, 0}) {
// send IP="::" response for a rule "0.0.0.0 blockdomain"
res.IP = net.IPv6zero
return res, nil
}
</s> add } else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP </s> remove // IPv6 address
d.checkMatchIP(t, "google.com", addr6, dns.TypeAAAA)
// block both IPv4 and IPv6
</s> add // IPv4 </s> remove continue
</s> add return res, nil | https://github.com/AdguardTeam/AdGuardHome/commit/8d2a9ce923eae4673a74f4c4a7e1d9ef840f04d2 | dnsfilter/dnsfilter_test.go |
keep keep keep replace replace replace replace keep replace | <mask> d.checkMatchEmpty(t, "subdomain.google.com")
<mask> d.checkMatchEmpty(t, "example.org")
<mask>
<mask> // IPv6 address
<mask> d.checkMatchIP(t, "google.com", addr6, dns.TypeAAAA)
<mask>
<mask> // block both IPv4 and IPv6
<mask> d.checkMatchIP(t, "block.com", "0.0.0.0", dns.TypeA)
<mask> d.checkMatchIP(t, "block.com", "::", dns.TypeAAAA)
</s> * dnsfilter: change DNS answer for host rules
When matched by a host rule, return only the IP address specified in rule.
Respond with an empty IP list to another request type.
:: host -- return nothing to A, return :: to AAAA request
0.0.0.0 host -- return 0.0.0.0 to A, return nothing to AAAA request </s> remove } else if req.Question[0].Qtype == dns.TypeAAAA && ip.To4() == nil {
</s> add } else if req.Question[0].Qtype == dns.TypeAAAA &&
len(ip) == net.IPv6len && ip.To4() == nil { </s> remove return res, nil
} else if qtype == dns.TypeAAAA {
ip4 := hostRule.IP.To4()
if ip4 == nil {
res.IP = hostRule.IP
return res, nil
}
if bytes.Equal(ip4, []byte{0, 0, 0, 0}) {
// send IP="::" response for a rule "0.0.0.0 blockdomain"
res.IP = net.IPv6zero
return res, nil
}
</s> add } else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP </s> add res.IP = net.IP{} </s> remove text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s google.com\n0.0.0.0 block.com\n",
</s> add text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s ipv6.com\n0.0.0.0 block.com\n", </s> remove continue
</s> add return res, nil | https://github.com/AdguardTeam/AdGuardHome/commit/8d2a9ce923eae4673a74f4c4a7e1d9ef840f04d2 | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // generate DNS response message with an IP address
<mask> func (s *Server) genResponseWithIP(req *dns.Msg, ip net.IP) *dns.Msg {
<mask> if req.Question[0].Qtype == dns.TypeA && ip.To4() != nil {
<mask> return s.genARecord(req, ip.To4())
<mask> } else if req.Question[0].Qtype == dns.TypeAAAA && ip.To4() == nil {
<mask> return s.genAAAARecord(req, ip)
<mask> }
<mask>
<mask> // empty response
<mask> resp := s.makeResponse(req)
</s> * dnsfilter: change DNS answer for host rules
When matched by a host rule, return only the IP address specified in rule.
Respond with an empty IP list to another request type.
:: host -- return nothing to A, return :: to AAAA request
0.0.0.0 host -- return 0.0.0.0 to A, return nothing to AAAA request </s> remove return res, nil
} else if qtype == dns.TypeAAAA {
ip4 := hostRule.IP.To4()
if ip4 == nil {
res.IP = hostRule.IP
return res, nil
}
if bytes.Equal(ip4, []byte{0, 0, 0, 0}) {
// send IP="::" response for a rule "0.0.0.0 blockdomain"
res.IP = net.IPv6zero
return res, nil
}
</s> add } else if qtype == dns.TypeAAAA && hostRule.IP.To4() == nil {
res.IP = hostRule.IP </s> add res.IP = net.IP{} </s> remove d.checkMatchIP(t, "block.com", "::", dns.TypeAAAA)
</s> add // ...but empty IPv6
ret, err := d.CheckHost("block.com", dns.TypeAAAA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0)
// IPv6
d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
// ...but empty IPv4
ret, err = d.CheckHost("ipv6.com", dns.TypeA, &setts)
assert.True(t, err == nil && ret.IsFiltered && ret.IP != nil && len(ret.IP) == 0) </s> remove continue
</s> add return res, nil </s> remove text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s google.com\n0.0.0.0 block.com\n",
</s> add text := fmt.Sprintf(" %s google.com www.google.com # enforce google's safesearch \n%s ipv6.com\n0.0.0.0 block.com\n", </s> remove // IPv6 address
d.checkMatchIP(t, "google.com", addr6, dns.TypeAAAA)
// block both IPv4 and IPv6
</s> add // IPv4 | https://github.com/AdguardTeam/AdGuardHome/commit/8d2a9ce923eae4673a74f4c4a7e1d9ef840f04d2 | dnsforward/dnsforward.go |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.8'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request: 5238-default-filter-urls
Updates #5238.
Squashed commit of the following:
commit 6a1b58bfa0f0bb8cc924e294485e8f650ce7f7aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 8 14:18:54 2022 +0300
all: upd go in github actions
commit 98366880dc32290258dfae152be069cb84ed86c6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 8 14:08:36 2022 +0300
home: sync default filter urls </s> remove 'GO_VERSION': '1.18.8'
</s> add 'GO_VERSION': '1.18.9' </s> remove URL: "https://adaway.org/hosts.txt",
</s> add URL: "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt", </s> remove URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
</s> add URL: "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt", </s> add // NOTE: Keep these parameters in sync with the one put into
// client/src/helpers/filters/filters.js by scripts/vetted-filters.
//
// TODO(a.garipov): Think of a way to make scripts/vetted-filters update
// these as well if necessary. | https://github.com/AdguardTeam/AdGuardHome/commit/8d453e75a457bd0f6048e7e01ce7ca6f73779a0b | .github/workflows/build.yml |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18.8'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request: 5238-default-filter-urls
Updates #5238.
Squashed commit of the following:
commit 6a1b58bfa0f0bb8cc924e294485e8f650ce7f7aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 8 14:18:54 2022 +0300
all: upd go in github actions
commit 98366880dc32290258dfae152be069cb84ed86c6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 8 14:08:36 2022 +0300
home: sync default filter urls </s> remove 'GO_VERSION': '1.18.8'
</s> add 'GO_VERSION': '1.18.9' </s> remove URL: "https://adaway.org/hosts.txt",
</s> add URL: "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt", </s> remove URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
</s> add URL: "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt", </s> add // NOTE: Keep these parameters in sync with the one put into
// client/src/helpers/filters/filters.js by scripts/vetted-filters.
//
// TODO(a.garipov): Think of a way to make scripts/vetted-filters update
// these as well if necessary. | https://github.com/AdguardTeam/AdGuardHome/commit/8d453e75a457bd0f6048e7e01ce7ca6f73779a0b | .github/workflows/lint.yml |
keep keep add keep keep keep keep keep | <mask> PortDNSOverTLS: defaultPortTLS, // needs to be passed through to dnsproxy
<mask> PortDNSOverQUIC: defaultPortQUIC,
<mask> },
<mask> Filters: []filtering.FilterYAML{{
<mask> Filter: filtering.Filter{ID: 1},
<mask> Enabled: true,
<mask> URL: "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt",
<mask> Name: "AdGuard DNS filter",
</s> Pull request: 5238-default-filter-urls
Updates #5238.
Squashed commit of the following:
commit 6a1b58bfa0f0bb8cc924e294485e8f650ce7f7aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 8 14:18:54 2022 +0300
all: upd go in github actions
commit 98366880dc32290258dfae152be069cb84ed86c6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 8 14:08:36 2022 +0300
home: sync default filter urls </s> remove URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
</s> add URL: "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt", </s> remove URL: "https://adaway.org/hosts.txt",
</s> add URL: "https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt", </s> remove 'GO_VERSION': '1.18.8'
</s> add 'GO_VERSION': '1.18.9' </s> remove 'GO_VERSION': '1.18.8'
</s> add 'GO_VERSION': '1.18.9' | https://github.com/AdguardTeam/AdGuardHome/commit/8d453e75a457bd0f6048e7e01ce7ca6f73779a0b | internal/home/config.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.