mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 22:45:46 +03:00
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.
142 lines
3.3 KiB
Go
142 lines
3.3 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/util"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
type ipsetCtx struct {
|
|
ipsetList map[string][]string // domain -> []ipset_name
|
|
ipsetCache map[[4]byte]bool // cache for IP[] to prevent duplicate calls to ipset program
|
|
ipsetMutex *sync.Mutex
|
|
ipset6Cache map[[16]byte]bool // cache for IP[] to prevent duplicate calls to ipset program
|
|
ipset6Mutex *sync.Mutex
|
|
}
|
|
|
|
// Convert configuration settings to an internal map
|
|
// DOMAIN[,DOMAIN].../IPSET1_NAME[,IPSET2_NAME]...
|
|
func (c *ipsetCtx) init(ipsetConfig []string) {
|
|
c.ipsetList = make(map[string][]string)
|
|
c.ipsetCache = make(map[[4]byte]bool)
|
|
c.ipsetMutex = &sync.Mutex{}
|
|
c.ipset6Cache = make(map[[16]byte]bool)
|
|
c.ipset6Mutex = &sync.Mutex{}
|
|
|
|
for _, it := range ipsetConfig {
|
|
it = strings.TrimSpace(it)
|
|
hostsAndNames := strings.Split(it, "/")
|
|
if len(hostsAndNames) != 2 {
|
|
log.Debug("IPSET: invalid value %q", it)
|
|
continue
|
|
}
|
|
|
|
ipsetNames := strings.Split(hostsAndNames[1], ",")
|
|
if len(ipsetNames) == 0 {
|
|
log.Debug("IPSET: invalid value %q", it)
|
|
continue
|
|
}
|
|
bad := false
|
|
for i := range ipsetNames {
|
|
ipsetNames[i] = strings.TrimSpace(ipsetNames[i])
|
|
if len(ipsetNames[i]) == 0 {
|
|
bad = true
|
|
break
|
|
}
|
|
}
|
|
if bad {
|
|
log.Debug("IPSET: invalid value %q", it)
|
|
continue
|
|
}
|
|
|
|
hosts := strings.Split(hostsAndNames[0], ",")
|
|
for _, host := range hosts {
|
|
host = strings.TrimSpace(host)
|
|
host = strings.ToLower(host)
|
|
if len(host) == 0 {
|
|
log.Debug("IPSET: invalid value %q", it)
|
|
continue
|
|
}
|
|
c.ipsetList[host] = ipsetNames
|
|
}
|
|
}
|
|
log.Debug("IPSET: added %d hosts", len(c.ipsetList))
|
|
}
|
|
|
|
func (c *ipsetCtx) getIP(rr dns.RR) net.IP {
|
|
switch a := rr.(type) {
|
|
case *dns.A:
|
|
var ip4 [4]byte
|
|
copy(ip4[:], a.A.To4())
|
|
c.ipsetMutex.Lock()
|
|
defer c.ipsetMutex.Unlock()
|
|
_, found := c.ipsetCache[ip4]
|
|
if found {
|
|
return nil // this IP was added before
|
|
}
|
|
c.ipsetCache[ip4] = false
|
|
return a.A
|
|
|
|
case *dns.AAAA:
|
|
var ip6 [16]byte
|
|
copy(ip6[:], a.AAAA)
|
|
c.ipset6Mutex.Lock()
|
|
defer c.ipset6Mutex.Unlock()
|
|
_, found := c.ipset6Cache[ip6]
|
|
if found {
|
|
return nil // this IP was added before
|
|
}
|
|
c.ipset6Cache[ip6] = false
|
|
return a.AAAA
|
|
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// Add IP addresses of the specified in configuration domain names to an ipset list
|
|
func (c *ipsetCtx) process(ctx *dnsContext) int {
|
|
req := ctx.proxyCtx.Req
|
|
if !(req.Question[0].Qtype == dns.TypeA ||
|
|
req.Question[0].Qtype == dns.TypeAAAA) ||
|
|
!ctx.responseFromUpstream {
|
|
return resultDone
|
|
}
|
|
|
|
host := req.Question[0].Name
|
|
host = strings.TrimSuffix(host, ".")
|
|
host = strings.ToLower(host)
|
|
ipsetNames, found := c.ipsetList[host]
|
|
if !found {
|
|
return resultDone
|
|
}
|
|
|
|
log.Debug("IPSET: found ipsets %v for host %s", ipsetNames, host)
|
|
|
|
for _, it := range ctx.proxyCtx.Res.Answer {
|
|
ip := c.getIP(it)
|
|
if ip == nil {
|
|
continue
|
|
}
|
|
|
|
ipStr := ip.String()
|
|
for _, name := range ipsetNames {
|
|
code, out, err := util.RunCommand("ipset", "add", name, ipStr)
|
|
if err != nil {
|
|
log.Info("IPSET: %s(%s) -> %s: %s", host, ipStr, name, err)
|
|
continue
|
|
}
|
|
if code != 0 {
|
|
log.Info("IPSET: ipset add: code:%d output:%q", code, out)
|
|
continue
|
|
}
|
|
log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, name)
|
|
}
|
|
}
|
|
|
|
return resultDone
|
|
}
|