2baa33fb1f
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master Squashed commit of the following: commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1 Merge: a6040850d02d16a0b4
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 5 14:32:22 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit a6040850da3cefb131208097477b0956e80063fb Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 5 14:23:36 2020 +0300 * dhcpd: convert some abbreviations to lowercase. commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 5 12:47:20 2020 +0300 * agherr: last final fixes commit 164bca55035ff44e50b0abb33e129a0d24ffe87c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Nov 3 19:11:10 2020 +0300 * all: final fixes again commit a0ac26f409c0b28a176cf2861d52c2f471b59484 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Nov 3 18:51:39 2020 +0300 * all: final fixes commit 6147b02d402b513323b07e85856b348884f3a088 Merge: 9fd3af1a362cc334f4
Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 18:26:03 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 18:23:08 2020 +0300 * all: remove useless helper commit 7cd9aeae639762b28b25f354d69c5cf74f670211 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 17:19:26 2020 +0300 * agherr: improved code tidiness commit a74a49236e9aaace070646dac710de9201105262 Merge: dc9dedbf2df34ee5c0
Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 16:54:29 2020 +0300 Merge branch 'master' into 2240-removing-errorx-dependency commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 16:40:08 2020 +0300 * agherr: improve and cover by tests commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 14:06:27 2020 +0300 * all: improve code quality commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 13:03:57 2020 +0300 * all: fix linter style warnings commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 3 12:29:26 2020 +0300 * all: remove github.com/joomcode/errorx dependency Closes #2240.
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 string) (bool, string) {
|
|
a.lock.Lock()
|
|
defer a.lock.Unlock()
|
|
|
|
if len(a.allowedClients) != 0 || len(a.allowedClientsIPNet) != 0 {
|
|
_, ok := a.allowedClients[ip]
|
|
if ok {
|
|
return false, ""
|
|
}
|
|
|
|
if len(a.allowedClientsIPNet) != 0 {
|
|
ipAddr := net.ParseIP(ip)
|
|
for _, ipnet := range a.allowedClientsIPNet {
|
|
if ipnet.Contains(ipAddr) {
|
|
return false, ""
|
|
}
|
|
}
|
|
}
|
|
|
|
return true, ""
|
|
}
|
|
|
|
_, ok := a.disallowedClients[ip]
|
|
if ok {
|
|
return true, ip
|
|
}
|
|
|
|
if len(a.disallowedClientsIPNet) != 0 {
|
|
ipAddr := net.ParseIP(ip)
|
|
for _, ipnet := range a.disallowedClientsIPNet {
|
|
if ipnet.Contains(ipAddr) {
|
|
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))
|
|
}
|