557bbcbf37
Merge in DNS/adguard-home from 3184-disable-ptr to master Updates #3184. Squashed commit of the following: commit b78ac2eeb1b408586808ddbd1c87107f373b11b0 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 17:20:34 2021 +0300 all: rename dns config field commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26 Author: Ildar Kamalov <ik@adguard.com> Date: Wed May 26 15:55:44 2021 +0300 client: handle local ips rdns commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 14:43:13 2021 +0300 all: imp naming commit 771b7a3d5d25f91408dd97ba3287efb641028ccf Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 14:24:38 2021 +0300 all: imp docs, code commit be960893e8bbb7375a944ca0345b50c857a2d7cf Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 13:23:56 2021 +0300 all: imp docs & log changes commit 4e645a520f6bb584ef951435ee833ad30769af98 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 12:49:44 2021 +0300 all: add the field into structs commit 22b5b6163f086560a3189234532ba877be7ba940 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue May 25 15:10:31 2021 +0300 dnsforward: entitle lock, imp code
382 lines
8.4 KiB
Go
382 lines
8.4 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
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: "external",
|
|
cliIP: net.IP{250, 249, 0, 1},
|
|
want: false,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
proxyCtx := &proxy.DNSContext{
|
|
Addr: &net.TCPAddr{
|
|
IP: tc.cliIP,
|
|
},
|
|
}
|
|
dctx := &dnsContext{
|
|
proxyCtx: proxyCtx,
|
|
}
|
|
s.processDetermineLocal(dctx)
|
|
|
|
assert.Equal(t, tc.want, dctx.isLocalClient)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_ProcessInternalHosts_localRestriction(t *testing.T) {
|
|
knownIP := net.IP{1, 2, 3, 4}
|
|
|
|
testCases := []struct {
|
|
name string
|
|
host string
|
|
wantIP net.IP
|
|
wantRes resultCode
|
|
isLocalCli bool
|
|
}{{
|
|
name: "local_client_success",
|
|
host: "example.lan",
|
|
wantIP: knownIP,
|
|
wantRes: resultCodeSuccess,
|
|
isLocalCli: true,
|
|
}, {
|
|
name: "local_client_unknown_host",
|
|
host: "wronghost.lan",
|
|
wantIP: nil,
|
|
wantRes: resultCodeFinish,
|
|
isLocalCli: true,
|
|
}, {
|
|
name: "external_client_known_host",
|
|
host: "example.lan",
|
|
wantIP: nil,
|
|
wantRes: resultCodeFinish,
|
|
isLocalCli: false,
|
|
}, {
|
|
name: "external_client_unknown_host",
|
|
host: "wronghost.lan",
|
|
wantIP: nil,
|
|
wantRes: resultCodeFinish,
|
|
isLocalCli: false,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
s := &Server{
|
|
dhcpServer: &testDHCP{},
|
|
localDomainSuffix: defaultLocalDomainSuffix,
|
|
tableHostToIP: hostToIPTable{
|
|
"example": knownIP,
|
|
},
|
|
}
|
|
|
|
req := &dns.Msg{
|
|
MsgHdr: dns.MsgHdr{
|
|
Id: dns.Id(),
|
|
},
|
|
Question: []dns.Question{{
|
|
Name: dns.Fqdn(tc.host),
|
|
Qtype: dns.TypeA,
|
|
Qclass: dns.ClassINET,
|
|
}},
|
|
}
|
|
|
|
dctx := &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: req,
|
|
},
|
|
isLocalClient: tc.isLocalCli,
|
|
}
|
|
|
|
res := s.processInternalHosts(dctx)
|
|
require.Equal(t, tc.wantRes, res)
|
|
pctx := dctx.proxyCtx
|
|
if tc.wantRes == resultCodeFinish {
|
|
require.NotNil(t, pctx.Res)
|
|
|
|
assert.Equal(t, dns.RcodeNameError, pctx.Res.Rcode)
|
|
assert.Len(t, pctx.Res.Answer, 0)
|
|
|
|
return
|
|
}
|
|
|
|
if tc.wantIP == nil {
|
|
assert.Nil(t, pctx.Res)
|
|
} else {
|
|
require.NotNil(t, pctx.Res)
|
|
|
|
ans := pctx.Res.Answer
|
|
require.Len(t, ans, 1)
|
|
|
|
assert.Equal(t, tc.wantIP, ans[0].(*dns.A).A)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_ProcessInternalHosts(t *testing.T) {
|
|
const (
|
|
examplecom = "example.com"
|
|
examplelan = "example.lan"
|
|
)
|
|
|
|
knownIP := net.IP{1, 2, 3, 4}
|
|
testCases := []struct {
|
|
name string
|
|
host string
|
|
suffix string
|
|
wantIP net.IP
|
|
wantRes resultCode
|
|
qtyp uint16
|
|
}{{
|
|
name: "success_external",
|
|
host: examplecom,
|
|
suffix: defaultLocalDomainSuffix,
|
|
wantIP: nil,
|
|
wantRes: resultCodeSuccess,
|
|
qtyp: dns.TypeA,
|
|
}, {
|
|
name: "success_external_non_a",
|
|
host: examplecom,
|
|
suffix: defaultLocalDomainSuffix,
|
|
wantIP: nil,
|
|
wantRes: resultCodeSuccess,
|
|
qtyp: dns.TypeCNAME,
|
|
}, {
|
|
name: "success_internal",
|
|
host: examplelan,
|
|
suffix: defaultLocalDomainSuffix,
|
|
wantIP: knownIP,
|
|
wantRes: resultCodeSuccess,
|
|
qtyp: dns.TypeA,
|
|
}, {
|
|
name: "success_internal_unknown",
|
|
host: "example-new.lan",
|
|
suffix: defaultLocalDomainSuffix,
|
|
wantIP: nil,
|
|
wantRes: resultCodeFinish,
|
|
qtyp: dns.TypeA,
|
|
}, {
|
|
name: "success_internal_aaaa",
|
|
host: examplelan,
|
|
suffix: defaultLocalDomainSuffix,
|
|
wantIP: nil,
|
|
wantRes: resultCodeSuccess,
|
|
qtyp: dns.TypeAAAA,
|
|
}, {
|
|
name: "success_custom_suffix",
|
|
host: "example.custom",
|
|
suffix: ".custom.",
|
|
wantIP: knownIP,
|
|
wantRes: resultCodeSuccess,
|
|
qtyp: dns.TypeA,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
s := &Server{
|
|
dhcpServer: &testDHCP{},
|
|
localDomainSuffix: tc.suffix,
|
|
tableHostToIP: hostToIPTable{
|
|
"example": knownIP,
|
|
},
|
|
}
|
|
|
|
req := &dns.Msg{
|
|
MsgHdr: dns.MsgHdr{
|
|
Id: 1234,
|
|
},
|
|
Question: []dns.Question{{
|
|
Name: dns.Fqdn(tc.host),
|
|
Qtype: tc.qtyp,
|
|
Qclass: dns.ClassINET,
|
|
}},
|
|
}
|
|
|
|
dctx := &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: req,
|
|
},
|
|
isLocalClient: true,
|
|
}
|
|
|
|
res := s.processInternalHosts(dctx)
|
|
pctx := dctx.proxyCtx
|
|
assert.Equal(t, tc.wantRes, res)
|
|
if tc.wantRes == resultCodeFinish {
|
|
require.NotNil(t, pctx.Res)
|
|
assert.Equal(t, dns.RcodeNameError, pctx.Res.Rcode)
|
|
|
|
return
|
|
}
|
|
|
|
require.NoError(t, dctx.err)
|
|
|
|
if tc.qtyp == dns.TypeAAAA {
|
|
// TODO(a.garipov): Remove this special handling
|
|
// when we fully support AAAA.
|
|
require.NotNil(t, pctx.Res)
|
|
|
|
ans := pctx.Res.Answer
|
|
require.Len(t, ans, 0)
|
|
} else if tc.wantIP == nil {
|
|
assert.Nil(t, pctx.Res)
|
|
} else {
|
|
require.NotNil(t, pctx.Res)
|
|
|
|
ans := pctx.Res.Answer
|
|
require.Len(t, ans, 1)
|
|
|
|
assert.Equal(t, tc.wantIP, ans[0].(*dns.A).A)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_ProcessRestrictLocal(t *testing.T) {
|
|
ups := &aghtest.TestUpstream{
|
|
Reverse: map[string][]string{
|
|
"251.252.253.254.in-addr.arpa.": {"host1.example.net."},
|
|
"1.1.168.192.in-addr.arpa.": {"some.local-client."},
|
|
},
|
|
}
|
|
s := createTestServer(t, &filtering.Config{}, ServerConfig{
|
|
UDPListenAddrs: []*net.UDPAddr{{}},
|
|
TCPListenAddrs: []*net.TCPAddr{{}},
|
|
}, ups)
|
|
s.conf.UpstreamConfig.Upstreams = []upstream.Upstream{ups}
|
|
startDeferStop(t, s)
|
|
|
|
testCases := []struct {
|
|
name string
|
|
want string
|
|
question net.IP
|
|
cliIP net.IP
|
|
wantLen int
|
|
}{{
|
|
name: "from_local_to_external",
|
|
want: "host1.example.net.",
|
|
question: net.IP{254, 253, 252, 251},
|
|
cliIP: net.IP{192, 168, 10, 10},
|
|
wantLen: 1,
|
|
}, {
|
|
name: "from_external_for_local",
|
|
want: "",
|
|
question: net.IP{192, 168, 1, 1},
|
|
cliIP: net.IP{254, 253, 252, 251},
|
|
wantLen: 0,
|
|
}, {
|
|
name: "from_local_for_local",
|
|
want: "some.local-client.",
|
|
question: net.IP{192, 168, 1, 1},
|
|
cliIP: net.IP{192, 168, 1, 2},
|
|
wantLen: 1,
|
|
}, {
|
|
name: "from_external_for_external",
|
|
want: "host1.example.net.",
|
|
question: net.IP{254, 253, 252, 251},
|
|
cliIP: net.IP{254, 253, 252, 255},
|
|
wantLen: 1,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
reqAddr, err := dns.ReverseAddr(tc.question.String())
|
|
require.NoError(t, err)
|
|
req := createTestMessageWithType(reqAddr, dns.TypePTR)
|
|
|
|
pctx := &proxy.DNSContext{
|
|
Proto: proxy.ProtoTCP,
|
|
Req: req,
|
|
Addr: &net.TCPAddr{
|
|
IP: tc.cliIP,
|
|
},
|
|
}
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
err = s.handleDNSRequest(nil, pctx)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, pctx.Res)
|
|
require.Len(t, pctx.Res.Answer, tc.wantLen)
|
|
|
|
if tc.wantLen > 0 {
|
|
assert.Equal(t, tc.want, pctx.Res.Answer[0].Header().Name)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_ProcessLocalPTR_usingResolvers(t *testing.T) {
|
|
const locDomain = "some.local."
|
|
const reqAddr = "1.1.168.192.in-addr.arpa."
|
|
|
|
s := createTestServer(t, &filtering.Config{}, ServerConfig{
|
|
UDPListenAddrs: []*net.UDPAddr{{}},
|
|
TCPListenAddrs: []*net.TCPAddr{{}},
|
|
}, &aghtest.TestUpstream{
|
|
Reverse: map[string][]string{
|
|
reqAddr: {locDomain},
|
|
},
|
|
})
|
|
|
|
var proxyCtx *proxy.DNSContext
|
|
var dnsCtx *dnsContext
|
|
setup := func(use bool) {
|
|
proxyCtx = &proxy.DNSContext{
|
|
Addr: &net.TCPAddr{
|
|
IP: net.IP{127, 0, 0, 1},
|
|
},
|
|
Req: createTestMessageWithType(reqAddr, dns.TypePTR),
|
|
}
|
|
dnsCtx = &dnsContext{
|
|
proxyCtx: proxyCtx,
|
|
unreversedReqIP: net.IP{192, 168, 1, 1},
|
|
}
|
|
s.conf.UsePrivateRDNS = use
|
|
}
|
|
|
|
t.Run("enabled", func(t *testing.T) {
|
|
setup(true)
|
|
|
|
rc := s.processLocalPTR(dnsCtx)
|
|
require.Equal(t, resultCodeSuccess, rc)
|
|
require.NotEmpty(t, proxyCtx.Res.Answer)
|
|
|
|
assert.Equal(t, locDomain, proxyCtx.Res.Answer[0].Header().Name)
|
|
})
|
|
|
|
t.Run("disabled", func(t *testing.T) {
|
|
setup(false)
|
|
|
|
rc := s.processLocalPTR(dnsCtx)
|
|
require.Equal(t, resultCodeFinish, rc)
|
|
require.Empty(t, proxyCtx.Res.Answer)
|
|
})
|
|
}
|