docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
<mask> github.com/AdguardTeam/dnsproxy v0.41.4/go.mod h1:GCdEbTw683vBqksJIccPSYzBg2yIFbRiDnXltyIinug=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.co... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | go.sum | |
github.com/AdguardTeam/golibs v0.10.8 h1:diU9gP9qG1qeLbAkzIwfUerpHSqzR6zaBgzvRMR/m6Q=
github.com/AdguardTeam/golibs v0.10.8/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= | <mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.10.6/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | go.sum |
dctx.isLocalClient = s.privateNets.Contains(ip) | <mask> if ip, _ = netutil.IPAndPortFromAddr(dctx.proxyCtx.Addr); ip == nil {
<mask> return rc
<mask> }
<mask>
<mask> dctx.isLocalClient = s.subnetDetector.IsLocallyServedNetwork(ip)
<mask>
<mask> return rc
<mask> }
<mask>
<mask> // hostToIP tries to get an IP leased by DHCP and returns the copy of ad... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns.go |
if !s.privateNets.Contains(ip) { | <mask>
<mask> // Restrict an access to local addresses for external clients. We also
<mask> // assume that all the DHCP leases we give are locally-served or at least
<mask> // don't need to be inaccessible externally.
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> log.Debug("dns: addr %s ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns.go |
if !s.privateNets.Contains(ip) { | <mask>
<mask> s.serverLock.RLock()
<mask> defer s.serverLock.RUnlock()
<mask>
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> if s.conf.UsePrivateRDNS {
<mask> s.recDetector.add(*d.Req)
</s> Pull request: 3142 custom private subnets
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns.go |
<mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go | |
"github.com/AdguardTeam/golibs/netutil" | <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"
<mask> )
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go |
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestServer_ProcessDetermineLocal(t *testing.T) {
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> s := &Server{
<mask> subnetDetector: snd,
<mask> }
<mask>
<mask> testCases := []struct {
</s... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go | |
privateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), | <mask> func TestServer_ProcessDetermineLocal(t *testing.T) {
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> s := &Server{
<mask> subnetDetector: snd,
<mask> }
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> cliIP net.IP
</s> Pull request: 3142... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go |
want assert.BoolAssertionFunc | <mask> }
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> cliIP net.IP
<mask> }{{
<mask> want: assert.True,
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to master
Updates #3142.
Squashed commit of the following:
commit 11469ade7... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go |
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> cliIP net.IP
<mask> want bool
<mask> }{{
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> want: true,
<mask> }, {
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-su... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go | |
want: assert.True, | <mask> want assert.BoolAssertionFunc
<mask> name string
<mask> cliIP net.IP
<mask> }{{
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> }, {
<mask> want: assert.False,
<mask> name: "external",
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go |
<mask> want bool
<mask> }{{
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> want: true,
<mask> }, {
<mask> name: "external",
<mask> cliIP: net.IP{250, 249, 0, 1},
<mask> want: false,
<mask> }}
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home f... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go | |
want: assert.False, | <mask> want: assert.True,
<mask> name: "local",
<mask> cliIP: net.IP{192, 168, 0, 1},
<mask> }, {
<mask> name: "external",
<mask> cliIP: net.IP{250, 249, 0, 1},
<mask> }, {
<mask> want: assert.False,
<mask> name: "invalid",
</s> Pull request: 3142 custom private subnets
Merge in DNS/adgu... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go |
}, {
want: assert.False,
name: "invalid",
cliIP: net.IP{1, 2, 3, 4, 5},
}, {
want: assert.False,
name: "nil",
cliIP: nil, | <mask> want: true,
<mask> }, {
<mask> name: "external",
<mask> cliIP: net.IP{250, 249, 0, 1},
<mask> want: false,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> proxyCtx := &proxy.DNSContext{
</s> Pull request: 3142 custom private ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go |
tc.want(t, dctx.isLocalClient) | <mask> proxyCtx: proxyCtx,
<mask> }
<mask> s.processDetermineLocal(dctx)
<mask>
<mask> assert.Equal(t, tc.want, dctx.isLocalClient)
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestServer_ProcessInternalHosts_localRestriction(t *testing.T) {
</s> Pull request: 3142 custom private subnets
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dns_test.go |
privateNets netutil.SubnetSet | <mask> // must be a valid domain name plus dots on each side.
<mask> localDomainSuffix string
<mask>
<mask> ipset ipsetCtx
<mask> subnetDetector *aghnet.SubnetDetector
<mask> localResolvers *proxy.Proxy
<mask> sysResolvers aghnet.SystemResolvers
<mask> recDetector *recursionDetector
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward.go |
DNSFilter *filtering.DNSFilter
Stats stats.Stats
QueryLog querylog.QueryLog
DHCPServer dhcpd.ServerInterface
PrivateNets netutil.SubnetSet
Anonymizer *aghnet.IPMut
LocalDomain string | <mask> const defaultLocalDomainSuffix = ".lan."
<mask>
<mask> // DNSCreateParams are parameters to create a new server.
<mask> type DNSCreateParams struct {
<mask> DNSFilter *filtering.DNSFilter
<mask> Stats stats.Stats
<mask> QueryLog querylog.QueryLog
<mask> DHCPServer dhcpd.Serve... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward.go |
privateNets: p.PrivateNets, | <mask> s = &Server{
<mask> dnsFilter: p.DNSFilter,
<mask> stats: p.Stats,
<mask> queryLog: p.QueryLog,
<mask> subnetDetector: p.SubnetDetector,
<mask> localDomainSuffix: localDomainSuffix,
<mask> recDetector: newRecursionDetector(recursionTTL, cachedRecurrentReq... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward.go |
if s.privateNets.Contains(ip) { | <mask> StartTime: time.Now(),
<mask> }
<mask>
<mask> resolver := s.internalProxy
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> if !s.conf.UsePrivateRDNS {
<mask> return "", nil
<mask> }
<mask>
<mask> resolver = s.localResolvers
</s> Pull request: 3142 custom private subnets
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward.go |
"github.com/AdguardTeam/golibs/netutil" | <mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/AdguardTeam/golibs/timeutil"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/a... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
var err error | <mask>
<mask> f := filtering.New(filterConf, filters)
<mask> f.SetEnabled(true)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), | <mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> s.conf = forwardConf
<mask>
</s> Pul... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
<mask> ID: 0,
<mask> Data: []byte(rules),
<mask> }}
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> f := filtering.New(&filtering.Config{}, filters)
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go | |
s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), | <mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> f := filtering.New(&filtering.Config{}, filters)
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
s, err := NewServer(DNSCreateParams{
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), | <mask> }
<mask> f := filtering.New(c, nil)
<mask> f.SetEnabled(true)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
s, err := NewServer(DNSCreateParams{
DNSFilter: filtering.New(&filtering.Config{}, nil),
DHCPServer: &testDHCP{},
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), | <mask>
<mask> func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {}
<mask>
<mask> func TestPTRResponseFromDHCPLeases(t *testing.T) {
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
<mask> EtcHosts: hc,
<mask> }, nil)
<mask> flt.SetEnabled(true)
<mask>
<mask> var snd *aghnet.SubnetDetector
<mask> snd, err = aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> D... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go | |
DHCPServer: &testDHCP{},
DNSFilter: flt,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), | <mask> require.NotNil(t, snd)
<mask>
<mask> var s *Server
<mask> s, err = NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: flt,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> s.conf.UDPListenAddrs = []*net.UDPAddr{{}}
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
srv.privateNets = netutil.SubnetSetFunc(netutil.IsLocallyServed) | <mask> })
<mask> srv.conf.ResolveClients = true
<mask> srv.conf.UsePrivateRDNS = true
<mask>
<mask> var err error
<mask> srv.subnetDetector, err = aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask>
<mask> localIP := net.IP{192, 168, 1, 1}
<mask> testCases := []struct {
<mask> name ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/dnsforward_test.go |
<mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/filter_test.go | |
<mask>
<mask> f := filtering.New(&filtering.Config{}, filters)
<mask> f.SetEnabled(true)
<mask>
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> s, err := NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/filter_test.go | |
DHCPServer: &testDHCP{},
DNSFilter: f,
PrivateNets: netutil.SubnetSetFunc(netutil.IsLocallyServed), | <mask> require.NoError(t, err)
<mask> require.NotNil(t, snd)
<mask>
<mask> s, err := NewServer(DNSCreateParams{
<mask> DHCPServer: &testDHCP{},
<mask> DNSFilter: f,
<mask> SubnetDetector: snd,
<mask> })
<mask> require.NoError(t, err)
<mask>
<mask> s.conf = forwardConf
<mask> err = s.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/filter_test.go |
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http.go | |
func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) { | <mask> return nil
<mask> }
<mask>
<mask> // validate returns an error if any field of req is invalid.
<mask> func (req *dnsConfig) validate(snd *aghnet.SubnetDetector) (err error) {
<mask> if req.Upstreams != nil {
<mask> err = ValidateUpstreams(*req.Upstreams)
<mask> if err != nil {
<mask> return fm... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http.go |
err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets) | <mask> }
<mask> }
<mask>
<mask> if req.LocalPTRUpstreams != nil {
<mask> err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, snd)
<mask> if err != nil {
<mask> return fmt.Errorf("validating private upstream servers: %w", err)
<mask> }
<mask> }
<mask>
</s> Pull request: 3142 custom private ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http.go |
err = req.validate(s.privateNets) | <mask>
<mask> return
<mask> }
<mask>
<mask> err = req.validate(s.subnetDetector)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
<mask>
<mask> return
<mask> }
</s> Pull request: 3142 custom private subnets
Merge in DNS/adguard-home from 3142-custom-subnets to... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http.go |
<mask> func IsCommentOrEmpty(s string) (ok bool) {
<mask> return len(s) == 0 || s[0] == '#'
<mask> }
<mask>
<mask> // LocalNetChecker is used to check if the IP address belongs to a local
<mask> // network.
<mask> type LocalNetChecker interface {
<mask> // IsLocallyServedNetwork returns true if ip is contain... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http.go | |
// a locally-served network. privateNets must not be nil.
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) { | <mask>
<mask> // ValidateUpstreamsPrivate validates each upstream and returns an error if any
<mask> // upstream is invalid or if there are no default upstreams specified. It also
<mask> // checks each domain of domain-specific upstreams for being ARPA pointing to
<mask> // a locally-served network. lnc must no... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http.go |
if !privateNets.Contains(subnet.IP) { | <mask>
<mask> continue
<mask> }
<mask>
<mask> if !lnc.IsLocallyServedNetwork(subnet.IP) {
<mask> errs = append(
<mask> errs,
<mask> fmt.Errorf("arpa domain %q should point to a locally-served network", domain),
<mask> )
<mask> }
</s> Pull request: 3142 custom private subnets
Merge i... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http.go |
"github.com/AdguardTeam/golibs/netutil" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 31... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http_test.go |
ss := netutil.SubnetSetFunc(netutil.IsLocallyServed) | <mask> }
<mask> }
<mask>
<mask> func TestValidateUpstreamsPrivate(t *testing.T) {
<mask> snd, err := aghnet.NewSubnetDetector()
<mask> require.NoError(t, err)
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> wantErr string
<mask> u string
</s> Pull request: 3142 custom pr... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http_test.go |
err := ValidateUpstreamsPrivate(set, ss) | <mask> for _, tc := range testCases {
<mask> set := []string{"192.168.0.1", tc.u}
<mask>
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> err = ValidateUpstreamsPrivate(set, snd)
<mask> testutil.AssertErrorMsg(t, tc.wantErr, err)
<mask> })
<mask> }
<mask> }
</s> Pull request: 3142 custom priva... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/dnsforward/http_test.go |
// PrivateNets is the set of IP networks for which the private reverse DNS
// resolver should be used.
PrivateNets []string `yaml:"private_networks"`
| <mask> ResolveClients bool `yaml:"resolve_clients"`
<mask>
<mask> // UsePrivateRDNS defines if the PTR requests for unknown addresses from
<mask> // locally-served networks should be resolved via private PTR resolvers.
<mask> UsePrivateRDNS bool `yaml:"use_private_ptr_resolvers"`
<mask>
<mask> // LocalPTR... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/home/config.go |
DNSFilter: Context.dnsFilter,
Stats: Context.stats,
QueryLog: Context.queryLog,
PrivateNets: privateNets,
Anonymizer: anonymizer,
LocalDomain: config.DHCP.LocalDomainName, | <mask> filterConf.HTTPRegister = httpRegister
<mask> Context.dnsFilter = filtering.New(&filterConf, nil)
<mask>
<mask> p := dnsforward.DNSCreateParams{
<mask> DNSFilter: Context.dnsFilter,
<mask> Stats: Context.stats,
<mask> QueryLog: Context.queryLog,
<mask> SubnetDetector: Cont... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/home/dns.go |
if !netutil.IsSpecialPurpose(ip) { | <mask>
<mask> if config.DNS.ResolveClients && !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !Context.subnetDetector.IsSpecialNetwork(ip) {
<mask> Context.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> func ipsToTCPAddrs(ips []net.IP, port int) (tcpAddrs []*net.TCPAddr) {
</s>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/home/dns.go |
if ip == nil {
continue
}
| <mask>
<mask> const topClientsNumber = 100 // the number of clients to get
<mask> for _, ip := range Context.stats.GetTopClientsIP(topClientsNumber) {
<mask> if config.DNS.ResolveClients && !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !netutil.IsSpecialPurpose(ip) {
<mask> ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/home/dns.go |
if !netutil.IsSpecialPurpose(ip) { | <mask> for _, ip := range Context.stats.GetTopClientsIP(topClientsNumber) {
<mask> if config.DNS.ResolveClients && !ip.IsLoopback() {
<mask> Context.rdns.Begin(ip)
<mask> }
<mask> if !Context.subnetDetector.IsSpecialNetwork(ip) {
<mask> Context.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/home/dns.go |
<mask> hostsWatcher aghos.FSWatcher
<mask>
<mask> updater *updater.Updater
<mask>
<mask> subnetDetector *aghnet.SubnetDetector
<mask>
<mask> // mux is our custom http.ServeMux.
<mask> mux *http.ServeMux
<mask>
<mask> // Runtime properties
<mask> // --
</s> Pull request: 3142 custom private subnet... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/home/home.go | |
<mask>
<mask> Context.web, err = initWeb(args, clientBuildFS)
<mask> fatalOnError(err)
<mask>
<mask> Context.subnetDetector, err = aghnet.NewSubnetDetector()
<mask> fatalOnError(err)
<mask>
<mask> if !Context.firstRun {
<mask> err = initDNSServer()
<mask> fatalOnError(err)
<mask>
<mask> Conte... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/778585865ebd2234596b8acbe5510bcb96de45fc | internal/home/home.go | |
<mask> }
<mask> }
<mask>
<mask> // request was not filtered so let it be processed further
<mask> s.recDetector.add(*req)
<mask> if ctx.err = s.dnsProxy.Resolve(d); ctx.err != nil {
<mask> return resultCodeError
<mask> }
<mask>
<mask> ctx.responseFromUpstream = true
</s> Pull request: 3185 fix re... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77 | internal/dnsforward/dns.go | |
recursionTTL = 1 * time.Second | <mask> }
<mask>
<mask> const (
<mask> // recursionTTL is the time recursive request is cached for.
<mask> recursionTTL = 5 * time.Second
<mask> // cachedRecurrentReqNum is the maximum number of cached recurrent
<mask> // requests.
<mask> cachedRecurrentReqNum = 1000
<mask> )
<mask>
</s> Pull request: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77 | internal/dnsforward/dnsforward.go |
<mask> if !s.conf.ResolveClients {
<mask> return "", nil
<mask> }
<mask>
<mask> var resolver *proxy.Proxy = s.localResolvers
<mask> if !s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> resolver = s.internalProxy
<mask> } else if !s.conf.UsePrivateRDNS {
<mask> return "", nil
<mask> }
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77 | internal/dnsforward/dnsforward.go | |
var resolver *proxy.Proxy = s.internalProxy
if s.subnetDetector.IsLocallyServedNetwork(ip) {
if !s.conf.UsePrivateRDNS {
return "", nil
}
resolver = s.localResolvers
s.recDetector.add(*req)
}
| <mask> Req: req,
<mask> StartTime: time.Now(),
<mask> }
<mask>
<mask> s.recDetector.add(*req)
<mask> if err = resolver.Resolve(ctx); err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> resp := ctx.Res
</s> Pull request: 3185 fix recursion vol.2
Merge in DNS/adguard-home from fix-rec... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77 | internal/dnsforward/dnsforward.go |
// check checks if the passed req was already sent by the server. | <mask> recentRequests cache.Cache
<mask> ttl time.Duration
<mask> }
<mask>
<mask> // check checks if the passed req was already sent by s.
<mask> func (rd *recursionDetector) check(msg dns.Msg) (ok bool) {
<mask> if len(msg.Question) == 0 {
<mask> return false
<mask> }
<mask>
</s> Pull req... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/78d47d88842b51c6a7838e96a2e3d6b18c765e77 | internal/dnsforward/recursiondetector.go |
// IPSET configuration - add IP addresses of the specified domain names to an ipset list
// Syntax:
// "DOMAIN[,DOMAIN].../IPSET_NAME"
IPSETList []string `yaml:"ipset"` | <mask> EnableDNSSEC bool `yaml:"enable_dnssec"` // Set DNSSEC flag in outcoming DNS request
<mask> EnableEDNSClientSubnet bool `yaml:"edns_client_subnet"` // Enable EDNS Client Subnet option
<mask> MaxGoroutines uint32 `yaml:"max_goroutines"` // Max. number of parallel gorout... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/config.go |
ipset ipsetCtx
| <mask> queryLog querylog.QueryLog // Query log instance
<mask> stats stats.Stats
<mask> access *accessCtx
<mask>
<mask> tableHostToIP map[string]net.IP // "hostname -> IP" table for internal addresses (DHCP)
<mask> tableHostToIPLock sync.Mutex
<mask>
<mask> tablePTR map[string]str... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Initialize the server configuration | <mask> }
<mask>
<mask> // Prepare the object
<mask> func (s *Server) Prepare(config *ServerConfig) error {
<mask> // 1. Initialize the server configuration
<mask> // --
<mask> if config != nil {
<mask> s.conf = *config
<mask> if s.conf.BlockingMode == "custom_ip" {
<mask> s.conf.BlockingIPAddrv4 = ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Set default values in the case if nothing is configured | <mask> s.conf.MaxGoroutines = 50
<mask> }
<mask> }
<mask>
<mask> // 2. Set default values in the case if nothing is configured
<mask> // --
<mask> s.initDefaultSettings()
<mask>
<mask> // 3. Prepare DNS servers settings
<mask> // --
</s> + DNS: add "ipset" configuration setting
Close #1191
Squ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Initialize IPSET configuration
// --
s.ipset.init(s.conf.IPSETList)
// Prepare DNS servers settings | <mask> // 2. Set default values in the case if nothing is configured
<mask> // --
<mask> s.initDefaultSettings()
<mask>
<mask> // 3. Prepare DNS servers settings
<mask> // --
<mask> err := s.prepareUpstreamSettings()
<mask> if err != nil {
<mask> return err
<mask> }
</s> + DNS: add "ipset" configu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Create DNS proxy configuration | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> // 3. Create DNS proxy configuration
<mask> // --
<mask> var proxyConfig proxy.Config
<mask> proxyConfig, err = s.createProxyConfig()
<mask> if err != nil {
<mask> return err
</s> + DNS: add "ipset" configuration setting
Close #1191... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Prepare a DNS proxy instance that we use for internal DNS queries | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> // 4. Prepare a DNS proxy instance that we use for internal DNS queries
<mask> // --
<mask> s.prepareIntlProxy()
<mask>
<mask> // 5. Initialize DNS access module
<mask> // --
</s> + DNS: add "ipset" configuration setting
Close #1191
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Initialize DNS access module | <mask> // 4. Prepare a DNS proxy instance that we use for internal DNS queries
<mask> // --
<mask> s.prepareIntlProxy()
<mask>
<mask> // 5. Initialize DNS access module
<mask> // --
<mask> s.access = &accessCtx{}
<mask> err = s.access.Init(s.conf.AllowedClients, s.conf.DisallowedClients, s.conf.BlockedH... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Register web handlers if necessary | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> // 6. Register web handlers if necessary
<mask> // --
<mask> if !webRegistered && s.conf.HTTPRegister != nil {
<mask> webRegistered = true
<mask> s.registerHandlers()
<mask> }
</s> + DNS: add "ipset" configuration setting
Close #11... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
// Create the main DNS proxy instance | <mask> webRegistered = true
<mask> s.registerHandlers()
<mask> }
<mask>
<mask> // 7. Create the main DNS proxy instance
<mask> // --
<mask> s.dnsProxy = &proxy.Proxy{Config: proxyConfig}
<mask> return nil
<mask> }
<mask>
</s> + DNS: add "ipset" configuration setting
Close #1191
Squashed commit o... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/dnsforward.go |
s.ipset.process, | <mask> processUpstream,
<mask> processDNSSECAfterResponse,
<mask> processFilteringAfterResponse,
<mask> processQueryLogsAndStats,
<mask> }
<mask> for _, process := range mods {
<mask> r := process(ctx)
<mask> switch r {
<mask> case resultDone:
</s> + DNS: add "ipset" configuration setting
Clo... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7931e50673ce0251fb632cd62fefdfcadf002988 | dnsforward/handle_dns.go |
var err error
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
log.Printf("Failed to close udp connection while exiting loop: %s", err)
} | <mask> }
<mask> if err != nil {
<mask> if isConnClosed(err) {
<mask> log.Printf("ReadFrom() returned because we're reading from a closed connection, exiting loop")
<mask> break
<mask> }
<mask> log.Printf("Got error when reading from udp listen: %s", err)
<mask> }
<mask> }
<mask> }
</s... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b | dnsforward/dnsforward.go |
s.udpListen = nil | <mask> addr = defaultValues.UDPListenAddr
<mask> }
<mask> s.udpListen, err = net.ListenUDP("udp", addr)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't listen to UDP socket")
<mask> }
<mask> log.Println(s.udpListen.LocalAddr(), s.UDPListenAddr)
<mask> }
<mask>
<mask> if ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b | dnsforward/dnsforward.go |
s.udpListen = nil | <mask> if s.udpListen != nil {
<mask> err := s.udpListen.Close()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
<mask> }
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it. </s> remove s.udpLis... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b | dnsforward/dnsforward.go |
<mask> err := s.udpListen.Close()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
<mask> s.udpListen = nil
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> //
</s> dnsforward library -- consistently nullify and close listening socket wh... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b | dnsforward/dnsforward.go | |
s.udpListen = nil | <mask> if s.udpListen != nil {
<mask> err = s.udpListen.Close()
<mask> }
<mask> s.Unlock()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
</s> dnsforward library -- consistently nullify and close listening socket when we're done with it.... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b | dnsforward/dnsforward.go |
s.udpListen = nil | <mask> if s.udpListen != nil {
<mask> err = s.udpListen.Close()
<mask> }
<mask> s.Unlock()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't close UDP listening socket")
<mask> }
<mask> newListen, err = net.ListenUDP("udp", newAddr)
</s> dnsforward library -- consistently nu... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7944f23d9521963a954df2767321411169ae170b | dnsforward/dnsforward.go |
<mask> package main
<mask>
<mask> import (
<mask> "bytes"
<mask> "context"
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
</s> * control: move /install handlers to a separate file </s> remove func registerInstallHandlers() {
http.HandleFunc("/control/install/ge... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8 | control.go | |
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/exec"
<mask> "sort"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
<mask> "time"
</s> * control: move /install handlers to a separate file </s> remove func registerInstallHandlers() {
http.HandleFunc("/control/install/get_ad... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8 | control.go | |
<mask> return
<mask> }
<mask> }
<mask>
<mask> type firstRunData struct {
<mask> WebPort int `json:"web_port"`
<mask> DNSPort int `json:"dns_port"`
<mask> Interfaces map[string]interface{} `json:"interfaces"`
<mask> }
<mask>
<mask> // Get initial installatio... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8 | control.go | |
<mask>
<mask> // ------------------------
<mask> // registration of handlers
<mask> // ------------------------
<mask> func registerInstallHandlers() {
<mask> http.HandleFunc("/control/install/get_addresses", preInstall(ensureGET(handleInstallGetAddresses)))
<mask> http.HandleFunc("/control/install/check_conf... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/79b0fac01a544e35207420fed78e1c2a63d428d8 | control.go | |
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_e... | <mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="disable_ipv6"
<mask> type="checkbox"
<mask... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1 | client/src/components/Settings/Dns/Config/Form.js |
dnssec_enabled, | <mask> blocking_ipv6,
<mask> edns_cs_enabled,
<mask> disable_ipv6,
<mask> processingSetConfig,
<mask> } = dnsConfig;
<mask>
</s> + client: handle DNSSEC setting | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1 | client/src/components/Settings/Dns/Config/index.js |
dnssec_enabled, | <mask> blocking_ipv6,
<mask> edns_cs_enabled,
<mask> disable_ipv6,
<mask> }}
<mask> onSubmit={handleFormSubmit}
<mask> processing={processingSetConfig}
<mask> />
<m... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1 | client/src/components/Settings/Dns/Config/index.js |
dnssec_enabled: false, | <mask> blocking_ipv4: DEFAULT_BLOCKING_IPV4,
<mask> blocking_ipv6: DEFAULT_BLOCKING_IPV6,
<mask> edns_cs_enabled: false,
<mask> disable_ipv6: false,
<mask> },
<mask> );
<mask>
<mask> export default dnsConfig;
</s> + client: handle DNSSEC setting | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/79bfa6a72b6cda8c0f5211a3a6df0293c4b6c7d1 | client/src/reducers/dnsConfig.js |
"resolve_clients_desc": "If enabled, AdGuard Home will attempt to reversely resolve clients' IP addresses into their hostnames by sending PTR queries to corresponding resolvers (private DNS servers for local clients, upstream servers for clients with public IP addresses).", | <mask> "local_ptr_title": "Private reverse DNS servers",
<mask> "local_ptr_desc": "The DNS servers that AdGuard Home uses for local PTR queries. These servers are used to resolve the hostnames of clients with private IP addresses, for example \"192.168.12.34\", using rDNS. If not set, AdGuard Home uses the de... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4 | client/src/__locales/en.json |
"host_whitelisted": "The host is allowed", | <mask> "form_enter_host": "Enter a host name",
<mask> "filtered_custom_rules": "Filtered by Custom filtering rules",
<mask> "choose_from_list": "Choose from the list",
<mask> "add_custom_list": "Add a custom list",
<mask> "host_whitelisted": "The host is whitelisted",
<mask> "check_ip": "I... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4 | client/src/__locales/en.json |
"show_whitelisted_responses": "Allowed", | <mask> "dnssec_enable_desc": "Set DNSSEC flag in the outcoming DNS queries and check the result (DNSSEC-enabled resolver is required)",
<mask> "validated_with_dnssec": "Validated with DNSSEC",
<mask> "all_queries": "All queries",
<mask> "show_blocked_responses": "Blocked",
<mask> "show_whitelis... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4 | client/src/__locales/en.json |
"filter_category_security_desc": "Lists designed specifically to block malicious, phishing, and scam domains", | <mask> "filter_category_security": "Security",
<mask> "filter_category_regional": "Regional",
<mask> "filter_category_other": "Other",
<mask> "filter_category_general_desc": "Lists that block tracking and advertising on most of the devices",
<mask> "filter_category_security_desc": "Lists that s... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7a48e92e4d3404feefd5702a485461b39aecd0a4 | client/src/__locales/en.json |
err := s.rmDynamicLeaseWithIP(l.IP)
if err != nil {
return err
} | <mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> if s.findReservedHWaddr(l.IP) != nil {
<mask> return fmt.Errorf("IP is already used")
<mask> }
<mask> s.leases = append(s.leases, &l)
<mask> s.reserveIP(l.IP, l.HWAddr)
<mask> s.dbStore()
<mask> return nil
</s> * dhcp: whe... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7acbeb89569cd0260a0e21eae3a2439b419c2e24 | dhcpd/dhcpd.go |
err := s.rmLease(l)
if err != nil {
return err | <mask> if s.findReservedHWaddr(l.IP) == nil {
<mask> return fmt.Errorf("Lease not found")
<mask> }
<mask>
<mask> var newLeases []*Lease
<mask> for _, lease := range s.leases {
<mask> if bytes.Equal(lease.IP.To4(), l.IP) {
<mask> if !bytes.Equal(lease.HWAddr, l.HWAddr) ||
<mask> lease.Hostname !... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7acbeb89569cd0260a0e21eae3a2439b419c2e24 | dhcpd/dhcpd.go |
<mask> continue
<mask> }
<mask> newLeases = append(newLeases, lease)
<mask> }
<mask> s.leases = newLeases
<mask> s.unreserveIP(l.IP)
<mask> s.dbStore()
<mask> return nil
<mask> }
<mask>
<mask> // Leases returns the list of current DHCP leases (thread-safe)
</s> * dhcp: when adding a static leas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7acbeb89569cd0260a0e21eae3a2439b419c2e24 | dhcpd/dhcpd.go | |
// isLocalClient shows if client's IP address is from locally-served
// network.
isLocalClient bool | <mask> // origReqDNSSEC shows if the DNSSEC flag in the original request from
<mask> // the client is set.
<mask> origReqDNSSEC bool
<mask> }
<mask>
<mask> // resultCode is the result of a request processing function.
<mask> type resultCode int
<mask>
</s> Pull request: 2889 internal hosts restriction
Me... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns.go |
s.processDetermineLocal, | <mask> // appropriate handler.
<mask> mods := []modProcessFunc{
<mask> processInitial,
<mask> s.processInternalHosts,
<mask> s.processRestrictLocal,
<mask> s.processInternalIPAddrs,
<mask> processClientID,
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-au... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns.go |
// processDetermineLocal determines if the client's IP address is from
// locally-served network and saves the result into the context.
func (s *Server) processDetermineLocal(dctx *dnsContext) (rc resultCode) {
rc = resultCodeSuccess
var ip net.IP
if ip = IPFromAddr(dctx.proxyCtx.Addr); ip == nil {
return rc
}
... | <mask> }
<mask>
<mask> // hostToIP tries to get an IP leased by DHCP and returns the copy of address
<mask> // since the data inside the internal table may be changed while request
<mask> // processing. It's safe for concurrent use.
<mask> func (s *Server) hostToIP(host string) (ip net.IP, ok bool) {
<mask> s... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns.go |
d := dctx.proxyCtx
if !dctx.isLocalClient {
log.Debug("dns: %q requests for internal host", d.Addr)
d.Res = s.genNXDomain(req)
// Do not even put into query log.
return resultCodeFinish
} | <mask> if host == reqHost {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // TODO(e.burkov): Restrict the access for external clients.
<mask>
<mask> ip, ok := s.hostToIP(host)
<mask> if !ok {
<mask> return resultCodeSuccess
<mask> }
</s> Pull request: 2889 internal hosts restriction
Mer... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns.go |
// TODO(e.burkov): Inspect special cases when user want to apply
// some rules handled by other processors to the hosts with TLD.
d.Res = s.genNXDomain(req)
return resultCodeFinish | <mask> // TODO(e.burkov): Restrict the access for external clients.
<mask>
<mask> ip, ok := s.hostToIP(host)
<mask> if !ok {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> log.Debug("dns: internal record: %s -> %s", q.Name, ip)
<mask>
<mask> resp := s.makeResponse(req)
</s> Pull request: 2... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns.go |
// processRestrictLocal responds with NXDOMAIN to PTR requests for IP addresses
// in locally-served network from external clients. | <mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // processRestrictLocal responds with empty answers to PTR requests for IP
<mask> // addresses in locally-served network from external clients.
<mask> func (s *Server) processRestrictLocal(ctx *dnsContext) (rc resultCode) {
<mask> d := ctx.proxyC... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns.go |
if !ctx.isLocalClient {
log.Debug("dns: %q requests for internal ip", d.Addr)
d.Res = s.genNXDomain(req) | <mask> // Restrict an access to local addresses for external clients. We also
<mask> // assume that all the DHCP leases we give are locally-served or at
<mask> // least don't need to be unaccessable externally.
<mask> if s.subnetDetector.IsLocallyServedNetwork(ip) {
<mask> clientIP := IPFromAddr(d.Addr)
<m... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghnet" | <mask> import (
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/miekg/dns"... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns_test.go |
func TestServer_ProcessDetermineLocal(t *testing.T) {
snd, err := aghnet.NewSubnetDetector()
require.NoError(t, err)
s := &Server{
subnetDetector: snd,
}
testCases := []struct {
name string
cliIP net.IP
want bool
}{{
name: "local",
cliIP: net.IP{192, 168, 0, 1},
want: true,
}, {
name: "exte... | <mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestServer_ProcessInternalHosts(t *testing.T) {
<mask> knownIP := net.IP{1, 2, 3, 4}
<mask> testCases := []struct {
<mask> name string
<mask> host string
<mask> suffix ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns_test.go |
<mask> knownIP := net.IP{1, 2, 3, 4}
<mask> testCases := []struct {
<mask> name string
<mask> host string
<mask> suffix string
<mask> wantErrMsg string
<mask> wantIP net.IP
<mask> qtyp uint16
<mask> wantRes resultCode
<mask> }{{
<mask> name: "success_exte... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns_test.go | |
<mask> host string
<mask> suffix string
<mask> wantErrMsg string
<mask> wantIP net.IP
<mask> qtyp uint16
<mask> wantRes resultCode
<mask> }{{
<mask> name: "success_external",
<mask> host: "example.com",
<mask> suffix: defaultAutohostSuffix,
</s> Pull ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns_test.go | |
isLocalCli bool | <mask> host string
<mask> wantIP net.IP
<mask> wantRes resultCode
<mask> }{{
<mask> name: "local_client_success",
<mask> host: "example.lan",
<mask> wantIP: knownIP,
</s> Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns_test.go |
name: "local_client_success", | <mask> wantIP net.IP
<mask> qtyp uint16
<mask> wantRes resultCode
<mask> }{{
<mask> name: "success_external",
<mask> host: "example.com",
<mask> suffix: defaultAutohostSuffix,
<mask> wantErrMsg: "",
<mask> wantIP: nil,
<mask> qtyp: dns.TypeA,
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/7afc692632a09a1310aca265c6b788817ead660a | internal/dnsforward/dns_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.