mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-24 14:05:45 +03:00
ec19a85ed0
Merge in DNS/adguard-home from 4939-client-upd to master Updates #4939. Squashed commit of the following: commit 34f35822afcc8020a674cd023a5907b5b3edcb65 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Feb 10 14:01:57 2023 +0300 all: imp code, docs commit 1cd8767a38f6494c92fb5ceff26abe228fcca638 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Feb 9 17:20:56 2023 +0300 all: different ttls commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Feb 9 14:24:47 2023 +0300 all: imp code commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Feb 8 19:35:29 2023 +0300 home: fix rdns check logic
269 lines
6.3 KiB
Go
269 lines
6.3 KiB
Go
package home
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/binary"
|
|
"fmt"
|
|
"net"
|
|
"net/netip"
|
|
"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 := netip.MustParseAddr("1.2.3.4"), netip.MustParseAddr("1.2.3.5")
|
|
|
|
testCases := []struct {
|
|
cliIDIndex map[string]*Client
|
|
customChan chan netip.Addr
|
|
name string
|
|
wantLog string
|
|
ip netip.Addr
|
|
wantCacheHit int
|
|
wantCacheMiss int
|
|
}{{
|
|
cliIDIndex: map[string]*Client{},
|
|
customChan: nil,
|
|
name: "cached",
|
|
wantLog: "",
|
|
ip: ip1234,
|
|
wantCacheHit: 1,
|
|
wantCacheMiss: 0,
|
|
}, {
|
|
cliIDIndex: map[string]*Client{},
|
|
customChan: nil,
|
|
name: "not_cached",
|
|
wantLog: "rdns: queue is full",
|
|
ip: ip1235,
|
|
wantCacheHit: 0,
|
|
wantCacheMiss: 1,
|
|
}, {
|
|
cliIDIndex: map[string]*Client{"1.2.3.5": {}},
|
|
customChan: nil,
|
|
name: "already_in_clients",
|
|
wantLog: "",
|
|
ip: ip1235,
|
|
wantCacheHit: 0,
|
|
wantCacheMiss: 1,
|
|
}, {
|
|
cliIDIndex: map[string]*Client{},
|
|
customChan: make(chan netip.Addr, 1),
|
|
name: "add_to_queue",
|
|
wantLog: `rdns: "1.2.3.5" added to queue`,
|
|
ip: ip1235,
|
|
wantCacheHit: 0,
|
|
wantCacheMiss: 1,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
w.Reset()
|
|
|
|
ipCache := cache.New(cache.Config{
|
|
EnableLRU: true,
|
|
MaxCount: revDNSCacheSize,
|
|
})
|
|
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: map[netip.Addr]*RuntimeClient{},
|
|
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.ip)
|
|
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: revDNSCacheSize,
|
|
})
|
|
|
|
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 := netip.MustParseAddr("192.168.1.1")
|
|
revIPv4, err := netutil.IPToReversedAddr(localIP.AsSlice())
|
|
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) {
|
|
return aghalg.Coalesce(
|
|
aghtest.MatchedResponse(req, dns.TypePTR, revIPv4, "local.domain"),
|
|
aghtest.MatchedResponse(req, dns.TypePTR, revIPv6, "ipv6.domain"),
|
|
new(dns.Msg).SetRcode(req, dns.RcodeNameError),
|
|
), nil
|
|
},
|
|
}
|
|
|
|
errUpstream := aghtest.NewErrorUpstream()
|
|
|
|
testCases := []struct {
|
|
ups upstream.Upstream
|
|
cliIP netip.Addr
|
|
wantLog string
|
|
name string
|
|
wantClientSource clientSource
|
|
}{{
|
|
ups: locUpstream,
|
|
cliIP: localIP,
|
|
wantLog: "",
|
|
name: "all_good",
|
|
wantClientSource: ClientSourceRDNS,
|
|
}, {
|
|
ups: errUpstream,
|
|
cliIP: netip.MustParseAddr("192.168.1.2"),
|
|
wantLog: `rdns: resolving "192.168.1.2": test upstream error`,
|
|
name: "resolve_error",
|
|
wantClientSource: ClientSourceNone,
|
|
}, {
|
|
ups: locUpstream,
|
|
cliIP: netip.MustParseAddr("2a00:1450:400c:c06::93"),
|
|
wantLog: "",
|
|
name: "ipv6_good",
|
|
wantClientSource: ClientSourceRDNS,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
w.Reset()
|
|
|
|
cc := &clientsContainer{
|
|
list: map[string]*Client{},
|
|
idIndex: map[string]*Client{},
|
|
ipToRC: map[netip.Addr]*RuntimeClient{},
|
|
allTags: stringutil.NewSet(),
|
|
}
|
|
ch := make(chan netip.Addr)
|
|
rdns := &RDNS{
|
|
exchanger: &rDNSExchanger{
|
|
ex: tc.ups,
|
|
},
|
|
clients: cc,
|
|
ipCh: ch,
|
|
ipCache: cache.New(cache.Config{
|
|
EnableLRU: true,
|
|
MaxCount: revDNSCacheSize,
|
|
}),
|
|
}
|
|
|
|
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)
|
|
}
|
|
|
|
assert.Equal(t, tc.wantClientSource, cc.clientSource(tc.cliIP))
|
|
})
|
|
}
|
|
}
|