mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
7c35d208b1
Updates #1273. Squashed commit of the following: commit 55b78153b1b775c855e759011141bbbe6d4b962c Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 16:55:39 2021 +0300 Update client_info in case of null commit 5c80c1438ed9d961af11617831b704d6ae15cc34 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 16:24:14 2021 +0300 querylog: always set client_info commit b48efd64d757cc0bcf5b34de22fdd0b0464d98a6 Merge: 4ed7eab523c9f528
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 16:22:08 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit 4ed7eab52b6b5b0c0ddb5aa5a3225a62d1f9265b Merge: dbf990eb70d4c70e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 12:57:17 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit dbf990eb881116754554270e7b691b5db8e9ee34 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 12:56:13 2021 +0300 home: imp names commit c2cfdef494ca26fff62b9fa008f1b389d9d4d46b Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 19:26:04 2021 +0300 Rename to whois commit e3cc4a68ee576770b1922680155308e33bed31e8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 19:03:42 2021 +0300 home: imp whois more commit 3b8ef8691c298aff35946b35923ef2e5b1f9bbbe Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 18:51:14 2021 +0300 home: imp whois resp commit fb97e0d74976723a512d6ff4c69e830fe59c8df8 Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 18:00:03 2021 +0300 Fix client_info ids prop types commit 298005189e372651ceff453e88aca19ee925a138 Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 17:58:14 2021 +0300 Adapt changes on client commit aa1769f64197d865478a66271da483babfc5dfd0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 17:18:36 2021 +0300 all: add more fields to querylog client commit 4b2a2dbd380ec410f3068d15ea16430912e03e33 Merge: cda92c3f2e4e2f62
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 16:57:26 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit cda92c3f0331cbac252f3163d31457f716bc7f2c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 18:03:51 2021 +0300 querylog: fix windows tests commit 5a56f0a32608869ed93a38f18f63ea3a20f7bde2 Merge: 627e4958e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 17:45:53 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit 627e495828e82d44cc77aa393536479f23cc68b7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 17:44:49 2021 +0300 querylog: add tests, imp code, docs commit 6dec468a2f0c29357875ff99458e0e8f8e580e6d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Mar 26 16:10:47 2021 +0300 querylog: search clients by name, enrich http resp
266 lines
5.9 KiB
Go
266 lines
5.9 KiB
Go
package home
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/binary"
|
|
"errors"
|
|
"net"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/AdguardTeam/golibs/cache"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"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,
|
|
clients: &clientsContainer{
|
|
list: map[string]*Client{},
|
|
idIndex: tc.cliIDIndex,
|
|
ipToRC: map[string]*RuntimeClient{},
|
|
allTags: map[string]bool{},
|
|
},
|
|
}
|
|
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)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRDNS_Resolve(t *testing.T) {
|
|
extUpstream := &aghtest.TestUpstream{
|
|
Reverse: map[string][]string{
|
|
"1.1.1.1.in-addr.arpa.": {"one.one.one.one"},
|
|
},
|
|
}
|
|
locUpstream := &aghtest.TestUpstream{
|
|
Reverse: map[string][]string{
|
|
"1.1.168.192.in-addr.arpa.": {"local.domain"},
|
|
"2.1.168.192.in-addr.arpa.": {},
|
|
},
|
|
}
|
|
upstreamErr := errors.New("upstream error")
|
|
errUpstream := &aghtest.TestErrUpstream{
|
|
Err: upstreamErr,
|
|
}
|
|
nonPtrUpstream := &aghtest.TestBlockUpstream{
|
|
Hostname: "some-host",
|
|
Block: true,
|
|
}
|
|
|
|
dns := dnsforward.NewCustomServer(&proxy.Proxy{
|
|
Config: proxy.Config{
|
|
UpstreamConfig: &proxy.UpstreamConfig{
|
|
Upstreams: []upstream.Upstream{extUpstream},
|
|
},
|
|
},
|
|
})
|
|
|
|
cc := &clientsContainer{}
|
|
|
|
snd, err := aghnet.NewSubnetDetector()
|
|
require.NoError(t, err)
|
|
|
|
localIP := net.IP{192, 168, 1, 1}
|
|
testCases := []struct {
|
|
name string
|
|
want string
|
|
wantErr error
|
|
locUpstream upstream.Upstream
|
|
req net.IP
|
|
}{{
|
|
name: "external_good",
|
|
want: "one.one.one.one",
|
|
wantErr: nil,
|
|
locUpstream: nil,
|
|
req: net.IP{1, 1, 1, 1},
|
|
}, {
|
|
name: "local_good",
|
|
want: "local.domain",
|
|
wantErr: nil,
|
|
locUpstream: locUpstream,
|
|
req: localIP,
|
|
}, {
|
|
name: "upstream_error",
|
|
want: "",
|
|
wantErr: upstreamErr,
|
|
locUpstream: errUpstream,
|
|
req: localIP,
|
|
}, {
|
|
name: "empty_answer_error",
|
|
want: "",
|
|
wantErr: rDNSEmptyAnswerErr,
|
|
locUpstream: locUpstream,
|
|
req: net.IP{192, 168, 1, 2},
|
|
}, {
|
|
name: "not_ptr_error",
|
|
want: "",
|
|
wantErr: rDNSNotPTRErr,
|
|
locUpstream: nonPtrUpstream,
|
|
req: localIP,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
rdns := NewRDNS(dns, cc, snd, &aghtest.Exchanger{
|
|
Ups: tc.locUpstream,
|
|
})
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
r, rerr := rdns.resolve(tc.req)
|
|
require.ErrorIs(t, rerr, tc.wantErr)
|
|
assert.Equal(t, tc.want, r)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRDNS_WorkerLoop(t *testing.T) {
|
|
aghtest.ReplaceLogLevel(t, log.DEBUG)
|
|
w := &bytes.Buffer{}
|
|
aghtest.ReplaceLogWriter(t, w)
|
|
|
|
locUpstream := &aghtest.TestUpstream{
|
|
Reverse: map[string][]string{
|
|
"1.1.168.192.in-addr.arpa.": {"local.domain"},
|
|
},
|
|
}
|
|
|
|
snd, err := aghnet.NewSubnetDetector()
|
|
require.NoError(t, err)
|
|
|
|
testCases := []struct {
|
|
wantLog string
|
|
name string
|
|
cliIP net.IP
|
|
}{{
|
|
wantLog: "",
|
|
name: "all_good",
|
|
cliIP: net.IP{192, 168, 1, 1},
|
|
}, {
|
|
wantLog: `rdns: resolving "192.168.1.2": lookup for "2.1.168.192.in-addr.arpa.": ` +
|
|
string(rDNSEmptyAnswerErr),
|
|
name: "resolve_error",
|
|
cliIP: net.IP{192, 168, 1, 2},
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
w.Reset()
|
|
|
|
lr := &aghtest.Exchanger{
|
|
Ups: locUpstream,
|
|
}
|
|
cc := &clientsContainer{
|
|
list: map[string]*Client{},
|
|
idIndex: map[string]*Client{},
|
|
ipToRC: map[string]*RuntimeClient{},
|
|
allTags: map[string]bool{},
|
|
}
|
|
ch := make(chan net.IP)
|
|
rdns := &RDNS{
|
|
dnsServer: nil,
|
|
clients: cc,
|
|
subnetDetector: snd,
|
|
localResolvers: lr,
|
|
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.String(), ClientSourceRDNS))
|
|
})
|
|
}
|
|
}
|