mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 21:15:35 +03:00
d4c3a43bcb
Merge in DNS/adguard-home from add-dnssvc to master
Squashed commit of the following:
commit 55f4f114bab65a03c0d65383e89020a7356cff32
Merge: 95dc28d9 6e63757f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:53:07 2022 +0300
Merge branch 'master' into add-dnssvc
commit 95dc28d9d77d06e8ac98c1e6772557bffbf1705b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 15 20:52:50 2022 +0300
all: imp tests, docs
commit 0d9d02950d84afd160b4b1c118da856cee6f12e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:27:59 2022 +0300
all: imp docs
commit 8990e038a81da4430468da12fcebedf79fe14df6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 19:05:29 2022 +0300
all: imp tests more
commit 92730d93a2a1ac77888c2655508e43efaf0e9fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:37:48 2022 +0300
all: imp tests more
commit 8cd45ba30da7ac310e9dc666fb2af438e577b02d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Aug 11 18:11:15 2022 +0300
all: add v1 dnssvc stub; refactor tests
264 lines
5.9 KiB
Go
264 lines
5.9 KiB
Go
package home
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/binary"
|
|
"fmt"
|
|
"net"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/AdguardTeam/golibs/cache"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/AdguardTeam/golibs/stringutil"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestRDNS_Begin(t *testing.T) {
|
|
aghtest.ReplaceLogLevel(t, log.DEBUG)
|
|
w := &bytes.Buffer{}
|
|
aghtest.ReplaceLogWriter(t, w)
|
|
|
|
ip1234, ip1235 := net.IP{1, 2, 3, 4}, net.IP{1, 2, 3, 5}
|
|
|
|
testCases := []struct {
|
|
cliIDIndex map[string]*Client
|
|
customChan chan net.IP
|
|
name string
|
|
wantLog string
|
|
req net.IP
|
|
wantCacheHit int
|
|
wantCacheMiss int
|
|
}{{
|
|
cliIDIndex: map[string]*Client{},
|
|
customChan: nil,
|
|
name: "cached",
|
|
wantLog: "",
|
|
req: ip1234,
|
|
wantCacheHit: 1,
|
|
wantCacheMiss: 0,
|
|
}, {
|
|
cliIDIndex: map[string]*Client{},
|
|
customChan: nil,
|
|
name: "not_cached",
|
|
wantLog: "rdns: queue is full",
|
|
req: ip1235,
|
|
wantCacheHit: 0,
|
|
wantCacheMiss: 1,
|
|
}, {
|
|
cliIDIndex: map[string]*Client{"1.2.3.5": {}},
|
|
customChan: nil,
|
|
name: "already_in_clients",
|
|
wantLog: "",
|
|
req: ip1235,
|
|
wantCacheHit: 0,
|
|
wantCacheMiss: 1,
|
|
}, {
|
|
cliIDIndex: map[string]*Client{},
|
|
customChan: make(chan net.IP, 1),
|
|
name: "add_to_queue",
|
|
wantLog: `rdns: "1.2.3.5" added to queue`,
|
|
req: ip1235,
|
|
wantCacheHit: 0,
|
|
wantCacheMiss: 1,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
w.Reset()
|
|
|
|
ipCache := cache.New(cache.Config{
|
|
EnableLRU: true,
|
|
MaxCount: defaultRDNSCacheSize,
|
|
})
|
|
ttl := make([]byte, binary.Size(uint64(0)))
|
|
binary.BigEndian.PutUint64(ttl, uint64(time.Now().Add(100*time.Hour).Unix()))
|
|
|
|
rdns := &RDNS{
|
|
ipCache: ipCache,
|
|
exchanger: &rDNSExchanger{
|
|
ex: aghtest.NewErrorUpstream(),
|
|
},
|
|
clients: &clientsContainer{
|
|
list: map[string]*Client{},
|
|
idIndex: tc.cliIDIndex,
|
|
ipToRC: netutil.NewIPMap(0),
|
|
allTags: stringutil.NewSet(),
|
|
},
|
|
}
|
|
ipCache.Clear()
|
|
ipCache.Set(net.IP{1, 2, 3, 4}, ttl)
|
|
|
|
if tc.customChan != nil {
|
|
rdns.ipCh = tc.customChan
|
|
defer close(tc.customChan)
|
|
}
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
rdns.Begin(tc.req)
|
|
assert.Equal(t, tc.wantCacheHit, ipCache.Stats().Hit)
|
|
assert.Equal(t, tc.wantCacheMiss, ipCache.Stats().Miss)
|
|
assert.Contains(t, w.String(), tc.wantLog)
|
|
})
|
|
}
|
|
}
|
|
|
|
// rDNSExchanger is a mock dnsforward.RDNSExchanger implementation for tests.
|
|
type rDNSExchanger struct {
|
|
ex upstream.Upstream
|
|
usePrivate bool
|
|
}
|
|
|
|
// Exchange implements dnsforward.RDNSExchanger interface for *RDNSExchanger.
|
|
func (e *rDNSExchanger) Exchange(ip net.IP) (host string, err error) {
|
|
rev, err := netutil.IPToReversedAddr(ip)
|
|
if err != nil {
|
|
return "", fmt.Errorf("reversing ip: %w", err)
|
|
}
|
|
|
|
req := &dns.Msg{
|
|
Question: []dns.Question{{
|
|
Name: dns.Fqdn(rev),
|
|
Qclass: dns.ClassINET,
|
|
Qtype: dns.TypePTR,
|
|
}},
|
|
}
|
|
|
|
resp, err := e.ex.Exchange(req)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
if len(resp.Answer) == 0 {
|
|
return "", nil
|
|
}
|
|
|
|
return resp.Answer[0].Header().Name, nil
|
|
}
|
|
|
|
// Exchange implements dnsforward.RDNSExchanger interface for *RDNSExchanger.
|
|
func (e *rDNSExchanger) ResolvesPrivatePTR() (ok bool) {
|
|
return e.usePrivate
|
|
}
|
|
|
|
func TestRDNS_ensurePrivateCache(t *testing.T) {
|
|
data := []byte{1, 2, 3, 4}
|
|
|
|
ipCache := cache.New(cache.Config{
|
|
EnableLRU: true,
|
|
MaxCount: defaultRDNSCacheSize,
|
|
})
|
|
|
|
ex := &rDNSExchanger{
|
|
ex: aghtest.NewErrorUpstream(),
|
|
}
|
|
|
|
rdns := &RDNS{
|
|
ipCache: ipCache,
|
|
exchanger: ex,
|
|
}
|
|
|
|
rdns.ipCache.Set(data, data)
|
|
require.NotZero(t, rdns.ipCache.Stats().Count)
|
|
|
|
ex.usePrivate = !ex.usePrivate
|
|
|
|
rdns.ensurePrivateCache()
|
|
require.Zero(t, rdns.ipCache.Stats().Count)
|
|
}
|
|
|
|
func TestRDNS_WorkerLoop(t *testing.T) {
|
|
aghtest.ReplaceLogLevel(t, log.DEBUG)
|
|
w := &bytes.Buffer{}
|
|
aghtest.ReplaceLogWriter(t, w)
|
|
|
|
localIP := net.IP{192, 168, 1, 1}
|
|
revIPv4, err := netutil.IPToReversedAddr(localIP)
|
|
require.NoError(t, err)
|
|
|
|
revIPv6, err := netutil.IPToReversedAddr(net.ParseIP("2a00:1450:400c:c06::93"))
|
|
require.NoError(t, err)
|
|
|
|
locUpstream := &aghtest.UpstreamMock{
|
|
OnAddress: func() (addr string) { return "local.upstream.example" },
|
|
OnExchange: func(req *dns.Msg) (resp *dns.Msg, err error) {
|
|
resp = aghalg.Coalesce(
|
|
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv4, "local.domain"),
|
|
aghtest.RespondTo(t, req, dns.ClassINET, dns.TypePTR, revIPv6, "ipv6.domain"),
|
|
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
|
|
)
|
|
|
|
return resp, nil
|
|
},
|
|
}
|
|
|
|
errUpstream := aghtest.NewErrorUpstream()
|
|
|
|
testCases := []struct {
|
|
ups upstream.Upstream
|
|
wantLog string
|
|
name string
|
|
cliIP net.IP
|
|
}{{
|
|
ups: locUpstream,
|
|
wantLog: "",
|
|
name: "all_good",
|
|
cliIP: localIP,
|
|
}, {
|
|
ups: errUpstream,
|
|
wantLog: `rdns: resolving "192.168.1.2": test upstream error`,
|
|
name: "resolve_error",
|
|
cliIP: net.IP{192, 168, 1, 2},
|
|
}, {
|
|
ups: locUpstream,
|
|
wantLog: "",
|
|
name: "ipv6_good",
|
|
cliIP: net.ParseIP("2a00:1450:400c:c06::93"),
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
w.Reset()
|
|
|
|
cc := &clientsContainer{
|
|
list: map[string]*Client{},
|
|
idIndex: map[string]*Client{},
|
|
ipToRC: netutil.NewIPMap(0),
|
|
allTags: stringutil.NewSet(),
|
|
}
|
|
ch := make(chan net.IP)
|
|
rdns := &RDNS{
|
|
exchanger: &rDNSExchanger{
|
|
ex: tc.ups,
|
|
},
|
|
clients: cc,
|
|
ipCh: ch,
|
|
}
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
var wg sync.WaitGroup
|
|
wg.Add(1)
|
|
go func() {
|
|
rdns.workerLoop()
|
|
wg.Done()
|
|
}()
|
|
|
|
ch <- tc.cliIP
|
|
close(ch)
|
|
wg.Wait()
|
|
|
|
if tc.wantLog != "" {
|
|
assert.Contains(t, w.String(), tc.wantLog)
|
|
|
|
return
|
|
}
|
|
|
|
assert.True(t, cc.Exists(tc.cliIP, ClientSourceRDNS))
|
|
})
|
|
}
|
|
}
|