mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
252 lines
5.4 KiB
Go
252 lines
5.4 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/util"
|
|
"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 := util.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 "orgname":
|
|
fallthrough
|
|
case "city":
|
|
fallthrough
|
|
case "country":
|
|
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://"):]
|
|
}
|
|
}
|
|
}
|
|
|
|
// descr or netname -> orgname
|
|
_, ok := m["orgname"]
|
|
if !ok && len(descr) != 0 {
|
|
m["orgname"] = trimValue(descr)
|
|
} else if !ok && len(netname) != 0 {
|
|
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) [][]string {
|
|
data := [][]string{}
|
|
resp, err := w.queryAll(ctx, ip.String())
|
|
if err != nil {
|
|
log.Debug("Whois: error: %s IP:%s", err, ip)
|
|
return data
|
|
}
|
|
|
|
log.Debug("Whois: IP:%s response: %d bytes", ip, len(resp))
|
|
|
|
m := whoisParse(resp)
|
|
|
|
keys := []string{"orgname", "country", "city"}
|
|
for _, k := range keys {
|
|
v, found := m[k]
|
|
if !found {
|
|
continue
|
|
}
|
|
pair := []string{k, v}
|
|
data = append(data, pair)
|
|
}
|
|
|
|
return data
|
|
}
|
|
|
|
// 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 := <-w.ipChan
|
|
|
|
info := w.process(context.Background(), ip)
|
|
if len(info) == 0 {
|
|
continue
|
|
}
|
|
|
|
id := ip.String()
|
|
w.clients.SetWhoisInfo(id, info)
|
|
}
|
|
}
|