7fab31beae
Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master Closes #2508. Squashed commit of the following: commit 5b9d33f9cd352756831f63e34c4aea48674628c1 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 20 17:15:17 2021 +0300 util: replace net.IPNet with pointer commit 680126de7d59464077f9edf1bbaa925dd3fcee19 Merge: d3ba6a6c5a50efad
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 20 17:02:41 2021 +0300 Merge branch 'master' into 2508-ip-conversion-vol2 commit d3ba6a6cdd01c0aa736418fdb86ed40120169fe9 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 19 18:29:54 2021 +0300 all: remove last conversion commit 88b63f11a6c3f8705d7fa0c448c50dd646cc9214 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 19 14:12:45 2021 +0300 all: improve code quality commit 71af60c70a0dbaf55e2221023d6d2e4993c9e9a7 Merge: 98af37849f75725d
Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 18 17:13:27 2021 +0300 Merge branch 'master' into 2508-ip-conversion-vol2 commit 98af3784ce44d0993d171653c13d6e83bb8d1e6a Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 18 16:32:53 2021 +0300 all: log changes commit e99595a172bae1e844019d344544be84ddd65e4e Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 18 16:06:49 2021 +0300 all: fix or remove remaining net.IP <-> string conversions commit 7fd0634ce945f7e4c9b856684c5199f8a84a543e Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Jan 15 15:36:17 2021 +0300 all: remove redundant net.IP <-> string converions commit 5df8af030421237d41b67ed659f83526cc258199 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Jan 14 16:35:25 2021 +0300 stats: remove redundant net.IP <-> string conversion commit fbe4e3fc015e6898063543a90c04401d76dbb18f Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Jan 14 16:20:35 2021 +0300 querylog: remove redundant net.IP <-> string conversion
207 lines
4.8 KiB
Go
207 lines
4.8 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/urlfilter"
|
|
"github.com/AdguardTeam/urlfilter/filterlist"
|
|
)
|
|
|
|
type accessCtx struct {
|
|
lock sync.Mutex
|
|
|
|
allowedClients map[string]bool // IP addresses of whitelist clients
|
|
disallowedClients map[string]bool // IP addresses of clients that should be blocked
|
|
|
|
allowedClientsIPNet []net.IPNet // CIDRs of whitelist clients
|
|
disallowedClientsIPNet []net.IPNet // CIDRs of clients that should be blocked
|
|
|
|
blockedHostsEngine *urlfilter.DNSEngine // finds hosts that should be blocked
|
|
}
|
|
|
|
func (a *accessCtx) Init(allowedClients, disallowedClients, blockedHosts []string) error {
|
|
err := processIPCIDRArray(&a.allowedClients, &a.allowedClientsIPNet, allowedClients)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = processIPCIDRArray(&a.disallowedClients, &a.disallowedClientsIPNet, disallowedClients)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
buf := strings.Builder{}
|
|
for _, s := range blockedHosts {
|
|
buf.WriteString(s)
|
|
buf.WriteString("\n")
|
|
}
|
|
|
|
listArray := []filterlist.RuleList{}
|
|
list := &filterlist.StringRuleList{
|
|
ID: int(0),
|
|
RulesText: buf.String(),
|
|
IgnoreCosmetic: true,
|
|
}
|
|
listArray = append(listArray, list)
|
|
rulesStorage, err := filterlist.NewRuleStorage(listArray)
|
|
if err != nil {
|
|
return fmt.Errorf("filterlist.NewRuleStorage(): %w", err)
|
|
}
|
|
a.blockedHostsEngine = urlfilter.NewDNSEngine(rulesStorage)
|
|
|
|
return nil
|
|
}
|
|
|
|
// Split array of IP or CIDR into 2 containers for fast search
|
|
func processIPCIDRArray(dst *map[string]bool, dstIPNet *[]net.IPNet, src []string) error {
|
|
*dst = make(map[string]bool)
|
|
|
|
for _, s := range src {
|
|
ip := net.ParseIP(s)
|
|
if ip != nil {
|
|
(*dst)[s] = true
|
|
continue
|
|
}
|
|
|
|
_, ipnet, err := net.ParseCIDR(s)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*dstIPNet = append(*dstIPNet, *ipnet)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// IsBlockedIP - return TRUE if this client should be blocked
|
|
// Returns the item from the "disallowedClients" list that lead to blocking IP.
|
|
// If it returns TRUE and an empty string, it means that the "allowedClients" is not empty,
|
|
// but the ip does not belong to it.
|
|
func (a *accessCtx) IsBlockedIP(ip net.IP) (bool, string) {
|
|
ipStr := ip.String()
|
|
|
|
a.lock.Lock()
|
|
defer a.lock.Unlock()
|
|
|
|
if len(a.allowedClients) != 0 || len(a.allowedClientsIPNet) != 0 {
|
|
_, ok := a.allowedClients[ipStr]
|
|
if ok {
|
|
return false, ""
|
|
}
|
|
|
|
if len(a.allowedClientsIPNet) != 0 {
|
|
for _, ipnet := range a.allowedClientsIPNet {
|
|
if ipnet.Contains(ip) {
|
|
return false, ""
|
|
}
|
|
}
|
|
}
|
|
|
|
return true, ""
|
|
}
|
|
|
|
_, ok := a.disallowedClients[ipStr]
|
|
if ok {
|
|
return true, ipStr
|
|
}
|
|
|
|
if len(a.disallowedClientsIPNet) != 0 {
|
|
for _, ipnet := range a.disallowedClientsIPNet {
|
|
if ipnet.Contains(ip) {
|
|
return true, ipnet.String()
|
|
}
|
|
}
|
|
}
|
|
|
|
return false, ""
|
|
}
|
|
|
|
// IsBlockedDomain - return TRUE if this domain should be blocked
|
|
func (a *accessCtx) IsBlockedDomain(host string) bool {
|
|
a.lock.Lock()
|
|
_, ok := a.blockedHostsEngine.Match(host)
|
|
a.lock.Unlock()
|
|
return ok
|
|
}
|
|
|
|
type accessListJSON struct {
|
|
AllowedClients []string `json:"allowed_clients"`
|
|
DisallowedClients []string `json:"disallowed_clients"`
|
|
BlockedHosts []string `json:"blocked_hosts"`
|
|
}
|
|
|
|
func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
|
|
s.RLock()
|
|
j := accessListJSON{
|
|
AllowedClients: s.conf.AllowedClients,
|
|
DisallowedClients: s.conf.DisallowedClients,
|
|
BlockedHosts: s.conf.BlockedHosts,
|
|
}
|
|
s.RUnlock()
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
err := json.NewEncoder(w).Encode(j)
|
|
if err != nil {
|
|
httpError(r, w, http.StatusInternalServerError, "json.Encode: %s", err)
|
|
return
|
|
}
|
|
}
|
|
|
|
func checkIPCIDRArray(src []string) error {
|
|
for _, s := range src {
|
|
ip := net.ParseIP(s)
|
|
if ip != nil {
|
|
continue
|
|
}
|
|
|
|
_, _, err := net.ParseCIDR(s)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) handleAccessSet(w http.ResponseWriter, r *http.Request) {
|
|
j := accessListJSON{}
|
|
err := json.NewDecoder(r.Body).Decode(&j)
|
|
if err != nil {
|
|
httpError(r, w, http.StatusBadRequest, "json.Decode: %s", err)
|
|
return
|
|
}
|
|
|
|
err = checkIPCIDRArray(j.AllowedClients)
|
|
if err == nil {
|
|
err = checkIPCIDRArray(j.DisallowedClients)
|
|
}
|
|
if err != nil {
|
|
httpError(r, w, http.StatusBadRequest, "%s", err)
|
|
return
|
|
}
|
|
|
|
a := &accessCtx{}
|
|
err = a.Init(j.AllowedClients, j.DisallowedClients, j.BlockedHosts)
|
|
if err != nil {
|
|
httpError(r, w, http.StatusBadRequest, "access.Init: %s", err)
|
|
return
|
|
}
|
|
|
|
s.Lock()
|
|
s.conf.AllowedClients = j.AllowedClients
|
|
s.conf.DisallowedClients = j.DisallowedClients
|
|
s.conf.BlockedHosts = j.BlockedHosts
|
|
s.access = a
|
|
s.Unlock()
|
|
s.conf.ConfigModified()
|
|
|
|
log.Debug("Access: updated lists: %d, %d, %d",
|
|
len(j.AllowedClients), len(j.DisallowedClients), len(j.BlockedHosts))
|
|
}
|