86444eacc2
Merge in DNS/adguard-home from 2704-local-addresses-vol.2 to master Updates #2704. Updates #2829. Squashed commit of the following: commit 507d038c2709de59246fc0b65c3c4ab8e38d1990 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 14:33:05 2021 +0300 aghtest: fix file name commit 8e19f99337bee1d88ad6595adb96f9bb23fa3c41 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 14:06:43 2021 +0300 aghnet: rm redundant mutexes commit 361fa418b33ed160ca20862be1c455ab9378c03f Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:45:30 2021 +0300 all: fix names, docs commit 14034f4f0230d7aaa3645054946ae5c278089a99 Merge: 35e265cca72ce1cf
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:38:15 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.2 commit 35e265cc8cd308ef1fda414b58c0217cb5f258e4 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 31 13:33:35 2021 +0300 aghnet: imp naming commit 7a7edac7208a40697d7bc50682b923a144e28e2b Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 30 20:59:54 2021 +0300 changelog: oops, nope yet commit d26a5d2513daf662ac92053b5e235189a64cc022 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 30 20:55:53 2021 +0300 all: some renaming for the glory of semantics commit 9937fa619452b0742616217b975e3ff048d58acb Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Mar 29 15:34:42 2021 +0300 all: log changes commit d8d9e6dfeea8474466ee25f27021efdd3ddb1592 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 26 18:32:23 2021 +0300 all: imp localresolver, imp cutting off own addresses commit 344140df449b85925f19b460fd7dc7c08e29c35a Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 26 14:53:33 2021 +0300 all: imp code quality commit 1c5c0babec73b125044e23dd3aa75d8eefc19b28 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 20:44:08 2021 +0300 all: fix go.mod commit 0b9fb3c2369a752e893af8ddc45a86bb9fb27ce5 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 20:38:51 2021 +0300 all: add error handling commit a7a2e51f57fc6f8f74b95a264ad345cd2a9e026e Merge: c13be63427f4f052
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 19:48:36 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.2 commit c13be634f47bcaed9320a732a51c0e4752d0dad0 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Mar 25 18:52:28 2021 +0300 all: cover rdns with tests, imp aghnet functionality commit 48bed9025944530c613ee53e7961d6d5fbabf8be Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 24 20:18:07 2021 +0300 home: make rdns great again commit 1dbacfc8d5b6895807797998317fe3cc814617c1 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Mar 24 16:07:52 2021 +0300 all: imp external client restriction commit 1208a319a7f4ffe7b7fa8956f245d7a19437c0a4 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Mar 22 15:26:45 2021 +0300 all: finish local ptr processor commit c8827fc3db289e1a5d7a11d057743bab39957b02 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Mar 2 13:41:22 2021 +0300 all: imp ipdetector, add local ptr processor
181 lines
3.9 KiB
Go
181 lines
3.9 KiB
Go
package aghtest
|
|
|
|
import (
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"net"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// TestUpstream is a mock of real upstream.
|
|
type TestUpstream struct {
|
|
// Addr is the address for Address method.
|
|
Addr string
|
|
// CName is a map of hostname to canonical name.
|
|
CName map[string]string
|
|
// IPv4 is a map of hostname to IPv4.
|
|
IPv4 map[string][]net.IP
|
|
// IPv6 is a map of hostname to IPv6.
|
|
IPv6 map[string][]net.IP
|
|
// Reverse is a map of address to domain name.
|
|
Reverse map[string][]string
|
|
}
|
|
|
|
// Exchange implements upstream.Upstream interface for *TestUpstream.
|
|
func (u *TestUpstream) Exchange(m *dns.Msg) (resp *dns.Msg, err error) {
|
|
resp = &dns.Msg{}
|
|
resp.SetReply(m)
|
|
|
|
if len(m.Question) == 0 {
|
|
return nil, fmt.Errorf("question should not be empty")
|
|
}
|
|
name := m.Question[0].Name
|
|
|
|
if cname, ok := u.CName[name]; ok {
|
|
resp.Answer = append(resp.Answer, &dns.CNAME{
|
|
Hdr: dns.RR_Header{
|
|
Name: name,
|
|
Rrtype: dns.TypeCNAME,
|
|
},
|
|
Target: cname,
|
|
})
|
|
}
|
|
|
|
var hasRec bool
|
|
var rrType uint16
|
|
var ips []net.IP
|
|
switch m.Question[0].Qtype {
|
|
case dns.TypeA:
|
|
rrType = dns.TypeA
|
|
if ipv4addr, ok := u.IPv4[name]; ok {
|
|
hasRec = true
|
|
ips = ipv4addr
|
|
}
|
|
case dns.TypeAAAA:
|
|
rrType = dns.TypeAAAA
|
|
if ipv6addr, ok := u.IPv6[name]; ok {
|
|
hasRec = true
|
|
ips = ipv6addr
|
|
}
|
|
case dns.TypePTR:
|
|
names, ok := u.Reverse[name]
|
|
if !ok {
|
|
break
|
|
}
|
|
|
|
for _, n := range names {
|
|
resp.Answer = append(resp.Answer, &dns.PTR{
|
|
Hdr: dns.RR_Header{
|
|
Name: n,
|
|
Rrtype: rrType,
|
|
},
|
|
Ptr: n,
|
|
})
|
|
}
|
|
}
|
|
|
|
for _, ip := range ips {
|
|
resp.Answer = append(resp.Answer, &dns.A{
|
|
Hdr: dns.RR_Header{
|
|
Name: name,
|
|
Rrtype: rrType,
|
|
},
|
|
A: ip,
|
|
})
|
|
}
|
|
|
|
if len(resp.Answer) == 0 {
|
|
if hasRec {
|
|
// Set no error RCode if there are some records for
|
|
// given Qname but we didn't apply them.
|
|
resp.SetRcode(m, dns.RcodeSuccess)
|
|
|
|
return resp, nil
|
|
}
|
|
// Set NXDomain RCode otherwise.
|
|
resp.SetRcode(m, dns.RcodeNameError)
|
|
}
|
|
|
|
return resp, nil
|
|
}
|
|
|
|
// Address implements upstream.Upstream interface for *TestUpstream.
|
|
func (u *TestUpstream) Address() string {
|
|
return u.Addr
|
|
}
|
|
|
|
// TestBlockUpstream implements upstream.Upstream interface for replacing real
|
|
// upstream in tests.
|
|
type TestBlockUpstream struct {
|
|
Hostname string
|
|
Block bool
|
|
requestsCount int
|
|
lock sync.RWMutex
|
|
}
|
|
|
|
// Exchange returns a message unique for TestBlockUpstream's Hostname-Block
|
|
// pair.
|
|
func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
|
|
u.lock.Lock()
|
|
defer u.lock.Unlock()
|
|
u.requestsCount++
|
|
|
|
hash := sha256.Sum256([]byte(u.Hostname))
|
|
hashToReturn := hex.EncodeToString(hash[:])
|
|
if !u.Block {
|
|
hashToReturn = hex.EncodeToString(hash[:])[:2] + strings.Repeat("ab", 28)
|
|
}
|
|
|
|
m := &dns.Msg{}
|
|
m.Answer = []dns.RR{
|
|
&dns.TXT{
|
|
Hdr: dns.RR_Header{
|
|
Name: r.Question[0].Name,
|
|
},
|
|
Txt: []string{
|
|
hashToReturn,
|
|
},
|
|
},
|
|
}
|
|
|
|
return m, nil
|
|
}
|
|
|
|
// Address always returns an empty string.
|
|
func (u *TestBlockUpstream) Address() string {
|
|
return ""
|
|
}
|
|
|
|
// RequestsCount returns the number of handled requests. It's safe for
|
|
// concurrent use.
|
|
func (u *TestBlockUpstream) RequestsCount() int {
|
|
u.lock.Lock()
|
|
defer u.lock.Unlock()
|
|
|
|
return u.requestsCount
|
|
}
|
|
|
|
// TestErrUpstream implements upstream.Upstream interface for replacing real
|
|
// upstream in tests.
|
|
type TestErrUpstream struct {
|
|
// The error returned by Exchange may be unwraped to the Err.
|
|
Err error
|
|
}
|
|
|
|
// Exchange always returns nil Msg and non-nil error.
|
|
func (u *TestErrUpstream) Exchange(*dns.Msg) (*dns.Msg, error) {
|
|
// We don't use an agherr.Error to avoid the import cycle since aghtests
|
|
// used to provide the utilities for testing which agherr (and any other
|
|
// testable package) should be able to use.
|
|
return nil, fmt.Errorf("errupstream: %w", u.Err)
|
|
}
|
|
|
|
// Address always returns an empty string.
|
|
func (u *TestErrUpstream) Address() string {
|
|
return ""
|
|
}
|