mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 06:25:44 +03:00
d9bde6425b
Closes #4242.
Updates #4244.
Squashed commit of the following:
commit 3a2296a7a70006cf6777e54ce1e2fc3559aec5be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:23:43 2022 +0300
client: imp more
commit 3aacc8696ac694ff459fd33ba7beeeabd2569a55
Merge: b28a120f 2a5b5f19
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:21:59 2022 +0300
Merge branch 'master' into 4244-imp-i18n
commit b28a120fe9aa68507b173717059b7b259097d6a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 14:49:49 2022 +0300
client: imp texts more
commit c1fa6ca336f2d5bdcc67836f348be4843a0a8f79
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 8 21:12:15 2022 +0300
all: use "ClientID" consistently
275 lines
6.9 KiB
Go
275 lines
6.9 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/golibs/netutil"
|
|
"github.com/AdguardTeam/golibs/stringutil"
|
|
"github.com/AdguardTeam/urlfilter"
|
|
"github.com/AdguardTeam/urlfilter/filterlist"
|
|
)
|
|
|
|
// accessCtx controls IP and client blocking that takes place before all other
|
|
// processing. An accessCtx is safe for concurrent use.
|
|
type accessCtx struct {
|
|
allowedIPs *netutil.IPMap
|
|
blockedIPs *netutil.IPMap
|
|
|
|
allowedClientIDs *stringutil.Set
|
|
blockedClientIDs *stringutil.Set
|
|
|
|
blockedHostsEng *urlfilter.DNSEngine
|
|
|
|
// TODO(a.garipov): Create a type for a set of IP networks.
|
|
// netutil.IPNetSet?
|
|
allowedNets []*net.IPNet
|
|
blockedNets []*net.IPNet
|
|
}
|
|
|
|
// unit is a convenient alias for struct{}
|
|
type unit = struct{}
|
|
|
|
// processAccessClients is a helper for processing a list of client strings,
|
|
// which may be an IP address, a CIDR, or a ClientID.
|
|
func processAccessClients(
|
|
clientStrs []string,
|
|
ips *netutil.IPMap,
|
|
nets *[]*net.IPNet,
|
|
clientIDs *stringutil.Set,
|
|
) (err error) {
|
|
for i, s := range clientStrs {
|
|
if ip := net.ParseIP(s); ip != nil {
|
|
ips.Set(ip, unit{})
|
|
} else if cidrIP, ipnet, cidrErr := net.ParseCIDR(s); cidrErr == nil {
|
|
ipnet.IP = cidrIP
|
|
*nets = append(*nets, ipnet)
|
|
} else {
|
|
idErr := ValidateClientID(s)
|
|
if idErr != nil {
|
|
return fmt.Errorf(
|
|
"value %q at index %d: bad ip, cidr, or clientid",
|
|
s,
|
|
i,
|
|
)
|
|
}
|
|
|
|
clientIDs.Add(s)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// newAccessCtx creates a new accessCtx.
|
|
func newAccessCtx(allowed, blocked, blockedHosts []string) (a *accessCtx, err error) {
|
|
a = &accessCtx{
|
|
allowedIPs: netutil.NewIPMap(0),
|
|
blockedIPs: netutil.NewIPMap(0),
|
|
|
|
allowedClientIDs: stringutil.NewSet(),
|
|
blockedClientIDs: stringutil.NewSet(),
|
|
}
|
|
|
|
err = processAccessClients(allowed, a.allowedIPs, &a.allowedNets, a.allowedClientIDs)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("adding allowed: %w", err)
|
|
}
|
|
|
|
err = processAccessClients(blocked, a.blockedIPs, &a.blockedNets, a.blockedClientIDs)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("adding blocked: %w", err)
|
|
}
|
|
|
|
b := &strings.Builder{}
|
|
for _, h := range blockedHosts {
|
|
stringutil.WriteToBuilder(b, strings.ToLower(h), "\n")
|
|
}
|
|
|
|
lists := []filterlist.RuleList{
|
|
&filterlist.StringRuleList{
|
|
ID: int(0),
|
|
RulesText: b.String(),
|
|
IgnoreCosmetic: true,
|
|
},
|
|
}
|
|
|
|
rulesStrg, err := filterlist.NewRuleStorage(lists)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("adding blocked hosts: %w", err)
|
|
}
|
|
|
|
a.blockedHostsEng = urlfilter.NewDNSEngine(rulesStrg)
|
|
|
|
return a, nil
|
|
}
|
|
|
|
// allowlistMode returns true if this *accessCtx is in the allowlist mode.
|
|
func (a *accessCtx) allowlistMode() (ok bool) {
|
|
return a.allowedIPs.Len() != 0 || a.allowedClientIDs.Len() != 0 || len(a.allowedNets) != 0
|
|
}
|
|
|
|
// isBlockedClientID returns true if the ClientID should be blocked.
|
|
func (a *accessCtx) isBlockedClientID(id string) (ok bool) {
|
|
allowlistMode := a.allowlistMode()
|
|
if id == "" {
|
|
// In allowlist mode, consider requests without ClientIDs blocked by
|
|
// default.
|
|
return allowlistMode
|
|
}
|
|
|
|
if allowlistMode {
|
|
return !a.allowedClientIDs.Has(id)
|
|
}
|
|
|
|
return a.blockedClientIDs.Has(id)
|
|
}
|
|
|
|
// isBlockedHost returns true if host should be blocked.
|
|
func (a *accessCtx) isBlockedHost(host string) (ok bool) {
|
|
_, ok = a.blockedHostsEng.Match(strings.ToLower(host))
|
|
|
|
return ok
|
|
}
|
|
|
|
// isBlockedIP returns the status of the IP address blocking as well as the rule
|
|
// that blocked it.
|
|
func (a *accessCtx) isBlockedIP(ip net.IP) (blocked bool, rule string) {
|
|
blocked = true
|
|
ips := a.blockedIPs
|
|
ipnets := a.blockedNets
|
|
|
|
if a.allowlistMode() {
|
|
// Enable allowlist mode and use the allowlist sets.
|
|
blocked = false
|
|
ips = a.allowedIPs
|
|
ipnets = a.allowedNets
|
|
}
|
|
|
|
if _, ok := ips.Get(ip); ok {
|
|
return blocked, ip.String()
|
|
}
|
|
|
|
for _, ipnet := range ipnets {
|
|
if ipnet.Contains(ip) {
|
|
return blocked, ipnet.String()
|
|
}
|
|
}
|
|
|
|
return !blocked, ""
|
|
}
|
|
|
|
type accessListJSON struct {
|
|
AllowedClients []string `json:"allowed_clients"`
|
|
DisallowedClients []string `json:"disallowed_clients"`
|
|
BlockedHosts []string `json:"blocked_hosts"`
|
|
}
|
|
|
|
func (s *Server) accessListJSON() (j accessListJSON) {
|
|
s.serverLock.RLock()
|
|
defer s.serverLock.RUnlock()
|
|
|
|
return accessListJSON{
|
|
AllowedClients: stringutil.CloneSlice(s.conf.AllowedClients),
|
|
DisallowedClients: stringutil.CloneSlice(s.conf.DisallowedClients),
|
|
BlockedHosts: stringutil.CloneSlice(s.conf.BlockedHosts),
|
|
}
|
|
}
|
|
|
|
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
|
|
j := s.accessListJSON()
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
err := json.NewEncoder(w).Encode(j)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "encoding response: %s", err)
|
|
|
|
return
|
|
}
|
|
}
|
|
|
|
// validateAccessSet checks the internal accessListJSON lists. To search for
|
|
// duplicates, we cannot compare the new stringutil.Set and []string, because
|
|
// creating a set for a large array can be an unnecessary algorithmic complexity
|
|
func validateAccessSet(list *accessListJSON) (err error) {
|
|
allowed, err := validateStrUniq(list.AllowedClients)
|
|
if err != nil {
|
|
return fmt.Errorf("validating allowed clients: %w", err)
|
|
}
|
|
|
|
disallowed, err := validateStrUniq(list.DisallowedClients)
|
|
if err != nil {
|
|
return fmt.Errorf("validating disallowed clients: %w", err)
|
|
}
|
|
|
|
_, err = validateStrUniq(list.BlockedHosts)
|
|
if err != nil {
|
|
return fmt.Errorf("validating blocked hosts: %w", err)
|
|
}
|
|
|
|
merged := allowed.Merge(disallowed)
|
|
err = merged.Validate(aghalg.StringIsBefore)
|
|
if err != nil {
|
|
return fmt.Errorf("items in allowed and disallowed clients intersect: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// validateStrUniq returns an informative error if clients are not unique.
|
|
func validateStrUniq(clients []string) (uc aghalg.UniqChecker, err error) {
|
|
uc = make(aghalg.UniqChecker, len(clients))
|
|
for _, c := range clients {
|
|
uc.Add(c)
|
|
}
|
|
|
|
return uc, uc.Validate(aghalg.StringIsBefore)
|
|
}
|
|
|
|
func (s *Server) handleAccessSet(w http.ResponseWriter, r *http.Request) {
|
|
list := &accessListJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&list)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "decoding request: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
err = validateAccessSet(list)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, err.Error())
|
|
|
|
return
|
|
}
|
|
|
|
var a *accessCtx
|
|
a, err = newAccessCtx(list.AllowedClients, list.DisallowedClients, list.BlockedHosts)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "creating access ctx: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
defer log.Debug(
|
|
"access: updated lists: %d, %d, %d",
|
|
len(list.AllowedClients),
|
|
len(list.DisallowedClients),
|
|
len(list.BlockedHosts),
|
|
)
|
|
|
|
defer s.conf.ConfigModified()
|
|
|
|
s.serverLock.Lock()
|
|
defer s.serverLock.Unlock()
|
|
|
|
s.conf.AllowedClients = list.AllowedClients
|
|
s.conf.DisallowedClients = list.DisallowedClients
|
|
s.conf.BlockedHosts = list.BlockedHosts
|
|
s.access = a
|
|
}
|