mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
199 lines
5.8 KiB
Go
199 lines
5.8 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/stats"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
// testQueryLog is a simple querylog.QueryLog implementation for tests.
|
|
type testQueryLog struct {
|
|
// QueryLog is embedded here simply to make testQueryLog
|
|
// a querylog.QueryLog without acctually implementing all methods.
|
|
querylog.QueryLog
|
|
|
|
lastParams querylog.AddParams
|
|
}
|
|
|
|
// Add implements the querylog.QueryLog interface for *testQueryLog.
|
|
func (l *testQueryLog) Add(p querylog.AddParams) {
|
|
l.lastParams = p
|
|
}
|
|
|
|
// testStats is a simple stats.Stats implementation for tests.
|
|
type testStats struct {
|
|
// Stats is embedded here simply to make testStats a stats.Stats without
|
|
// acctually implementing all methods.
|
|
stats.Stats
|
|
|
|
lastEntry stats.Entry
|
|
}
|
|
|
|
// Update implements the stats.Stats interface for *testStats.
|
|
func (l *testStats) Update(e stats.Entry) {
|
|
l.lastEntry = e
|
|
}
|
|
|
|
func TestProcessQueryLogsAndStats(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
proto string
|
|
addr net.Addr
|
|
clientID string
|
|
wantLogProto querylog.ClientProto
|
|
wantStatClient string
|
|
wantCode resultCode
|
|
reason dnsfilter.Reason
|
|
wantStatResult stats.Result
|
|
}{{
|
|
name: "success_udp",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls_client_id",
|
|
proto: proxy.ProtoTLS,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "cli42",
|
|
wantLogProto: querylog.ClientProtoDOT,
|
|
wantStatClient: "cli42",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_tls",
|
|
proto: proxy.ProtoTLS,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDOT,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_quic",
|
|
proto: proxy.ProtoQUIC,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDOQ,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_https",
|
|
proto: proxy.ProtoHTTPS,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDOH,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_dnscrypt",
|
|
proto: proxy.ProtoDNSCrypt,
|
|
addr: &net.TCPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: querylog.ClientProtoDNSCrypt,
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.NotFilteredNotFound,
|
|
wantStatResult: stats.RNotFiltered,
|
|
}, {
|
|
name: "success_udp_filtered",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredBlockList,
|
|
wantStatResult: stats.RFiltered,
|
|
}, {
|
|
name: "success_udp_sb",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredSafeBrowsing,
|
|
wantStatResult: stats.RSafeBrowsing,
|
|
}, {
|
|
name: "success_udp_ss",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredSafeSearch,
|
|
wantStatResult: stats.RSafeSearch,
|
|
}, {
|
|
name: "success_udp_pc",
|
|
proto: proxy.ProtoUDP,
|
|
addr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 1234},
|
|
clientID: "",
|
|
wantLogProto: "",
|
|
wantStatClient: "1.2.3.4",
|
|
wantCode: resultCodeSuccess,
|
|
reason: dnsfilter.FilteredParental,
|
|
wantStatResult: stats.RParental,
|
|
}}
|
|
|
|
ups, err := upstream.AddressToUpstream("1.1.1.1", upstream.Options{})
|
|
assert.Nil(t, err)
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
req := &dns.Msg{
|
|
Question: []dns.Question{{
|
|
Name: "example.com.",
|
|
}},
|
|
}
|
|
pctx := &proxy.DNSContext{
|
|
Proto: tc.proto,
|
|
Req: req,
|
|
Res: &dns.Msg{},
|
|
Addr: tc.addr,
|
|
Upstream: ups,
|
|
}
|
|
|
|
ql := &testQueryLog{}
|
|
st := &testStats{}
|
|
dctx := &dnsContext{
|
|
srv: &Server{
|
|
queryLog: ql,
|
|
stats: st,
|
|
},
|
|
proxyCtx: pctx,
|
|
startTime: time.Now(),
|
|
result: &dnsfilter.Result{
|
|
Reason: tc.reason,
|
|
},
|
|
clientID: tc.clientID,
|
|
}
|
|
|
|
code := processQueryLogsAndStats(dctx)
|
|
assert.Equal(t, tc.wantCode, code)
|
|
assert.Equal(t, tc.wantLogProto, ql.lastParams.ClientProto)
|
|
assert.Equal(t, tc.wantStatClient, st.lastEntry.Client)
|
|
assert.Equal(t, tc.wantStatResult, st.lastEntry.Result)
|
|
})
|
|
}
|
|
}
|