mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 21:15:35 +03:00
82505566f8
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb
147 lines
3.9 KiB
Go
147 lines
3.9 KiB
Go
//go:build !windows
|
|
// +build !windows
|
|
|
|
package aghnet
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/AdguardTeam/golibs/stringutil"
|
|
)
|
|
|
|
// defaultHostGen is the default method of generating host for Refresh.
|
|
func defaultHostGen() (host string) {
|
|
// TODO(e.burkov): Use strings.Builder.
|
|
return fmt.Sprintf("test%d.org", time.Now().UnixNano())
|
|
}
|
|
|
|
// systemResolvers is a default implementation of SystemResolvers interface.
|
|
type systemResolvers struct {
|
|
// addrsLock protects addrs.
|
|
addrsLock sync.RWMutex
|
|
// addrs is the set that contains cached local resolvers' addresses.
|
|
addrs *stringutil.Set
|
|
|
|
// resolver is used to fetch the resolvers' addresses.
|
|
resolver *net.Resolver
|
|
// hostGenFunc generates hosts to resolve.
|
|
hostGenFunc HostGenFunc
|
|
}
|
|
|
|
const (
|
|
// errBadAddrPassed is returned when dialFunc can't parse an IP address.
|
|
errBadAddrPassed errors.Error = "the passed string is not a valid IP address"
|
|
|
|
// errFakeDial is an error which dialFunc is expected to return.
|
|
errFakeDial errors.Error = "this error signals the successful dialFunc work"
|
|
|
|
// errUnexpectedHostFormat is returned by validateDialedHost when the host has
|
|
// more than one percent sign.
|
|
errUnexpectedHostFormat errors.Error = "unexpected host format"
|
|
)
|
|
|
|
// refresh implements the SystemResolvers interface for *systemResolvers.
|
|
func (sr *systemResolvers) refresh() (err error) {
|
|
defer func() { err = errors.Annotate(err, "systemResolvers: %w") }()
|
|
|
|
_, err = sr.resolver.LookupHost(context.Background(), sr.hostGenFunc())
|
|
dnserr := &net.DNSError{}
|
|
if errors.As(err, &dnserr) && dnserr.Err == errFakeDial.Error() {
|
|
return nil
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) {
|
|
if hostGenFunc == nil {
|
|
hostGenFunc = defaultHostGen
|
|
}
|
|
s := &systemResolvers{
|
|
resolver: &net.Resolver{
|
|
PreferGo: true,
|
|
},
|
|
hostGenFunc: hostGenFunc,
|
|
addrs: stringutil.NewSet(),
|
|
}
|
|
s.resolver.Dial = s.dialFunc
|
|
|
|
return s
|
|
}
|
|
|
|
// validateDialedHost validated the host used by resolvers in dialFunc.
|
|
func validateDialedHost(host string) (err error) {
|
|
defer func() { err = errors.Annotate(err, "parsing %q: %w", host) }()
|
|
|
|
parts := strings.Split(host, "%")
|
|
switch len(parts) {
|
|
case 1:
|
|
// host
|
|
case 2:
|
|
// Remove the zone and check the IP address part.
|
|
host = parts[0]
|
|
default:
|
|
return errUnexpectedHostFormat
|
|
}
|
|
|
|
if _, err = netutil.ParseIP(host); err != nil {
|
|
return errBadAddrPassed
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// dockerEmbeddedDNS is the address of Docker's embedded DNS server.
|
|
//
|
|
// See
|
|
// https://github.com/moby/moby/blob/v1.12.0/docs/userguide/networking/dockernetworks.md.
|
|
const dockerEmbeddedDNS = "127.0.0.11"
|
|
|
|
// dialFunc gets the resolver's address and puts it into internal cache.
|
|
func (sr *systemResolvers) dialFunc(_ context.Context, _, address string) (_ net.Conn, err error) {
|
|
// Just validate the passed address is a valid IP.
|
|
var host string
|
|
host, err = netutil.SplitHost(address)
|
|
if err != nil {
|
|
// TODO(e.burkov): Maybe use a structured errBadAddrPassed to
|
|
// allow unwrapping of the real error.
|
|
return nil, fmt.Errorf("%s: %w", err, errBadAddrPassed)
|
|
}
|
|
|
|
// Exclude Docker's embedded DNS server, as it may cause recursion if
|
|
// the container is set as the host system's default DNS server.
|
|
//
|
|
// See https://github.com/AdguardTeam/AdGuardHome/issues/3064.
|
|
//
|
|
// TODO(a.garipov): Perhaps only do this when we are in the container?
|
|
// Maybe use an environment variable?
|
|
if host == dockerEmbeddedDNS {
|
|
return nil, errFakeDial
|
|
}
|
|
|
|
err = validateDialedHost(host)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("validating dialed host: %w", err)
|
|
}
|
|
|
|
sr.addrsLock.Lock()
|
|
defer sr.addrsLock.Unlock()
|
|
|
|
sr.addrs.Add(host)
|
|
|
|
return nil, errFakeDial
|
|
}
|
|
|
|
func (sr *systemResolvers) Get() (rs []string) {
|
|
sr.addrsLock.RLock()
|
|
defer sr.addrsLock.RUnlock()
|
|
|
|
return sr.addrs.Values()
|
|
}
|