mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 18:38:52 -07:00
7931e50673
Close #1191
Squashed commit of the following:
commit ba14b53f9e3d98ad8127aa3af1def0da4269e8c4
Merge: 362f4c44 6b614295
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Sep 2 14:03:19 2020 +0300
Merge remote-tracking branch 'origin/master' into 1191-ipset
commit 362f4c44915cb8946db2e80f9a3f5afd74fe5de1
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Sep 2 12:50:56 2020 +0300
minor
commit 28e12459166fe3d13fb0dbe59ac11b7d86adb9b4
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Sep 2 12:43:25 2020 +0300
minor
commit bdbd7324501f6111bea1e91eda7d730c7ea57b11
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Sep 1 18:40:04 2020 +0300
move code, ipset-v6
commit 77f4d943e74b70b5bc5aea279875ab1e2fab2192
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Sep 1 15:53:27 2020 +0300
comment
commit 16401325bbefeba08e447257b12a8424b78c9475
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Aug 31 17:43:23 2020 +0300
minor
commit c8410e9a519b87911bc50f504e8b4aaf8dce6e02
Author: Simon Zolin <s.zolin@adguard.com>
Date: Mon Aug 31 15:30:52 2020 +0300
+ DNS: add "ipset" configuration setting
134 lines
3.1 KiB
Go
134 lines
3.1 KiB
Go
package dnsforward
|
|
|
|
import (
|
|
"net"
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/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
|
|
ipset6Cache map[[16]byte]bool // cache for IP[] to prevent duplicate calls to ipset program
|
|
}
|
|
|
|
// 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.ipset6Cache = make(map[[16]byte]bool)
|
|
|
|
for _, it := range ipsetConfig {
|
|
it = strings.TrimSpace(it)
|
|
hostsAndNames := strings.Split(it, "/")
|
|
if len(hostsAndNames) != 2 {
|
|
log.Debug("IPSET: invalid value '%s'", it)
|
|
continue
|
|
}
|
|
|
|
ipsetNames := strings.Split(hostsAndNames[1], ",")
|
|
if len(ipsetNames) == 0 {
|
|
log.Debug("IPSET: invalid value '%s'", 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 '%s'", 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 '%s'", 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())
|
|
_, 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)
|
|
_, 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:'%s'", code, out)
|
|
continue
|
|
}
|
|
log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, name)
|
|
}
|
|
}
|
|
|
|
return resultDone
|
|
}
|