mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-04 22:59:29 +00:00
Merge in DNS/adguard-home from AGDNS-2374-imp-filtering-slog to master
Squashed commit of the following:
commit 6040411aa2eeea62305acd3d99a6ea88a3998f38
Merge: 880c024ce 3c05f7799
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Jul 9 09:32:45 2025 +0400
Merge remote-tracking branch 'origin/master' into AGDNS-2374-imp-filtering-slog
commit 880c024ce2ea2190fae4794c262eef3d4ec90687
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Jul 1 16:54:08 2025 +0400
all: imp code
commit de62c55be126c2214e6576a39b07405a6e451aa6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 15:16:58 2025 +0400
filtering: slog
commit 9bc1abfac1b9d183fe44e56d2b57b73d6507441a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 15:13:24 2025 +0400
filtering: slog
commit 88b251e974f78832b1fb4b149c2314471a931490
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 14:13:37 2025 +0400
filtering: slog
commit 2a6939865d8398c075d1eae2f9315bb81238b9ff
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 12:29:48 2025 +0400
all: init filtering logger
commit 94609444fb54b3a996806606ec7014aec8dcc65e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 11:43:51 2025 +0400
filtering: imp rewrite
commit 84544cce8a65ad4cf6af793b0aaf55a902f0109f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Jun 30 11:39:58 2025 +0400
filtering: imp hashprefix
commit b88d8799c04c2a45ba43aa1ebd614347686a4148
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 27 13:07:09 2025 +0400
filtering: imp hashprefix
commit 904a847684d6e6d3aa55dfc478d5b6c4dc8767db
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 27 12:57:14 2025 +0400
filtering: rewrite slog
commit 2669388fea2ba4b2e0d470d780714429b43d246b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Jun 27 12:36:34 2025 +0400
filtering: hashprefix slog
194 lines
3.4 KiB
Go
194 lines
3.4 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/miekg/dns"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
// fakeIpsetMgr is a fake aghnet.IpsetManager for tests.
|
|
type fakeIpsetMgr struct {
|
|
ip4s []net.IP
|
|
ip6s []net.IP
|
|
}
|
|
|
|
// Add implements the aghnet.IpsetManager interface for *fakeIpsetMgr.
|
|
func (m *fakeIpsetMgr) Add(_ context.Context, host string, ip4s, ip6s []net.IP) (n int, err error) {
|
|
m.ip4s = append(m.ip4s, ip4s...)
|
|
m.ip6s = append(m.ip6s, ip6s...)
|
|
|
|
return len(ip4s) + len(ip6s), nil
|
|
}
|
|
|
|
// Close implements the aghnet.IpsetManager interface for *fakeIpsetMgr.
|
|
func (*fakeIpsetMgr) Close() (err error) {
|
|
return nil
|
|
}
|
|
|
|
func TestIpsetCtx_process(t *testing.T) {
|
|
ip4 := net.IP{1, 2, 3, 4}
|
|
ip6 := net.IP{
|
|
0x12, 0x34, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x56, 0x78,
|
|
}
|
|
|
|
req4 := createTestMessageWithType("example.com", dns.TypeA)
|
|
req6 := createTestMessageWithType("example.com", dns.TypeAAAA)
|
|
|
|
resp4 := &dns.Msg{
|
|
Answer: []dns.RR{&dns.A{
|
|
A: ip4,
|
|
}},
|
|
}
|
|
resp6 := &dns.Msg{
|
|
Answer: []dns.RR{&dns.AAAA{
|
|
AAAA: ip6,
|
|
}},
|
|
}
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
dctx := &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{},
|
|
|
|
responseFromUpstream: true,
|
|
}
|
|
|
|
ictx := &ipsetHandler{
|
|
logger: testLogger,
|
|
}
|
|
rc := ictx.process(dctx)
|
|
assert.Equal(t, resultCodeSuccess, rc)
|
|
|
|
err := ictx.close()
|
|
assert.NoError(t, err)
|
|
})
|
|
|
|
t.Run("ipv4", func(t *testing.T) {
|
|
dctx := &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: req4,
|
|
Res: resp4,
|
|
},
|
|
|
|
responseFromUpstream: true,
|
|
}
|
|
|
|
m := &fakeIpsetMgr{}
|
|
ictx := &ipsetHandler{
|
|
ipsetMgr: m,
|
|
logger: testLogger,
|
|
}
|
|
|
|
rc := ictx.process(dctx)
|
|
assert.Equal(t, resultCodeSuccess, rc)
|
|
assert.Equal(t, []net.IP{ip4}, m.ip4s)
|
|
assert.Empty(t, m.ip6s)
|
|
|
|
err := ictx.close()
|
|
assert.NoError(t, err)
|
|
})
|
|
|
|
t.Run("ipv6", func(t *testing.T) {
|
|
dctx := &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: req6,
|
|
Res: resp6,
|
|
},
|
|
|
|
responseFromUpstream: true,
|
|
}
|
|
|
|
m := &fakeIpsetMgr{}
|
|
ictx := &ipsetHandler{
|
|
ipsetMgr: m,
|
|
logger: testLogger,
|
|
}
|
|
|
|
rc := ictx.process(dctx)
|
|
assert.Equal(t, resultCodeSuccess, rc)
|
|
assert.Empty(t, m.ip4s)
|
|
assert.Equal(t, []net.IP{ip6}, m.ip6s)
|
|
|
|
err := ictx.close()
|
|
assert.NoError(t, err)
|
|
})
|
|
}
|
|
|
|
func TestIpsetCtx_SkipIpsetProcessing(t *testing.T) {
|
|
req4 := createTestMessage("example.com")
|
|
resp4 := &dns.Msg{
|
|
Answer: []dns.RR{&dns.A{
|
|
A: net.IP{1, 2, 3, 4},
|
|
}},
|
|
}
|
|
|
|
m := &fakeIpsetMgr{}
|
|
ictx := &ipsetHandler{
|
|
ipsetMgr: m,
|
|
logger: testLogger,
|
|
}
|
|
|
|
testCases := []struct {
|
|
dctx *dnsContext
|
|
name string
|
|
want bool
|
|
}{{
|
|
name: "basic",
|
|
want: false,
|
|
dctx: &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: req4,
|
|
Res: resp4,
|
|
},
|
|
|
|
responseFromUpstream: true,
|
|
},
|
|
}, {
|
|
name: "rewrite",
|
|
want: true,
|
|
dctx: &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: req4,
|
|
Res: resp4,
|
|
},
|
|
|
|
responseFromUpstream: false,
|
|
},
|
|
}, {
|
|
name: "empty_req",
|
|
want: true,
|
|
dctx: &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: nil,
|
|
Res: resp4,
|
|
},
|
|
|
|
responseFromUpstream: true,
|
|
},
|
|
}, {
|
|
name: "empty_res",
|
|
want: true,
|
|
dctx: &dnsContext{
|
|
proxyCtx: &proxy.DNSContext{
|
|
Req: req4,
|
|
Res: nil,
|
|
},
|
|
|
|
responseFromUpstream: true,
|
|
},
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
got := ictx.skipIpsetProcessing(tc.dctx)
|
|
assert.Equal(t, tc.want, got)
|
|
})
|
|
}
|
|
}
|