mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 02:18:28 -07:00
0a66913b4d
Close #1212 * Server.Start(config *ServerConfig) -> Start() + Server.Prepare(config *ServerConfig) + Server.Resolve(host string) + Server.Exchange() * rDNS: use internal DNS resolver - clients: fix race in WriteDiskConfig() - fix race: move 'clients' object from 'configuration' to 'HomeContext' Go race detector didn't like our 'clients' object in 'configuration'. + add AGH startup test . Create a configuration file . Start AGH instance . Check Web server . Check DNS server . Wait until the filters are downloaded . Stop and cleanup * move module objects from config.* to Context.* * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning * ci.sh: 'make' and then run tests Squashed commit of the following: commit 86500c7f749307f37af4cc8c2a1066f679d0cfad Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:53 2019 +0300 minor commit 6e6abb9dca3cd250c458bec23aa30d2250a9eb40 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 18:08:31 2019 +0300 * ci.sh: 'make' and then run tests commit 114192eefea6800e565ba9ab238202c006516c27 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:50:04 2019 +0300 fix commit d426deea7f02cdfd4c7217a38c59e51251956a0f Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 17:46:33 2019 +0300 tests commit 7b350edf03027895b4e43dee908d0155a9b0ac9b Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:56:12 2019 +0300 fix test commit 2f5f116873bbbfdd4bb7f82a596f9e1f5c2bcfd8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:48:56 2019 +0300 fix tests commit 3fbdc77f9c34726e2295185279444983652d559e Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:45:00 2019 +0300 linter commit 9da0b6965a2b6863bcd552fa83a4de2866600bb8 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:33:23 2019 +0300 * config.dnsctx.whois -> Context.whois commit c71ebdbdf6efd88c877b2f243c69d3bc00a997d7 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:31:08 2019 +0300 * don't call log.SetLevel() if not necessary This helps to avoid Go race detector's warning commit 0f250220133cefdcb0843a50000cb932802b8324 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 15:28:19 2019 +0300 * rdns: refactor commit c460d8c9414940dac852e390b6c1b4d4fb38dff9 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 14:08:08 2019 +0300 Revert: * stats: serialize access to 'limit' Use 'conf *Config' and update it atomically, as in querylog module. (Note: Race detector still doesn't like it) commit 488bcb884971276de0d5629384b29e22c59ee7e6 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:50:23 2019 +0300 * config.dnsFilter -> Context.dnsFilter commit 86c0a6827a450414b50acec7ebfc5220d13b81e4 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:45:05 2019 +0300 * config.dnsServer -> Context.dnsServer commit ee35ef095ccaabc89e3de0ef52c9b5ed56b36873 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:42:10 2019 +0300 * config.dhcpServer -> Context.dhcpServer commit 1537001cd211099d5fad01696c0b806ae5d257b1 Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:39:45 2019 +0300 * config.queryLog -> Context.queryLog commit e5955fe4ff1ef6f41763461b37b502ea25a3d04c Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Dec 10 13:03:18 2019 +0300 * config.httpsServer -> Context.httpsServer commit 6153c10a9ac173e159d1f05e0db1512579b9203c Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:12:24 2019 +0300 * config.httpServer -> Context.httpServer commit abd021fb94039015cd45c97614e8b78d4694f956 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 20:08:05 2019 +0300 * stats: serialize access to 'limit' commit 38c2decfd87c712100edcabe62a6d4518719cb53 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:57:04 2019 +0300 * config.stats -> Context.stats commit 6caf8965ad44db9dce9a7a5103aa8fa305ad9a06 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Dec 9 19:45:23 2019 +0300 fix Restart() ... and 6 more commits
130 lines
2.9 KiB
Go
130 lines
2.9 KiB
Go
package home
|
|
|
|
import (
|
|
"encoding/binary"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/dnsforward"
|
|
"github.com/AdguardTeam/golibs/cache"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// RDNS - module context
|
|
type RDNS struct {
|
|
dnsServer *dnsforward.Server
|
|
clients *clientsContainer
|
|
ipChannel chan string // pass data from DNS request handling thread to rDNS thread
|
|
|
|
// Contains IP addresses of clients to be resolved by rDNS
|
|
// If IP address is resolved, it stays here while it's inside Clients.
|
|
// If it's removed from Clients, this IP address will be resolved once again.
|
|
// If IP address couldn't be resolved, it stays here for some time to prevent further attempts to resolve the same IP.
|
|
ipAddrs cache.Cache
|
|
}
|
|
|
|
// InitRDNS - create module context
|
|
func InitRDNS(dnsServer *dnsforward.Server, clients *clientsContainer) *RDNS {
|
|
r := RDNS{}
|
|
r.dnsServer = dnsServer
|
|
r.clients = clients
|
|
|
|
cconf := cache.Config{}
|
|
cconf.EnableLRU = true
|
|
cconf.MaxCount = 10000
|
|
r.ipAddrs = cache.New(cconf)
|
|
|
|
r.ipChannel = make(chan string, 256)
|
|
go r.workerLoop()
|
|
return &r
|
|
}
|
|
|
|
// Begin - add IP address to rDNS queue
|
|
func (r *RDNS) Begin(ip string) {
|
|
now := uint64(time.Now().Unix())
|
|
expire := r.ipAddrs.Get([]byte(ip))
|
|
if len(expire) != 0 {
|
|
exp := binary.BigEndian.Uint64(expire)
|
|
if exp > now {
|
|
return
|
|
}
|
|
// TTL expired
|
|
}
|
|
expire = make([]byte, 8)
|
|
const ttl = 1 * 60 * 60
|
|
binary.BigEndian.PutUint64(expire, now+ttl)
|
|
_ = r.ipAddrs.Set([]byte(ip), expire)
|
|
|
|
if r.clients.Exists(ip, ClientSourceRDNS) {
|
|
return
|
|
}
|
|
|
|
log.Tracef("rDNS: adding %s", ip)
|
|
select {
|
|
case r.ipChannel <- ip:
|
|
//
|
|
default:
|
|
log.Tracef("rDNS: queue is full")
|
|
}
|
|
}
|
|
|
|
// Use rDNS to get hostname by IP address
|
|
func (r *RDNS) resolve(ip string) string {
|
|
log.Tracef("Resolving host for %s", ip)
|
|
|
|
req := dns.Msg{}
|
|
req.Id = dns.Id()
|
|
req.RecursionDesired = true
|
|
req.Question = []dns.Question{
|
|
{
|
|
Qtype: dns.TypePTR,
|
|
Qclass: dns.ClassINET,
|
|
},
|
|
}
|
|
var err error
|
|
req.Question[0].Name, err = dns.ReverseAddr(ip)
|
|
if err != nil {
|
|
log.Debug("Error while calling dns.ReverseAddr(%s): %s", ip, err)
|
|
return ""
|
|
}
|
|
|
|
resp, err := r.dnsServer.Exchange(&req)
|
|
if err != nil {
|
|
log.Debug("Error while making an rDNS lookup for %s: %s", ip, err)
|
|
return ""
|
|
}
|
|
if len(resp.Answer) == 0 {
|
|
log.Debug("No answer for rDNS lookup of %s", ip)
|
|
return ""
|
|
}
|
|
ptr, ok := resp.Answer[0].(*dns.PTR)
|
|
if !ok {
|
|
log.Debug("not a PTR response for %s", ip)
|
|
return ""
|
|
}
|
|
|
|
log.Tracef("PTR response for %s: %s", ip, ptr.String())
|
|
if strings.HasSuffix(ptr.Ptr, ".") {
|
|
ptr.Ptr = ptr.Ptr[:len(ptr.Ptr)-1]
|
|
}
|
|
|
|
return ptr.Ptr
|
|
}
|
|
|
|
// Wait for a signal and then synchronously resolve hostname by IP address
|
|
// Add the hostname:IP pair to "Clients" array
|
|
func (r *RDNS) workerLoop() {
|
|
for {
|
|
var ip string
|
|
ip = <-r.ipChannel
|
|
|
|
host := r.resolve(ip)
|
|
if len(host) == 0 {
|
|
continue
|
|
}
|
|
|
|
_, _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
|
|
}
|
|
}
|