f5adf15c8c
Updates #3022. Squashed commit of the following: commit 2f63b4e1765d9c9bfeadafcfa42c9d8741b628e1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 28 21:29:28 2021 +0300 aghnet: fix doc commit efdc1bb2c8959a9f888d558c32c415e6f3678b0c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 28 21:19:54 2021 +0300 all: doc changes commit 8154797095874771bcf04d109644e6ae33fcb470 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 28 21:15:42 2021 +0300 aghnet: imp host validation for system resolvers
115 lines
2.6 KiB
Go
115 lines
2.6 KiB
Go
// +build !windows
|
|
|
|
package aghnet
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/agherr"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
|
|
)
|
|
|
|
// 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 {
|
|
resolver *net.Resolver
|
|
hostGenFunc HostGenFunc
|
|
|
|
// addrs is the set that contains cached local resolvers' addresses.
|
|
addrs *aghstrings.Set
|
|
addrsLock sync.RWMutex
|
|
}
|
|
|
|
func (sr *systemResolvers) refresh() (err error) {
|
|
defer agherr.Annotate("systemResolvers: %w", &err)
|
|
|
|
_, 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(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
|
|
if hostGenFunc == nil {
|
|
hostGenFunc = defaultHostGen
|
|
}
|
|
s := &systemResolvers{
|
|
resolver: &net.Resolver{
|
|
PreferGo: true,
|
|
},
|
|
hostGenFunc: hostGenFunc,
|
|
addrs: aghstrings.NewSet(),
|
|
}
|
|
s.resolver.Dial = s.dialFunc
|
|
|
|
return s
|
|
}
|
|
|
|
// validateDialedHost validated the host used by resolvers in dialFunc.
|
|
func validateDialedHost(host string) (err error) {
|
|
defer agherr.Annotate("parsing %q: %w", &err, host)
|
|
|
|
var ipStr string
|
|
parts := strings.Split(host, "%")
|
|
switch len(parts) {
|
|
case 1:
|
|
ipStr = host
|
|
case 2:
|
|
// Remove the zone and check the IP address part.
|
|
ipStr = parts[0]
|
|
default:
|
|
return errUnexpectedHostFormat
|
|
}
|
|
|
|
if net.ParseIP(ipStr) == nil {
|
|
return errBadAddrPassed
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// 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 = 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)
|
|
}
|
|
|
|
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()
|
|
}
|