mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 22:45:46 +03:00
71c44fa40c
Squashed commit of the following: commit 1b1a21b07baa15499e5e4963d35bfd2e542533ed Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed May 8 17:32:38 2024 +0300 client: imp tests commit 7e6d17158a254aa29bf4033fb68171d4209bb954 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed May 8 17:27:00 2024 +0300 client: imp tests commit 5e4cd2b3ca9557929b9b79a0610151ce09c792f9 Merge: 7faddd8aa1a62ce471
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed May 8 15:57:33 2024 +0300 Merge branch 'master' into AG-27492-client-persistent-list commit 7faddd8aade2b1b791beec694b88513b0a2a520e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 6 20:55:43 2024 +0300 client: imp code commit 54212e975b700f792a53fc3bfe1c2970778e05ea Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 6 20:24:18 2024 +0300 all: imp code commit 3f23c9af470036c2166e20c8d0b5d84810b35b6e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 6 17:07:40 2024 +0300 home: imp tests commit 39b99fc050047cebadc51ae64e220ec1cb873d83 Merge: 76469ac5917c4eeb64
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 6 16:39:56 2024 +0300 Merge branch 'master' into AG-27492-client-persistent-list commit 76469ac59400aae2f7563750a981138b8cbf3aa1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon May 6 14:36:22 2024 +0300 home: imp naming commit 4e4aa5802c9aafc67c52b8a290d8046531f8a1c8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu May 2 19:50:45 2024 +0300 client: imp docs commit bf5c23a72c93e58c8bc7e0ca896b2ea28519cf54 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu May 2 19:40:53 2024 +0300 home: add tests commit c6cdba7a8d0dfce22634f88258f61abb09ecca5a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 24 14:21:44 2024 +0300 all: add tests commit 1fc43cb45efbd428abaae9eba030f9bea818dfe3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 19 19:19:48 2024 +0300 all: add tests commit ccc423b296d9037f0aa23a125a5ad3af95b8c9f3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 19 15:37:15 2024 +0300 all: client persistent list
368 lines
8.3 KiB
Go
368 lines
8.3 KiB
Go
package client
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"net/netip"
|
|
"slices"
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
|
|
"github.com/AdguardTeam/golibs/errors"
|
|
"golang.org/x/exp/maps"
|
|
)
|
|
|
|
// macKey contains MAC as byte array of 6, 8, or 20 bytes.
|
|
type macKey any
|
|
|
|
// macToKey converts mac into key of type macKey, which is used as the key of
|
|
// the [clientIndex.macToUID]. mac must be valid MAC address.
|
|
func macToKey(mac net.HardwareAddr) (key macKey) {
|
|
switch len(mac) {
|
|
case 6:
|
|
return [6]byte(mac)
|
|
case 8:
|
|
return [8]byte(mac)
|
|
case 20:
|
|
return [20]byte(mac)
|
|
default:
|
|
panic(fmt.Errorf("invalid mac address %#v", mac))
|
|
}
|
|
}
|
|
|
|
// Index stores all information about persistent clients.
|
|
type Index struct {
|
|
// nameToUID maps client name to UID.
|
|
nameToUID map[string]UID
|
|
|
|
// clientIDToUID maps client ID to UID.
|
|
clientIDToUID map[string]UID
|
|
|
|
// ipToUID maps IP address to UID.
|
|
ipToUID map[netip.Addr]UID
|
|
|
|
// macToUID maps MAC address to UID.
|
|
macToUID map[macKey]UID
|
|
|
|
// uidToClient maps UID to the persistent client.
|
|
uidToClient map[UID]*Persistent
|
|
|
|
// subnetToUID maps subnet to UID.
|
|
subnetToUID aghalg.SortedMap[netip.Prefix, UID]
|
|
}
|
|
|
|
// NewIndex initializes the new instance of client index.
|
|
func NewIndex() (ci *Index) {
|
|
return &Index{
|
|
nameToUID: map[string]UID{},
|
|
clientIDToUID: map[string]UID{},
|
|
ipToUID: map[netip.Addr]UID{},
|
|
subnetToUID: aghalg.NewSortedMap[netip.Prefix, UID](subnetCompare),
|
|
macToUID: map[macKey]UID{},
|
|
uidToClient: map[UID]*Persistent{},
|
|
}
|
|
}
|
|
|
|
// Add stores information about a persistent client in the index. c must be
|
|
// non-nil and contain UID.
|
|
func (ci *Index) Add(c *Persistent) {
|
|
if (c.UID == UID{}) {
|
|
panic("client must contain uid")
|
|
}
|
|
|
|
ci.nameToUID[c.Name] = c.UID
|
|
|
|
for _, id := range c.ClientIDs {
|
|
ci.clientIDToUID[id] = c.UID
|
|
}
|
|
|
|
for _, ip := range c.IPs {
|
|
ci.ipToUID[ip] = c.UID
|
|
}
|
|
|
|
for _, pref := range c.Subnets {
|
|
ci.subnetToUID.Set(pref, c.UID)
|
|
}
|
|
|
|
for _, mac := range c.MACs {
|
|
k := macToKey(mac)
|
|
ci.macToUID[k] = c.UID
|
|
}
|
|
|
|
ci.uidToClient[c.UID] = c
|
|
}
|
|
|
|
// ClashesUID returns existing persistent client with the same UID as c. Note
|
|
// that this is only possible when configuration contains duplicate fields.
|
|
func (ci *Index) ClashesUID(c *Persistent) (err error) {
|
|
p, ok := ci.uidToClient[c.UID]
|
|
if ok {
|
|
return fmt.Errorf("another client %q uses the same uid", p.Name)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Clashes returns an error if the index contains a different persistent client
|
|
// with at least a single identifier contained by c. c must be non-nil.
|
|
func (ci *Index) Clashes(c *Persistent) (err error) {
|
|
if p := ci.clashesName(c); p != nil {
|
|
return fmt.Errorf("another client uses the same name %q", p.Name)
|
|
}
|
|
|
|
for _, id := range c.ClientIDs {
|
|
existing, ok := ci.clientIDToUID[id]
|
|
if ok && existing != c.UID {
|
|
p := ci.uidToClient[existing]
|
|
|
|
return fmt.Errorf("another client %q uses the same ClientID %q", p.Name, id)
|
|
}
|
|
}
|
|
|
|
p, ip := ci.clashesIP(c)
|
|
if p != nil {
|
|
return fmt.Errorf("another client %q uses the same IP %q", p.Name, ip)
|
|
}
|
|
|
|
p, s := ci.clashesSubnet(c)
|
|
if p != nil {
|
|
return fmt.Errorf("another client %q uses the same subnet %q", p.Name, s)
|
|
}
|
|
|
|
p, mac := ci.clashesMAC(c)
|
|
if p != nil {
|
|
return fmt.Errorf("another client %q uses the same MAC %q", p.Name, mac)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// clashesName returns existing persistent client with the same name as c or
|
|
// nil. c must be non-nil.
|
|
func (ci *Index) clashesName(c *Persistent) (existing *Persistent) {
|
|
existing, ok := ci.FindByName(c.Name)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
|
|
if existing.UID != c.UID {
|
|
return existing
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// clashesIP returns a previous client with the same IP address as c. c must be
|
|
// non-nil.
|
|
func (ci *Index) clashesIP(c *Persistent) (p *Persistent, ip netip.Addr) {
|
|
for _, ip := range c.IPs {
|
|
existing, ok := ci.ipToUID[ip]
|
|
if ok && existing != c.UID {
|
|
return ci.uidToClient[existing], ip
|
|
}
|
|
}
|
|
|
|
return nil, netip.Addr{}
|
|
}
|
|
|
|
// clashesSubnet returns a previous client with the same subnet as c. c must be
|
|
// non-nil.
|
|
func (ci *Index) clashesSubnet(c *Persistent) (p *Persistent, s netip.Prefix) {
|
|
for _, s = range c.Subnets {
|
|
var existing UID
|
|
var ok bool
|
|
|
|
ci.subnetToUID.Range(func(p netip.Prefix, uid UID) (cont bool) {
|
|
if s == p {
|
|
existing = uid
|
|
ok = true
|
|
|
|
return false
|
|
}
|
|
|
|
return true
|
|
})
|
|
|
|
if ok && existing != c.UID {
|
|
return ci.uidToClient[existing], s
|
|
}
|
|
}
|
|
|
|
return nil, netip.Prefix{}
|
|
}
|
|
|
|
// clashesMAC returns a previous client with the same MAC address as c. c must
|
|
// be non-nil.
|
|
func (ci *Index) clashesMAC(c *Persistent) (p *Persistent, mac net.HardwareAddr) {
|
|
for _, mac = range c.MACs {
|
|
k := macToKey(mac)
|
|
existing, ok := ci.macToUID[k]
|
|
if ok && existing != c.UID {
|
|
return ci.uidToClient[existing], mac
|
|
}
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
// Find finds persistent client by string representation of the client ID, IP
|
|
// address, or MAC.
|
|
func (ci *Index) Find(id string) (c *Persistent, ok bool) {
|
|
uid, found := ci.clientIDToUID[id]
|
|
if found {
|
|
return ci.uidToClient[uid], true
|
|
}
|
|
|
|
ip, err := netip.ParseAddr(id)
|
|
if err == nil {
|
|
// MAC addresses can be successfully parsed as IP addresses.
|
|
c, found = ci.findByIP(ip)
|
|
if found {
|
|
return c, true
|
|
}
|
|
}
|
|
|
|
mac, err := net.ParseMAC(id)
|
|
if err == nil {
|
|
return ci.FindByMAC(mac)
|
|
}
|
|
|
|
return nil, false
|
|
}
|
|
|
|
// FindByName finds persistent client by name.
|
|
func (ci *Index) FindByName(name string) (c *Persistent, found bool) {
|
|
uid, found := ci.nameToUID[name]
|
|
if found {
|
|
return ci.uidToClient[uid], true
|
|
}
|
|
|
|
return nil, false
|
|
}
|
|
|
|
// findByIP finds persistent client by IP address.
|
|
func (ci *Index) findByIP(ip netip.Addr) (c *Persistent, found bool) {
|
|
uid, found := ci.ipToUID[ip]
|
|
if found {
|
|
return ci.uidToClient[uid], true
|
|
}
|
|
|
|
ipWithoutZone := ip.WithZone("")
|
|
ci.subnetToUID.Range(func(pref netip.Prefix, id UID) (cont bool) {
|
|
// Remove zone before checking because prefixes strip zones.
|
|
if pref.Contains(ipWithoutZone) {
|
|
uid, found = id, true
|
|
|
|
return false
|
|
}
|
|
|
|
return true
|
|
})
|
|
|
|
if found {
|
|
return ci.uidToClient[uid], true
|
|
}
|
|
|
|
return nil, false
|
|
}
|
|
|
|
// FindByMAC finds persistent client by MAC.
|
|
func (ci *Index) FindByMAC(mac net.HardwareAddr) (c *Persistent, found bool) {
|
|
k := macToKey(mac)
|
|
uid, found := ci.macToUID[k]
|
|
if found {
|
|
return ci.uidToClient[uid], true
|
|
}
|
|
|
|
return nil, false
|
|
}
|
|
|
|
// FindByIPWithoutZone finds a persistent client by IP address without zone. It
|
|
// strips the IPv6 zone index from the stored IP addresses before comparing,
|
|
// because querylog entries don't have it. See TODO on [querylog.logEntry.IP].
|
|
//
|
|
// Note that multiple clients can have the same IP address with different zones.
|
|
// Therefore, the result of this method is indeterminate.
|
|
func (ci *Index) FindByIPWithoutZone(ip netip.Addr) (c *Persistent) {
|
|
if (ip == netip.Addr{}) {
|
|
return nil
|
|
}
|
|
|
|
for addr, uid := range ci.ipToUID {
|
|
if addr.WithZone("") == ip {
|
|
return ci.uidToClient[uid]
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Delete removes information about persistent client from the index. c must be
|
|
// non-nil.
|
|
func (ci *Index) Delete(c *Persistent) {
|
|
delete(ci.nameToUID, c.Name)
|
|
|
|
for _, id := range c.ClientIDs {
|
|
delete(ci.clientIDToUID, id)
|
|
}
|
|
|
|
for _, ip := range c.IPs {
|
|
delete(ci.ipToUID, ip)
|
|
}
|
|
|
|
for _, pref := range c.Subnets {
|
|
ci.subnetToUID.Del(pref)
|
|
}
|
|
|
|
for _, mac := range c.MACs {
|
|
k := macToKey(mac)
|
|
delete(ci.macToUID, k)
|
|
}
|
|
|
|
delete(ci.uidToClient, c.UID)
|
|
}
|
|
|
|
// Size returns the number of persistent clients.
|
|
func (ci *Index) Size() (n int) {
|
|
return len(ci.uidToClient)
|
|
}
|
|
|
|
// Range calls f for each persistent client, unless cont is false. The order is
|
|
// undefined.
|
|
func (ci *Index) Range(f func(c *Persistent) (cont bool)) {
|
|
for _, c := range ci.uidToClient {
|
|
if !f(c) {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// RangeByName is like [Index.Range] but sorts the persistent clients by name
|
|
// before iterating ensuring a predictable order.
|
|
func (ci *Index) RangeByName(f func(c *Persistent) (cont bool)) {
|
|
cs := maps.Values(ci.uidToClient)
|
|
slices.SortFunc(cs, func(a, b *Persistent) (n int) {
|
|
return strings.Compare(a.Name, b.Name)
|
|
})
|
|
|
|
for _, c := range cs {
|
|
if !f(c) {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// CloseUpstreams closes upstream configurations of persistent clients.
|
|
func (ci *Index) CloseUpstreams() (err error) {
|
|
var errs []error
|
|
ci.RangeByName(func(c *Persistent) (cont bool) {
|
|
err = c.CloseUpstreams()
|
|
if err != nil {
|
|
errs = append(errs, err)
|
|
}
|
|
|
|
return true
|
|
})
|
|
|
|
return errors.Join(errs...)
|
|
}
|