e08a64ebe4
Updates #2624. Updates #3162. Squashed commit of the following: commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:41:33 2021 +0300 all: imp types, names commit ebd4ec26636853d0d58c4e331e6a78feede20813 Merge: 239eb72116e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:14:33 2021 +0300 Merge branch 'master' into 2624-clientid-access commit 239eb7215abc47e99a0300a0f4cf56002689b1a9 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:13:10 2021 +0300 all: fix client blocking check commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13 Merge: 9935f2a39d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 13:12:28 2021 +0300 Merge branch 'master' into 2624-clientid-access commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jun 29 11:26:51 2021 +0300 client: show block button for client id commit ed786a6a74a081cd89e9d67df3537a4fadd54831 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 15:56:23 2021 +0300 client: imp i18n commit 4fed21c68473ad408960c08a7d87624cabce1911 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 15:34:09 2021 +0300 all: imp i18n, docs commit 55e65c0d6b939560c53dcb834a4557eb3853d194 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 13:34:01 2021 +0300 all: fix cache, imp code, docs, tests commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Jun 24 19:27:12 2021 +0300 all: allow clientid in access settings
200 lines
5.9 KiB
Go
200 lines
5.9 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
|
|
"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"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// testQueryLog is a simple querylog.QueryLog implementation for tests.
|
|
type testQueryLog struct {
|
|
// QueryLog is embedded here simply to make testQueryLog
|
|
// a querylog.QueryLog without actually 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
|
|
// actually 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 proxy.Proto
|
|
addr net.Addr
|
|
clientID string
|
|
wantLogProto querylog.ClientProto
|
|
wantStatClient string
|
|
wantCode resultCode
|
|
reason filtering.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: filtering.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: filtering.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: filtering.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: filtering.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: filtering.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: filtering.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: filtering.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: filtering.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: filtering.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: filtering.FilteredParental,
|
|
wantStatResult: stats.RParental,
|
|
}}
|
|
|
|
ups, err := upstream.AddressToUpstream("1.1.1.1", nil)
|
|
require.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: &filtering.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)
|
|
})
|
|
}
|
|
}
|