mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
80ed8be145
Merge in DNS/adguard-home from 2704-local-addresses-vol.3 to master Updates #2704. Updates #2829. Updates #2928. Squashed commit of the following: commit 8c42355c0093a3ac6951f79a5211e7891800f93a Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Apr 7 18:07:41 2021 +0300 dnsforward: rm errors pkg commit 7594a21a620239951039454dd5686a872e6f41a8 Merge: 830b0834908452f8
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Apr 7 18:00:03 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.3 commit 830b0834090510096061fed20b600195ab3773b8 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Apr 7 17:47:51 2021 +0300 dnsforward: reduce local upstream timeout commit 493e81d9e8bacdc690f88af29a38d211b9733c7e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 19:11:00 2021 +0300 client: private_upstream test commit a0194ac28f15114578359b8c2460cd9af621e912 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 18:36:23 2021 +0300 all: expand api, fix conflicts commit 0f4e06836fed958391aa597c8b02453564980ca3 Merge: 89cf93ad8746005d
Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 18:35:04 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.3 commit 89cf93ad4f26c2bf4f1b18ecaa4d3a1e169f9b06 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:02:40 2021 +0300 client: add local ptr upstreams to upstream test commit e6dd869dddd4888474d625cbb005bad6390e4760 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 15:24:22 2021 +0300 client: add private DNS form commit b858057b9a957a416117f22b8bd0025f90e8c758 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 13:05:28 2021 +0300 aghstrings: mk cloning correct commit 8009ba60a6a7d6ceb7b6483a29f4e68d533af243 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 12:37:46 2021 +0300 aghstrings: fix lil bug commit 0dd19f2e7cc7c0de21517c37abd8336a907e1c0d Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 20:45:01 2021 +0300 all: log changes commit eb5558d96fffa6e7bca7e14d3740d26e47382e23 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 20:18:53 2021 +0300 dnsforward: keep the style commit d6d5fcbde40a633129c0e04887b81cf0b1ce6875 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 20:02:52 2021 +0300 dnsforward: disable redundant filtering for local ptr commit 4f864c32027d10db9bcb4a264d2338df8c20afac Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 17:53:17 2021 +0300 dnsforward: imp tests commit 7848e6f2341868f8ba0bb839956a0b7444cf02ca Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 14:52:12 2021 +0300 all: imp code commit 19ac30653800eebf8aaee499f65560ae2d458a5a Author: Eugene Burkov <e.burkov@adguard.com> Date: Sun Apr 4 16:28:05 2021 +0300 all: mv more logic to aghstrings commit fac892ec5f0d2e30d6d64def0609267bbae4a202 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 20:23:23 2021 +0300 dnsforward: use filepath commit 05a3aeef1181b914788d14c7519287d467ab301f Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 20:17:54 2021 +0300 aghstrings: introduce the pkg commit f24e1b63d6e1bf266a4ed063f46f86d7abf65663 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 20:01:23 2021 +0300 all: imp code commit 0217a0ebb341f99a90c9b68013bebf6ff73d08ae Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 18:04:13 2021 +0300 openapi: log changes ... and 3 more commits
249 lines
5.6 KiB
Go
249 lines
5.6 KiB
Go
package home
|
|
|
|
import (
|
|
"context"
|
|
"encoding/binary"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghio"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
|
|
"github.com/AdguardTeam/golibs/cache"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
)
|
|
|
|
const (
|
|
defaultServer = "whois.arin.net"
|
|
defaultPort = "43"
|
|
maxValueLength = 250
|
|
whoisTTL = 1 * 60 * 60 // 1 hour
|
|
)
|
|
|
|
// Whois - module context
|
|
type Whois struct {
|
|
clients *clientsContainer
|
|
ipChan chan net.IP
|
|
|
|
// Contains IP addresses of clients
|
|
// An active IP address is resolved once again after it expires.
|
|
// 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
|
|
|
|
// TODO(a.garipov): Rewrite to use time.Duration. Like, seriously, why?
|
|
timeoutMsec uint
|
|
}
|
|
|
|
// initWhois creates the Whois module context.
|
|
func initWhois(clients *clientsContainer) *Whois {
|
|
w := Whois{
|
|
timeoutMsec: 5000,
|
|
clients: clients,
|
|
ipAddrs: cache.New(cache.Config{
|
|
EnableLRU: true,
|
|
MaxCount: 10000,
|
|
}),
|
|
ipChan: make(chan net.IP, 255),
|
|
}
|
|
|
|
go w.workerLoop()
|
|
|
|
return &w
|
|
}
|
|
|
|
// If the value is too large - cut it and append "..."
|
|
func trimValue(s string) string {
|
|
if len(s) <= maxValueLength {
|
|
return s
|
|
}
|
|
return s[:maxValueLength-3] + "..."
|
|
}
|
|
|
|
// Parse plain-text data from the response
|
|
func whoisParse(data string) map[string]string {
|
|
m := map[string]string{}
|
|
descr := ""
|
|
netname := ""
|
|
for len(data) != 0 {
|
|
ln := aghstrings.SplitNext(&data, '\n')
|
|
if len(ln) == 0 || ln[0] == '#' || ln[0] == '%' {
|
|
continue
|
|
}
|
|
|
|
kv := strings.SplitN(ln, ":", 2)
|
|
if len(kv) != 2 {
|
|
continue
|
|
}
|
|
k := strings.TrimSpace(kv[0])
|
|
k = strings.ToLower(k)
|
|
v := strings.TrimSpace(kv[1])
|
|
|
|
switch k {
|
|
case "org-name":
|
|
m["orgname"] = trimValue(v)
|
|
case "city", "country", "orgname":
|
|
m[k] = trimValue(v)
|
|
case "descr":
|
|
if len(descr) == 0 {
|
|
descr = v
|
|
}
|
|
case "netname":
|
|
netname = v
|
|
case "whois": // "whois: whois.arin.net"
|
|
m["whois"] = v
|
|
case "referralserver": // "ReferralServer: whois://whois.ripe.net"
|
|
if strings.HasPrefix(v, "whois://") {
|
|
m["whois"] = v[len("whois://"):]
|
|
}
|
|
}
|
|
}
|
|
|
|
_, ok := m["orgname"]
|
|
if !ok {
|
|
// Set orgname from either descr or netname for the frontent.
|
|
//
|
|
// TODO(a.garipov): Perhaps don't do that in the V1 HTTP API?
|
|
if descr != "" {
|
|
m["orgname"] = trimValue(descr)
|
|
} else if netname != "" {
|
|
m["orgname"] = trimValue(netname)
|
|
}
|
|
}
|
|
|
|
return m
|
|
}
|
|
|
|
// MaxConnReadSize is an upper limit in bytes for reading from net.Conn.
|
|
const MaxConnReadSize = 64 * 1024
|
|
|
|
// Send request to a server and receive the response
|
|
func (w *Whois) query(ctx context.Context, target, serverAddr string) (string, error) {
|
|
addr, _, _ := net.SplitHostPort(serverAddr)
|
|
if addr == "whois.arin.net" {
|
|
target = "n + " + target
|
|
}
|
|
conn, err := customDialContext(ctx, "tcp", serverAddr)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
defer conn.Close()
|
|
|
|
connReadCloser, err := aghio.LimitReadCloser(conn, MaxConnReadSize)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
defer connReadCloser.Close()
|
|
|
|
_ = conn.SetReadDeadline(time.Now().Add(time.Duration(w.timeoutMsec) * time.Millisecond))
|
|
_, err = conn.Write([]byte(target + "\r\n"))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
// This use of ReadAll is now safe, because we limited the conn Reader.
|
|
data, err := ioutil.ReadAll(connReadCloser)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
return string(data), nil
|
|
}
|
|
|
|
// Query WHOIS servers (handle redirects)
|
|
func (w *Whois) queryAll(ctx context.Context, target string) (string, error) {
|
|
server := net.JoinHostPort(defaultServer, defaultPort)
|
|
const maxRedirects = 5
|
|
for i := 0; i != maxRedirects; i++ {
|
|
resp, err := w.query(ctx, target, server)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
log.Debug("Whois: received response (%d bytes) from %s IP:%s", len(resp), server, target)
|
|
|
|
m := whoisParse(resp)
|
|
redir, ok := m["whois"]
|
|
if !ok {
|
|
return resp, nil
|
|
}
|
|
redir = strings.ToLower(redir)
|
|
|
|
_, _, err = net.SplitHostPort(redir)
|
|
if err != nil {
|
|
server = net.JoinHostPort(redir, defaultPort)
|
|
} else {
|
|
server = redir
|
|
}
|
|
|
|
log.Debug("Whois: redirected to %s IP:%s", redir, target)
|
|
}
|
|
return "", fmt.Errorf("whois: redirect loop")
|
|
}
|
|
|
|
// Request WHOIS information
|
|
func (w *Whois) process(ctx context.Context, ip net.IP) (wi *RuntimeClientWhoisInfo) {
|
|
resp, err := w.queryAll(ctx, ip.String())
|
|
if err != nil {
|
|
log.Debug("Whois: error: %s IP:%s", err, ip)
|
|
|
|
return nil
|
|
}
|
|
|
|
log.Debug("Whois: IP:%s response: %d bytes", ip, len(resp))
|
|
|
|
m := whoisParse(resp)
|
|
|
|
wi = &RuntimeClientWhoisInfo{
|
|
City: m["city"],
|
|
Country: m["country"],
|
|
Orgname: m["orgname"],
|
|
}
|
|
|
|
// Don't return an empty struct so that the frontend doesn't get
|
|
// confused.
|
|
if *wi == (RuntimeClientWhoisInfo{}) {
|
|
return nil
|
|
}
|
|
|
|
return wi
|
|
}
|
|
|
|
// Begin - begin requesting WHOIS info
|
|
func (w *Whois) Begin(ip net.IP) {
|
|
now := uint64(time.Now().Unix())
|
|
expire := w.ipAddrs.Get([]byte(ip))
|
|
if len(expire) != 0 {
|
|
exp := binary.BigEndian.Uint64(expire)
|
|
if exp > now {
|
|
return
|
|
}
|
|
// TTL expired
|
|
}
|
|
expire = make([]byte, 8)
|
|
binary.BigEndian.PutUint64(expire, now+whoisTTL)
|
|
_ = w.ipAddrs.Set([]byte(ip), expire)
|
|
|
|
log.Debug("Whois: adding %s", ip)
|
|
select {
|
|
case w.ipChan <- ip:
|
|
//
|
|
default:
|
|
log.Debug("Whois: queue is full")
|
|
}
|
|
}
|
|
|
|
// workerLoop processes the IP addresses it got from the channel and associates
|
|
// the retrieving WHOIS info with a client.
|
|
func (w *Whois) workerLoop() {
|
|
for ip := range w.ipChan {
|
|
info := w.process(context.Background(), ip)
|
|
if info == nil {
|
|
continue
|
|
}
|
|
|
|
id := ip.String()
|
|
w.clients.SetWhoisInfo(id, info)
|
|
}
|
|
}
|