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> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> //
<mask> // The zero Server is empty and ready for use.
<mask> type Server struct {
<mask> dnsProxy *proxy.Proxy // DNS proxy instance
<mask> dnsFilter *dnsfilter.DNSFilter // DNS filter instance
<mask> dhcpServer dhcpd.ServerInterface // DHCP server instance (optional)
<mask> queryLog querylog.QueryLog // Query log instance
<mask> stats stats.Stats
<mask> access *accessCtx
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filtering module
</s> add dnsFilter *filtering.DNSFilter // DNS filtering module </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove DNSFilter *dnsfilter.DNSFilter
</s> add DNSFilter *filtering.DNSFilter </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> const defaultLocalDomainSuffix = ".lan."
<mask>
<mask> // DNSCreateParams are parameters to create a new server.
<mask> type DNSCreateParams struct {
<mask> DNSFilter *dnsfilter.DNSFilter
<mask> Stats stats.Stats
<mask> QueryLog querylog.QueryLog
<mask> DHCPServer dhcpd.ServerInterface
<mask> SubnetDetector *aghnet.SubnetDetector
<mask> LocalDomain string
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filter instance
</s> add dnsFilter *filtering.DNSFilter // DNS filter instance </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func createTestServer(
<mask> t *testing.T,
<mask> filterConf *dnsfilter.Config,
<mask> forwardConf ServerConfig,
<mask> localUps upstream.Upstream,
<mask> ) (s *Server) {
<mask> t.Helper()
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
</s> add func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) { </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep replace keep keep keep replace keep keep keep | <mask> ||127.0.0.255`
<mask> filters := []dnsfilter.Filter{{
<mask> ID: 0, Data: []byte(rules),
<mask> }}
<mask>
<mask> f := dnsfilter.New(filterConf, filters)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> var keyPem []byte
<mask> _, certPem, keyPem = createServerTLSConfig(t)
<mask>
<mask> s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask>
<mask> tlsConf.CertificateChainData, tlsConf.PrivateKeyData = certPem, keyPem
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func TestServer(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func TestServerWithProtectionDisabled(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func TestServerRace(t *testing.T) {
<mask> t.Skip("TODO(e.burkov): inspect the golibs/cache package for locks")
<mask>
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> SafeBrowsingCacheSize: 1000,
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> ParentalCacheSize: 1000,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ </s> remove filterConf *dnsfilter.Config,
</s> add filterConf *filtering.Config, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestSafeSearch(t *testing.T) {
<mask> resolver := &aghtest.TestResolver{}
<mask> filterConf := &dnsfilter.Config{
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> CacheTime: 30,
<mask> CustomResolver: resolver,
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ </s> remove filterConf *dnsfilter.Config,
</s> add filterConf *filtering.Config, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func TestInvalidRequest(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> startDeferStop(t, s)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> startDeferStop(t, s)
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Default blocking.
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> s.conf.GetCustomUpstreamByClient = func(_ string) *proxy.UpstreamConfig {
<mask> return &proxy.UpstreamConfig{
<mask> Upstreams: []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> IPv4: map[string][]net.IP{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "example.org.": {{127, 0, 0, 255}},
<mask> }
<mask>
<mask> func TestBlockCNAMEProtectionEnabled(t *testing.T) {
<mask> s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
<mask> }, nil)
<mask> testUpstm := &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
<mask> IPv4: testIPv4,
<mask> },
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep replace 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.FilteringSettings) {
<mask> settings.FilteringEnabled = false
<mask> },
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{
<mask> &aghtest.TestUpstream{
<mask> CName: testCNAMEs,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> ProtectionEnabled: true,
<mask> BlockingMode: "null_ip",
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> startDeferStop(t, s)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Nil filter blocking.
<mask> req := dns.Msg{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> func TestBlockedCustomIP(t *testing.T) {
<mask> rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n@@||whitelist.example.org^\n||127.0.0.255\n"
<mask> filters := []dnsfilter.Filter{{
<mask> ID: 0,
<mask> Data: []byte(rules),
<mask> }}
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove c := dnsfilter.Config{
</s> add c := filtering.Config{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> conf := &ServerConfig{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> FilteringConfig: FilteringConfig{
<mask> ProtectionEnabled: true,
<mask> },
<mask> }
<mask> s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
<mask> startDeferStop(t, s)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // Hosts blocking.
<mask> req := createTestMessage("host.example.org.")
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Block: true,
<mask> }
<mask> ans4, _ := (&aghtest.TestResolver{}).HostToIPs(hostname)
<mask>
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> }
<mask> forwardConf := ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{}},
<mask> TCPListenAddrs: []*net.TCPAddr{{}},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> assert.Equal(t, ans4, a.A, "dns server %s returned wrong answer: %v", addr, a.A)
<mask> }
<mask>
<mask> func TestRewrite(t *testing.T) {
<mask> c := &dnsfilter.Config{
<mask> Rewrites: []dnsfilter.RewriteEntry{{
<mask> Domain: "test.com",
<mask> Answer: "1.2.3.4",
<mask> Type: dns.TypeA,
<mask> }, {
<mask> Domain: "alias.test.com",
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove c := dnsfilter.Config{
</s> add c := filtering.Config{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Answer: "example.org",
<mask> Type: dns.TypeCNAME,
<mask> }},
<mask> }
<mask> f := dnsfilter.New(c, nil)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
<mask> DHCPServer: &testDHCP{},
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Equal(t, "myhost.", ptr.Ptr)
<mask> }
<mask>
<mask> func TestPTRResponseFromHosts(t *testing.T) {
<mask> c := dnsfilter.Config{
<mask> EtcHosts: &aghnet.EtcHostsContainer{},
<mask> }
<mask>
<mask> // Prepare test hosts file.
<mask> hf, err := os.CreateTemp("", "")
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove c := dnsfilter.Config{}
</s> add c := filtering.Config{} </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: dnsfilter.New(&c, nil),
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> s.conf.UDPListenAddrs = []*net.UDPAddr{{}}
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove s = createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s = createTestServer(t, &filtering.Config{}, ServerConfig{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "fmt"
<mask> "net"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // filterDNSRewrite handles dnsrewrite filters. It constructs a DNS
<mask> // response and sets it into d.Res.
<mask> func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
<mask> resp := s.makeResponse(req)
<mask> dnsrr := res.DNSRewriteResult
<mask> if dnsrr == nil {
<mask> return agherr.Error("no dns rewrite rule content")
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
</s> add func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove result: &dnsfilter.Result{},
</s> add result: &filtering.Result{}, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite_test.go |
keep keep keep replace replace keep keep replace replace keep keep | <mask> }},
<mask> }
<mask> }
<mask> makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) {
<mask> resp := dnsfilter.DNSRewriteResultResponse{
<mask> rr: []rules.RRValue{v},
<mask> }
<mask> return dnsfilter.Result{
<mask> DNSRewriteResult: &dnsfilter.DNSRewriteResult{
<mask> RCode: rcode,
<mask> Response: resp,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove Response: dnsfilter.DNSRewriteResultResponse{
</s> add Response: filtering.DNSRewriteResultResponse{ </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/dnsrewrite_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "fmt"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask>
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.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.FilteringSettings {
<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: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.FilteringSettings) {
</s> add func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *filtering.Settings) { </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was
<mask> // filtered.
<mask> func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
<mask> d := ctx.proxyCtx
<mask> req := d.Req
<mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> res, err := s.dnsFilter.CheckHost(host, req.Question[0].Qtype, ctx.setts)
<mask> if err != nil {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep replace keep | <mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> res, err := s.dnsFilter.CheckHost(host, req.Question[0].Qtype, ctx.setts)
<mask> if err != nil {
<mask> // Return immediately if there's an error
<mask> return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
<mask> } else if res.IsFiltered {
<mask> log.Tracef("Host %s is filtered, reason - %q, matched rule: %q", host, res.Reason, res.Rules[0].Text)
<mask> d.Res = s.genDNSFilterMessage(d, &res)
<mask> } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
<mask> res.CanonName != "" &&
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // name. The original question is readded in
<mask> // processFilteringAfterResponse.
<mask> ctx.origQuestion = req.Question[0]
<mask> req.Question[0].Name = dns.Fqdn(res.CanonName)
<mask> } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
<mask> resp := s.makeResponse(req)
<mask> for _, h := range res.ReverseHosts {
<mask> hdr := dns.RR_Header{
<mask> Name: req.Question[0].Name,
<mask> Rrtype: dns.TypePTR,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove case dnsfilter.Rewritten,
dnsfilter.RewrittenRule:
</s> add case filtering.Rewritten,
filtering.RewrittenRule: </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> resp.Answer = append(resp.Answer, ptr)
<mask> }
<mask>
<mask> d.Res = resp
<mask> } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
<mask> resp := s.makeResponse(req)
<mask>
<mask> name := host
<mask> if len(res.CanonName) != 0 {
<mask> resp.Answer = append(resp.Answer, s.genAnswerCNAME(req, res.CanonName))
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} </s> remove c := dnsfilter.Config{}
</s> add c := filtering.Config{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> d.Res = resp
<mask> } else if res.Reason == dnsfilter.RewrittenRule {
<mask> err = s.filterDNSRewrite(req, res, d)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
<mask> // If this is a match, we set a new response in d.Res and return.
<mask> func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
<mask> d := ctx.proxyCtx
<mask> for _, a := range d.Res.Answer {
<mask> host := ""
<mask>
<mask> switch v := a.(type) {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenRule) &&
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenRule) && </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "path/filepath"
<mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func loadTestData(t *testing.T, casesFileName string, cases interface{}) {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> const jsonExt = ".json"
<mask>
<mask> func TestDNSForwardHTTTP_handleGetConfig(t *testing.T) {
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> SafeBrowsingCacheSize: 1000,
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> ParentalCacheSize: 1000,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ </s> remove filterConf *dnsfilter.Config,
</s> add filterConf *filtering.Config, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func TestDNSForwardHTTTP_handleSetConfig(t *testing.T) {
<mask> filterConf := &dnsfilter.Config{
<mask> SafeBrowsingEnabled: true,
<mask> SafeBrowsingCacheSize: 1000,
<mask> SafeSearchEnabled: true,
<mask> SafeSearchCacheSize: 1000,
<mask> ParentalCacheSize: 1000,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove c := &dnsfilter.Config{
Rewrites: []dnsfilter.RewriteEntry{{
</s> add c := &filtering.Config{
Rewrites: []filtering.RewriteEntry{{ </s> remove filterConf *dnsfilter.Config,
</s> add filterConf *filtering.Config, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return resp
<mask> }
<mask>
<mask> // genDNSFilterMessage generates a DNS message corresponding to the filtering result
<mask> func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
<mask> m := d.Req
<mask>
<mask> if m.Question[0].Qtype != dns.TypeA && m.Question[0].Qtype != dns.TypeAAAA {
<mask> if s.conf.BlockingMode == "null_ip" {
<mask> return s.makeResponse(m)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
</s> add func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res filtering.Result) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
keep keep keep replace keep replace keep | <mask> }
<mask>
<mask> switch result.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
<mask> case dnsfilter.FilteredParental:
<mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove func (c *searchCriterion) ctFilteringStatusCase(res dnsfilter.Result) bool {
</s> add func (c *searchCriterion) ctFilteringStatusCase(res filtering.Result) bool { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
keep keep replace keep keep replace | <mask> return s.genBlockedHost(m, s.conf.ParentalBlockHost, d)
<mask> default:
<mask> // If the query was filtered by "Safe search", dnsfilter also must return
<mask> // the IP address that must be used in response.
<mask> // In this case regardless of the filtering method, we should return it
<mask> if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/msg.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/miekg/dns"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> func (s *Server) updateStats(ctx *dnsContext, elapsed time.Duration, res dnsfilter.Result) {
<mask> if s.stats == nil {
<mask> return
<mask> }
<mask>
<mask> pctx := ctx.proxyCtx
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove func (s *Server) filterDNSRewrite(req *dns.Msg, res dnsfilter.Result, d *proxy.DNSContext) (err error) {
</s> add func (s *Server) filterDNSRewrite(req *dns.Msg, res filtering.Result, d *proxy.DNSContext) (err error) { </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
</s> add func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *filtering.Result) *dns.Msg { </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} </s> remove func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*filtering.Result, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
keep replace keep replace keep keep keep | <mask> switch res.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> e.Result = stats.RSafeBrowsing
<mask> case dnsfilter.FilteredParental:
<mask> e.Result = stats.RParental
<mask> case dnsfilter.FilteredSafeSearch:
<mask> e.Result = stats.RSafeSearch
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove case dnsfilter.FilteredBlockList:
</s> add case filtering.FilteredBlockList: </s> remove case dnsfilter.FilteredInvalid:
</s> add case filtering.FilteredInvalid: </s> remove case dnsfilter.FilteredBlockedService:
</s> add case filtering.FilteredBlockedService: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
keep replace keep replace keep keep keep keep | <mask> e.Result = stats.RParental
<mask> case dnsfilter.FilteredSafeSearch:
<mask> e.Result = stats.RSafeSearch
<mask> case dnsfilter.FilteredBlockList:
<mask> fallthrough
<mask> case dnsfilter.FilteredInvalid:
<mask> fallthrough
<mask> case dnsfilter.FilteredBlockedService:
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredInvalid:
</s> add case filtering.FilteredInvalid: </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredBlockedService:
</s> add case filtering.FilteredBlockedService: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> add res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
keep keep keep replace keep replace | <mask> e.Result = stats.RSafeSearch
<mask> case dnsfilter.FilteredBlockList:
<mask> fallthrough
<mask> case dnsfilter.FilteredInvalid:
<mask> fallthrough
<mask> case dnsfilter.FilteredBlockedService:
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove case dnsfilter.FilteredBlockList:
</s> add case filtering.FilteredBlockList: </s> remove case dnsfilter.FilteredSafeSearch:
</s> add case filtering.FilteredSafeSearch: </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove case dnsfilter.FilteredSafeBrowsing:
</s> add case filtering.FilteredSafeBrowsing: </s> remove res.Reason.In(dnsfilter.FilteredBlockList, dnsfilter.FilteredBlockedService)
</s> add res.Reason.In(filtering.FilteredBlockList, filtering.FilteredBlockedService) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "net"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID string
<mask> wantLogProto querylog.ClientProto
<mask> wantStatClient string
<mask> wantCode resultCode
<mask> reason dnsfilter.Reason
<mask> wantStatResult stats.Result
<mask> }{{
<mask> name: "success_udp",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_tls_client_id",
<mask> proto: proxy.ProtoTLS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "cli42",
<mask> wantLogProto: querylog.ClientProtoDOT,
<mask> wantStatClient: "cli42",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_tls",
<mask> proto: proxy.ProtoTLS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDOT,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_quic",
<mask> proto: proxy.ProtoQUIC,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDOQ,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_https",
<mask> proto: proxy.ProtoHTTPS,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDOH,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_dnscrypt",
<mask> proto: proxy.ProtoDNSCrypt,
<mask> addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: querylog.ClientProtoDNSCrypt,
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.NotFilteredNotFound,
<mask> wantStatResult: stats.RNotFiltered,
<mask> }, {
<mask> name: "success_udp_filtered",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredBlockList,
<mask> wantStatResult: stats.RFiltered,
<mask> }, {
<mask> name: "success_udp_sb",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredSafeBrowsing,
<mask> wantStatResult: stats.RSafeBrowsing,
<mask> }, {
<mask> name: "success_udp_ss",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredSafeSearch,
<mask> wantStatResult: stats.RSafeSearch,
<mask> }, {
<mask> name: "success_udp_pc",
<mask> proto: proxy.ProtoUDP,
<mask> addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> clientID: "",
<mask> wantLogProto: "",
<mask> wantStatClient: "1.2.3.4",
<mask> wantCode: resultCodeSuccess,
<mask> reason: dnsfilter.FilteredParental,
<mask> wantStatResult: stats.RParental,
<mask> }}
<mask>
<mask> ups, err := upstream.AddressToUpstream("1.1.1.1", upstream.Options{})
<mask> require.Nil(t, err)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredBlockList,
</s> add reason: filtering.FilteredBlockList, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> stats: st,
<mask> },
<mask> proxyCtx: pctx,
<mask> startTime: time.Now(),
<mask> result: &dnsfilter.Result{
<mask> Reason: tc.reason,
<mask> },
<mask> clientID: tc.clientID,
<mask> }
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove result: &dnsfilter.Result{},
</s> add result: &filtering.Result{}, </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove reason: dnsfilter.NotFilteredNotFound,
</s> add reason: filtering.NotFilteredNotFound, </s> remove reason: dnsfilter.FilteredSafeSearch,
</s> add reason: filtering.FilteredSafeSearch, </s> remove reason: dnsfilter.FilteredSafeBrowsing,
</s> add reason: filtering.FilteredSafeBrowsing, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/dnsforward/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/clients.go |
keep keep add keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Upstreams: cy.Upstreams,
<mask> }
<mask>
<mask> for _, s := range cy.BlockedServices {
<mask> if !dnsfilter.BlockedSvcKnown(s) {
<mask> log.Debug("clients: skipping unknown blocked-service %q", s)
<mask> continue
<mask> }
<mask> cli.BlockedServices = append(cli.BlockedServices, s)
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, ServerConfig{
</s> add s := createTestServer(t, &filtering.Config{}, ServerConfig{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "path/filepath"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
keep keep keep add keep keep keep keep | <mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> dnsforward.FilteringConfig `yaml:",inline"`
<mask>
<mask> FilteringEnabled bool `yaml:"filtering_enabled"` // whether or not use filter lists
<mask> FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
<mask> DnsfilterConf dnsfilter.Config `yaml:",inline"`
<mask>
<mask> // LocalDomainName is the domain name used for known internal hosts.
<mask> // For example, a machine called "myhost" can be addressed as
<mask> // "myhost.lan" when LocalDomainName is "lan".
<mask> LocalDomainName string `yaml:"local_domain_name"`
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove dnsfilter.Filter `yaml:",inline"`
</s> add filtering.Filter `yaml:",inline"` </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
</s> add ProtectionEnabled: true, // whether or not use any of filtering features </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> BindHosts: []net.IP{{0, 0, 0, 0}},
<mask> Port: 53,
<mask> StatsInterval: 1,
<mask> FilteringConfig: dnsforward.FilteringConfig{
<mask> ProtectionEnabled: true, // whether or not use any of dnsfilter features
<mask> BlockingMode: "default", // mode how to answer filtered requests
<mask> BlockedResponseTTL: 10, // in seconds
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> AllServers: false,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> config.DNS.AnonymizeClientIP = dc.AnonymizeClientIP
<mask> }
<mask>
<mask> if Context.dnsFilter != nil {
<mask> c := dnsfilter.Config{}
<mask> Context.dnsFilter.WriteDiskConfig(&c)
<mask> config.DNS.DnsfilterConf = c
<mask> }
<mask>
<mask> if s := Context.dnsServer; s != nil {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove ctx.result = &dnsfilter.Result{}
</s> add ctx.result = &filtering.Result{} </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove Context.dnsFilter = dnsfilter.New(&filterConf, nil)
</s> add Context.dnsFilter = filtering.New(&filterConf, nil) </s> remove c := dnsfilter.Config{
</s> add c := filtering.Config{ </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "path/filepath"
<mask> "strconv"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.go |
keep add keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/ameshkov/dnscrypt/v2"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> filterConf := config.DNS.DnsfilterConf
<mask> filterConf.EtcHosts = Context.etcHosts
<mask> filterConf.ConfigModified = onConfigModified
<mask> filterConf.HTTPRegister = httpRegister
<mask> Context.dnsFilter = dnsfilter.New(&filterConf, nil)
<mask>
<mask> p := dnsforward.DNSCreateParams{
<mask> DNSFilter: Context.dnsFilter,
<mask> Stats: Context.stats,
<mask> QueryLog: Context.queryLog,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove c := dnsfilter.Config{}
</s> add c := filtering.Config{} </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), </s> remove s := createTestServer(t, &dnsfilter.Config{}, forwardConf, nil)
</s> add s := createTestServer(t, &filtering.Config{}, forwardConf, nil) </s> remove filterConf := &dnsfilter.Config{
</s> add filterConf := &filtering.Config{ </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.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.FilteringSettings) {
<mask> Context.dnsFilter.ApplyBlockedServices(setts, nil, true)
<mask>
<mask> if clientAddr == nil {
<mask> return
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` </s> remove func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *dnsfilter.FilteringSettings {
</s> add func (s *Server) getClientRequestFilteringSettings(ctx *dnsContext) *filtering.Settings { </s> remove FilterHandler: func(_ net.IP, _ string, settings *dnsfilter.FilteringSettings) {
</s> add FilterHandler: func(_ net.IP, _ string, settings *filtering.Settings) { </s> remove setts *dnsfilter.FilteringSettings
</s> add setts *filtering.Settings </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "sync"
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> func defaultFilters() []filter {
<mask> return []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
<mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"},
<mask> {Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
<mask> }
<mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type filter struct {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filter instance
</s> add dnsFilter *filtering.DNSFilter // DNS filter instance </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove ProtectionEnabled: true, // whether or not use any of dnsfilter features
</s> add ProtectionEnabled: true, // whether or not use any of filtering features </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove result *dnsfilter.Result
</s> add result *filtering.Result </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> LastUpdated time.Time `yaml:"-"`
<mask> checksum uint32 // checksum of the file data
<mask> white bool
<mask>
<mask> dnsfilter.Filter `yaml:",inline"`
<mask> }
<mask>
<mask> const (
<mask> statusFound = 1
<mask> statusEnabledChanged = 2
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove DnsfilterConf dnsfilter.Config `yaml:",inline"`
</s> add DnsfilterConf filtering.Config `yaml:",inline"` </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of filtering features </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> // . If filter data hasn't changed, just set new update time on file
<mask> // . If filter data has changed:
<mask> // . rename the temporary file (<temp> -> 1.txt)
<mask> // Note that this method works only on UNIX.
<mask> // On Windows we don't pass files to dnsfilter - we pass the whole data.
<mask> // . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
<mask> // . dnsfilter activates new filters
<mask> //
<mask> // Return the number of updated filters
<mask> // Return TRUE - there was a network error and nothing could be updated
<mask> func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) {
<mask> log.Debug("Filters: updating...")
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsfilter.InitModule()
</s> add filtering.InitModule() </s> remove // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
// so we have to initialize dnsfilter's static data first,
</s> add // clients package uses filtering package's static data (filtering.BlockedSvcKnown()),
// so we have to initialize filtering's static data first, </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> return filepath.Join(Context.getDataDir(), filterDir, strconv.FormatInt(filter.ID, 10)+".txt")
<mask> }
<mask>
<mask> func enableFilters(async bool) {
<mask> var whiteFilters []dnsfilter.Filter
<mask> filters := []dnsfilter.Filter{{
<mask> Data: []byte(strings.Join(config.UserRules, "\n")),
<mask> }}
<mask>
<mask> for _, filter := range config.Filters {
<mask> if !filter.Enabled {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove f := dnsfilter.New(filterConf, filters)
</s> add f := filtering.New(filterConf, filters) </s> remove whiteFilters = append(whiteFilters, dnsfilter.Filter{
</s> add whiteFilters = append(whiteFilters, filtering.Filter{ </s> remove if !dnsfilter.BlockedSvcKnown(s) {
</s> add if !filtering.BlockedSvcKnown(s) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if !filter.Enabled {
<mask> continue
<mask> }
<mask>
<mask> filters = append(filters, dnsfilter.Filter{
<mask> ID: filter.ID,
<mask> FilePath: filter.Path(),
<mask> })
<mask> }
<mask> for _, filter := range config.WhitelistFilters {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove whiteFilters = append(whiteFilters, dnsfilter.Filter{
</s> add whiteFilters = append(whiteFilters, filtering.Filter{ </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove if !dnsfilter.BlockedSvcKnown(s) {
</s> add if !filtering.BlockedSvcKnown(s) { </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ </s> remove filters := []dnsfilter.Filter{{
</s> add filters := []filtering.Filter{{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if !filter.Enabled {
<mask> continue
<mask> }
<mask>
<mask> whiteFilters = append(whiteFilters, dnsfilter.Filter{
<mask> ID: filter.ID,
<mask> FilePath: filter.Path(),
<mask> })
<mask> }
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove filters = append(filters, dnsfilter.Filter{
</s> add filters = append(filters, filtering.Filter{ </s> remove var whiteFilters []dnsfilter.Filter
filters := []dnsfilter.Filter{{
</s> add var whiteFilters []filtering.Filter
filters := []filtering.Filter{{ </s> remove if !dnsfilter.BlockedSvcKnown(s) {
</s> add if !filtering.BlockedSvcKnown(s) { </s> remove DNSFilter: dnsfilter.New(&c, nil),
</s> add DNSFilter: filtering.New(&c, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, nil),
</s> add DNSFilter: filtering.New(&filtering.Config{}, nil), </s> remove DNSFilter: dnsfilter.New(&dnsfilter.Config{}, filters),
</s> add DNSFilter: filtering.New(&filtering.Config{}, filters), | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/updater"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
keep keep add keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/updater"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> queryLog querylog.QueryLog // query log module
<mask> dnsServer *dnsforward.Server // DNS module
<mask> rdns *RDNS // rDNS module
<mask> whois *Whois // WHOIS module
<mask> dnsFilter *dnsfilter.DNSFilter // DNS filtering module
<mask> dhcpServer *dhcpd.Server // DHCP module
<mask> auth *Auth // HTTP authentication module
<mask> filters Filtering // DNS filtering module
<mask> web *Web // Web (HTTP, HTTPS) module
<mask> tls *TLSMod // TLS module
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove dnsFilter *dnsfilter.DNSFilter // DNS filter instance
</s> add dnsFilter *filtering.DNSFilter // DNS filter instance </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove Result *dnsfilter.Result // Filtering result (optional)
</s> add Result *filtering.Result // Filtering result (optional) </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` </s> remove // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
// so we have to initialize dnsfilter's static data first,
</s> add // clients package uses filtering package's static data (filtering.BlockedSvcKnown()),
// so we have to initialize filtering's static data first, | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
keep keep keep keep replace replace keep keep keep keep keep keep keep keep replace keep | <mask> }
<mask>
<mask> setupContext(args)
<mask>
<mask> // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
<mask> // so we have to initialize dnsfilter's static data first,
<mask> // but also avoid relying on automatic Go init() function
<mask> dnsfilter.InitModule()
<mask>
<mask> setupConfig(args)
<mask>
<mask> // clients package uses dnsfilter package's static data (dnsfilter.BlockedSvcKnown()),
<mask> // so we have to initialize dnsfilter's static data first,
<mask> // but also avoid relying on automatic Go init() function
<mask> dnsfilter.InitModule()
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove // On Windows we don't pass files to dnsfilter - we pass the whole data.
// . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
// . dnsfilter activates new filters
</s> add // On Windows we don't pass files to filtering - we pass the whole data.
// . Pass new filters to filtering object - it analyzes new data while the old filters are still active
// . filtering activates new filters </s> remove dnsfilter.Filter `yaml:",inline"`
</s> add filtering.Filter `yaml:",inline"` </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove case dnsfilter.FilteredParental:
</s> add case filtering.FilteredParental: </s> remove FilterHandler func(clientAddr net.IP, clientID string, settings *dnsfilter.FilteringSettings) `yaml:"-"`
</s> add FilterHandler func(clientAddr net.IP, clientID string, settings *filtering.Settings) `yaml:"-"` | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "net"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> l := len(ent.Result.Rules)
<mask> if l == 0 {
<mask> ent.Result.Rules = []*dnsfilter.ResultRule{{}}
<mask> l++
<mask> }
<mask>
<mask> ent.Result.Rules[l-1].Text = s
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> l := len(ent.Result.Rules)
<mask> if l == 0 {
<mask> ent.Result.Rules = []*dnsfilter.ResultRule{{}}
<mask> l++
<mask> }
<mask>
<mask> ent.Result.Rules[l-1].FilterListID = i
<mask>
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove } else if res.Reason == dnsfilter.RewrittenAutoHosts && len(res.ReverseHosts) != 0 {
</s> add } else if res.Reason == filtering.RewrittenAutoHosts && len(res.ReverseHosts) != 0 { </s> remove } else if res.Reason.In(dnsfilter.Rewritten, dnsfilter.RewrittenAutoHosts) {
</s> add } else if res.Reason.In(filtering.Rewritten, filtering.RewrittenAutoHosts) { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> i, err := v.Int64()
<mask> if err != nil {
<mask> return err
<mask> }
<mask> ent.Result.Reason = dnsfilter.Reason(i)
<mask> return nil
<mask> },
<mask> "ServiceName": func(t json.Token, ent *logEntry) error {
<mask> s, ok := t.(string)
<mask> if !ok {
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { </s> remove return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
</s> add return nil, fmt.Errorf("filtering failed to check host %q: %w", host, err) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*filtering.Result, error) { </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove c := dnsfilter.Config{}
</s> add c := filtering.Config{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> if len(ent.Result.Rules) < i+1 {
<mask> ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
<mask> }
<mask>
<mask> if n, ok := vToken.(json.Number); ok {
<mask> ent.Result.Rules[i].FilterListID, _ = n.Int64()
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> if len(ent.Result.Rules) < i+1 {
<mask> ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
<mask> }
<mask>
<mask> if ipStr, ok := vToken.(string); ok {
<mask> ent.Result.Rules[i].IP = net.ParseIP(ipStr)
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> if len(ent.Result.Rules) < i+1 {
<mask> ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
<mask> }
<mask>
<mask> if s, ok := vToken.(string); ok {
<mask> ent.Result.Rules[i].Text = s
<mask> }
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove ent.Result.Rules = []*dnsfilter.ResultRule{{}}
</s> add ent.Result.Rules = []*filtering.ResultRule{{}} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> if ent.Result.DNSRewriteResult == nil {
<mask> ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
<mask> }
<mask>
<mask> if n, ok := vToken.(json.Number); ok {
<mask> rcode64, _ := n.Int64()
<mask> ent.Result.DNSRewriteResult.RCode = rules.RCode(rcode64)
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Rules = append(ent.Result.Rules, &dnsfilter.ResultRule{})
</s> add ent.Result.Rules = append(ent.Result.Rules, &filtering.ResultRule{}) </s> remove ent.Result.Reason = dnsfilter.Reason(i)
</s> add ent.Result.Reason = filtering.Reason(i) </s> remove ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
</s> add ent.Result.DNSRewriteResult.Response = filtering.DNSRewriteResultResponse{} | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep replace keep keep keep replace keep keep keep keep | <mask> }
<mask> case "Response":
<mask> if ent.Result.DNSRewriteResult == nil {
<mask> ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
<mask> }
<mask>
<mask> if ent.Result.DNSRewriteResult.Response == nil {
<mask> ent.Result.DNSRewriteResult.Response = dnsfilter.DNSRewriteResultResponse{}
<mask> }
<mask>
<mask> // TODO(a.garipov): I give up. This whole file is a mess.
<mask> // Luckily, we can assume that this field is relatively rare and
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove ent.Result.DNSRewriteResult = &dnsfilter.DNSRewriteResult{}
</s> add ent.Result.DNSRewriteResult = &filtering.DNSRewriteResult{} </s> remove if result.Reason == dnsfilter.FilteredSafeSearch &&
</s> add if result.Reason == filtering.FilteredSafeSearch && </s> remove case dnsfilter.Rewritten,
dnsfilter.RewrittenRule:
</s> add case filtering.Rewritten,
filtering.RewrittenRule: </s> remove // If the query was filtered by "Safe search", dnsfilter also must return
</s> add // If the query was filtered by "Safe search", filtering also must return </s> remove } else if res.Reason == dnsfilter.RewrittenRule {
</s> add } else if res.Reason == filtering.RewrittenRule { | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> )
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/filtering" | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
keep replace keep replace | <mask> Answer: ans,
<mask> Result: dnsfilter.Result{
<mask> IsFiltered: true,
<mask> Reason: dnsfilter.FilteredBlockList,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> IsFiltered: true,
<mask> Reason: dnsfilter.FilteredBlockList,
<mask> ReverseHosts: []string{"example.net"},
<mask> IPList: []net.IP{net.IPv4(127, 0, 0, 2)},
<mask> Rules: []*dnsfilter.ResultRule{{
<mask> FilterListID: 42,
<mask> Text: "||an.yandex.ru",
<mask> IP: net.IPv4(127, 0, 0, 2),
<mask> }, {
<mask> FilterListID: 43,
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove Reason: dnsfilter.FilteredBlockList,
</s> add Reason: filtering.FilteredBlockList, </s> remove Result: dnsfilter.Result{
</s> add Result: filtering.Result{ </s> remove DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove res := dnsfilter.Result{
</s> add res := filtering.Result{ | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
keep keep keep keep replace keep replace | <mask> IP: net.IPv4(127, 0, 0, 3),
<mask> }},
<mask> CanonName: "example.com",
<mask> ServiceName: "example.org",
<mask> DNSRewriteResult: &dnsfilter.DNSRewriteResult{
<mask> RCode: dns.RcodeSuccess,
<mask> Response: dnsfilter.DNSRewriteResultResponse{
</s> Pull request: all: less annoying pkg names
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names </s> remove return dnsfilter.Result{
DNSRewriteResult: &dnsfilter.DNSRewriteResult{
</s> add return filtering.Result{
DNSRewriteResult: &filtering.DNSRewriteResult{ </s> remove Rules: []*dnsfilter.ResultRule{{
</s> add Rules: []*filtering.ResultRule{{ </s> remove makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res dnsfilter.Result) {
resp := dnsfilter.DNSRewriteResultResponse{
</s> add makeRes := func(rcode rules.RCode, rr rules.RRType, v rules.RRValue) (res filtering.Result) {
resp := filtering.DNSRewriteResultResponse{ </s> remove Reason: dnsfilter.Rewritten,
</s> add Reason: filtering.Rewritten, </s> remove f := dnsfilter.New(c, nil)
</s> add f := filtering.New(c, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/7f2f8de92215eb2911241c036b8a5ed136d0eaed | internal/querylog/decode_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.