mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 21:15:35 +03:00
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
138 lines
3.3 KiB
Go
138 lines
3.3 KiB
Go
package home
|
|
|
|
import (
|
|
"encoding/binary"
|
|
"net"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
|
|
"github.com/AdguardTeam/golibs/cache"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
)
|
|
|
|
// RDNS resolves clients' addresses to enrich their metadata.
|
|
type RDNS struct {
|
|
exchanger dnsforward.RDNSExchanger
|
|
clients *clientsContainer
|
|
|
|
// usePrivate is used to store the state of current private RDNS
|
|
// resolving settings and to react to it's changes.
|
|
usePrivate uint32
|
|
|
|
// ipCh used to pass client's IP to rDNS workerLoop.
|
|
ipCh chan net.IP
|
|
|
|
// ipCache caches the IP addresses to be resolved by rDNS. The resolved
|
|
// address stays here while it's inside clients. After leaving clients
|
|
// the address will be resolved once again. If the address couldn't be
|
|
// resolved, cache prevents further attempts to resolve it for some
|
|
// time.
|
|
ipCache cache.Cache
|
|
}
|
|
|
|
// Default rDNS values.
|
|
const (
|
|
defaultRDNSCacheSize = 10000
|
|
defaultRDNSCacheTTL = 1 * 60 * 60
|
|
defaultRDNSIPChSize = 256
|
|
)
|
|
|
|
// NewRDNS creates and returns initialized RDNS.
|
|
func NewRDNS(
|
|
exchanger dnsforward.RDNSExchanger,
|
|
clients *clientsContainer,
|
|
usePrivate bool,
|
|
) (rDNS *RDNS) {
|
|
rDNS = &RDNS{
|
|
exchanger: exchanger,
|
|
clients: clients,
|
|
ipCache: cache.New(cache.Config{
|
|
EnableLRU: true,
|
|
MaxCount: defaultRDNSCacheSize,
|
|
}),
|
|
ipCh: make(chan net.IP, defaultRDNSIPChSize),
|
|
}
|
|
if usePrivate {
|
|
rDNS.usePrivate = 1
|
|
}
|
|
|
|
go rDNS.workerLoop()
|
|
|
|
return rDNS
|
|
}
|
|
|
|
// ensurePrivateCache ensures that the state of the RDNS cache is consistent
|
|
// with the current private client RDNS resolving settings.
|
|
//
|
|
// TODO(e.burkov): Clearing cache each time this value changed is not a perfect
|
|
// approach since only unresolved locally-served addresses should be removed.
|
|
// Implement when improving the cache.
|
|
func (r *RDNS) ensurePrivateCache() {
|
|
var usePrivate uint32
|
|
if r.exchanger.ResolvesPrivatePTR() {
|
|
usePrivate = 1
|
|
}
|
|
|
|
if atomic.CompareAndSwapUint32(&r.usePrivate, 1-usePrivate, usePrivate) {
|
|
r.ipCache.Clear()
|
|
}
|
|
}
|
|
|
|
// isCached returns true if ip is already cached and not expired yet. It also
|
|
// caches it otherwise.
|
|
func (r *RDNS) isCached(ip net.IP) (ok bool) {
|
|
now := uint64(time.Now().Unix())
|
|
if expire := r.ipCache.Get(ip); len(expire) != 0 {
|
|
if binary.BigEndian.Uint64(expire) > now {
|
|
return true
|
|
}
|
|
}
|
|
|
|
// The cache entry either expired or doesn't exist.
|
|
ttl := make([]byte, 8)
|
|
binary.BigEndian.PutUint64(ttl, now+defaultRDNSCacheTTL)
|
|
r.ipCache.Set(ip, ttl)
|
|
|
|
return false
|
|
}
|
|
|
|
// Begin adds the ip to the resolving queue if it is not cached or already
|
|
// resolved.
|
|
func (r *RDNS) Begin(ip net.IP) {
|
|
r.ensurePrivateCache()
|
|
|
|
if r.isCached(ip) || r.clients.Exists(ip, ClientSourceRDNS) {
|
|
return
|
|
}
|
|
|
|
select {
|
|
case r.ipCh <- ip:
|
|
log.Tracef("rdns: %q added to queue", ip)
|
|
default:
|
|
log.Tracef("rdns: queue is full")
|
|
}
|
|
}
|
|
|
|
// workerLoop handles incoming IP addresses from ipChan and adds it into
|
|
// clients.
|
|
func (r *RDNS) workerLoop() {
|
|
defer log.OnPanic("rdns")
|
|
|
|
for ip := range r.ipCh {
|
|
host, err := r.exchanger.Exchange(ip)
|
|
if err != nil {
|
|
log.Debug("rdns: resolving %q: %s", ip, err)
|
|
|
|
continue
|
|
}
|
|
|
|
if host == "" {
|
|
continue
|
|
}
|
|
|
|
// Don't handle any errors since AddHost doesn't return non-nil
|
|
// errors for now.
|
|
_, _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
|
|
}
|
|
}
|