fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
410 lines
10 KiB
Go
410 lines
10 KiB
Go
package home
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"net/url"
|
|
"os"
|
|
"path/filepath"
|
|
"strconv"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/agherr"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/stats"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/util"
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/ameshkov/dnscrypt/v2"
|
|
yaml "gopkg.in/yaml.v2"
|
|
)
|
|
|
|
// Called by other modules when configuration is changed
|
|
func onConfigModified() {
|
|
_ = config.write()
|
|
}
|
|
|
|
// initDNSServer creates an instance of the dnsforward.Server
|
|
// Please note that we must do it even if we don't start it
|
|
// so that we had access to the query log and the stats
|
|
func initDNSServer() error {
|
|
var err error
|
|
baseDir := Context.getDataDir()
|
|
|
|
statsConf := stats.Config{
|
|
Filename: filepath.Join(baseDir, "stats.db"),
|
|
LimitDays: config.DNS.StatsInterval,
|
|
AnonymizeClientIP: config.DNS.AnonymizeClientIP,
|
|
ConfigModified: onConfigModified,
|
|
HTTPRegister: httpRegister,
|
|
}
|
|
Context.stats, err = stats.New(statsConf)
|
|
if err != nil {
|
|
return fmt.Errorf("couldn't initialize statistics module")
|
|
}
|
|
conf := querylog.Config{
|
|
Enabled: config.DNS.QueryLogEnabled,
|
|
FileEnabled: config.DNS.QueryLogFileEnabled,
|
|
BaseDir: baseDir,
|
|
Interval: config.DNS.QueryLogInterval,
|
|
MemSize: config.DNS.QueryLogMemSize,
|
|
AnonymizeClientIP: config.DNS.AnonymizeClientIP,
|
|
ConfigModified: onConfigModified,
|
|
HTTPRegister: httpRegister,
|
|
}
|
|
Context.queryLog = querylog.New(conf)
|
|
|
|
filterConf := config.DNS.DnsfilterConf
|
|
bindhost := config.DNS.BindHost
|
|
if config.DNS.BindHost.IsUnspecified() {
|
|
bindhost = net.IPv4(127, 0, 0, 1)
|
|
}
|
|
filterConf.ResolverAddress = net.JoinHostPort(bindhost.String(), strconv.Itoa(config.DNS.Port))
|
|
filterConf.AutoHosts = &Context.autoHosts
|
|
filterConf.ConfigModified = onConfigModified
|
|
filterConf.HTTPRegister = httpRegister
|
|
Context.dnsFilter = dnsfilter.New(&filterConf, nil)
|
|
|
|
p := dnsforward.DNSCreateParams{
|
|
DNSFilter: Context.dnsFilter,
|
|
Stats: Context.stats,
|
|
QueryLog: Context.queryLog,
|
|
}
|
|
if Context.dhcpServer != nil {
|
|
p.DHCPServer = Context.dhcpServer
|
|
}
|
|
Context.dnsServer = dnsforward.NewServer(p)
|
|
Context.clients.dnsServer = Context.dnsServer
|
|
dnsConfig, err := generateServerConfig()
|
|
if err != nil {
|
|
closeDNSServer()
|
|
return fmt.Errorf("generateServerConfig: %w", err)
|
|
}
|
|
|
|
err = Context.dnsServer.Prepare(&dnsConfig)
|
|
if err != nil {
|
|
closeDNSServer()
|
|
return fmt.Errorf("dnsServer.Prepare: %w", err)
|
|
}
|
|
|
|
Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
|
|
Context.whois = initWhois(&Context.clients)
|
|
|
|
Context.filters.Init()
|
|
return nil
|
|
}
|
|
|
|
func isRunning() bool {
|
|
return Context.dnsServer != nil && Context.dnsServer.IsRunning()
|
|
}
|
|
|
|
func onDNSRequest(d *proxy.DNSContext) {
|
|
ip := dnsforward.IPFromAddr(d.Addr)
|
|
if ip == nil {
|
|
// This would be quite weird if we get here
|
|
return
|
|
}
|
|
|
|
if !ip.IsLoopback() {
|
|
Context.rdns.Begin(ip)
|
|
}
|
|
if !Context.ipDetector.detectSpecialNetwork(ip) {
|
|
Context.whois.Begin(ip)
|
|
}
|
|
}
|
|
|
|
func generateServerConfig() (newconfig dnsforward.ServerConfig, err error) {
|
|
newconfig = dnsforward.ServerConfig{
|
|
UDPListenAddr: &net.UDPAddr{IP: config.DNS.BindHost, Port: config.DNS.Port},
|
|
TCPListenAddr: &net.TCPAddr{IP: config.DNS.BindHost, Port: config.DNS.Port},
|
|
FilteringConfig: config.DNS.FilteringConfig,
|
|
ConfigModified: onConfigModified,
|
|
HTTPRegister: httpRegister,
|
|
OnDNSRequest: onDNSRequest,
|
|
}
|
|
|
|
tlsConf := tlsConfigSettings{}
|
|
Context.tls.WriteDiskConfig(&tlsConf)
|
|
if tlsConf.Enabled {
|
|
newconfig.TLSConfig = tlsConf.TLSConfig
|
|
newconfig.TLSConfig.ServerName = tlsConf.ServerName
|
|
|
|
if tlsConf.PortDNSOverTLS != 0 {
|
|
newconfig.TLSListenAddr = &net.TCPAddr{
|
|
IP: config.DNS.BindHost,
|
|
Port: tlsConf.PortDNSOverTLS,
|
|
}
|
|
}
|
|
|
|
if tlsConf.PortDNSOverQUIC != 0 {
|
|
newconfig.QUICListenAddr = &net.UDPAddr{
|
|
IP: config.DNS.BindHost,
|
|
Port: int(tlsConf.PortDNSOverQUIC),
|
|
}
|
|
}
|
|
|
|
if tlsConf.PortDNSCrypt != 0 {
|
|
newconfig.DNSCryptConfig, err = newDNSCrypt(config.DNS.BindHost, tlsConf)
|
|
if err != nil {
|
|
// Don't wrap the error, because it's already
|
|
// wrapped by newDNSCrypt.
|
|
return dnsforward.ServerConfig{}, err
|
|
}
|
|
}
|
|
}
|
|
|
|
newconfig.TLSv12Roots = Context.tlsRoots
|
|
newconfig.TLSCiphers = Context.tlsCiphers
|
|
newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
|
|
|
|
newconfig.FilterHandler = applyAdditionalFiltering
|
|
newconfig.GetCustomUpstreamByClient = Context.clients.FindUpstreams
|
|
|
|
return newconfig, nil
|
|
}
|
|
|
|
func newDNSCrypt(bindHost net.IP, tlsConf tlsConfigSettings) (dnscc dnsforward.DNSCryptConfig, err error) {
|
|
if tlsConf.DNSCryptConfigFile == "" {
|
|
return dnscc, agherr.Error("no dnscrypt_config_file")
|
|
}
|
|
|
|
f, err := os.Open(tlsConf.DNSCryptConfigFile)
|
|
if err != nil {
|
|
return dnscc, fmt.Errorf("opening dnscrypt config: %w", err)
|
|
}
|
|
defer f.Close()
|
|
|
|
rc := &dnscrypt.ResolverConfig{}
|
|
err = yaml.NewDecoder(f).Decode(rc)
|
|
if err != nil {
|
|
return dnscc, fmt.Errorf("decoding dnscrypt config: %w", err)
|
|
}
|
|
|
|
cert, err := rc.CreateCert()
|
|
if err != nil {
|
|
return dnscc, fmt.Errorf("creating dnscrypt cert: %w", err)
|
|
}
|
|
|
|
udpAddr := &net.UDPAddr{
|
|
IP: bindHost,
|
|
Port: tlsConf.PortDNSCrypt,
|
|
}
|
|
tcpAddr := &net.TCPAddr{
|
|
IP: bindHost,
|
|
Port: tlsConf.PortDNSCrypt,
|
|
}
|
|
|
|
return dnsforward.DNSCryptConfig{
|
|
UDPListenAddr: udpAddr,
|
|
TCPListenAddr: tcpAddr,
|
|
ResolverCert: cert,
|
|
ProviderName: rc.ProviderName,
|
|
Enabled: true,
|
|
}, nil
|
|
}
|
|
|
|
type dnsEncryption struct {
|
|
https string
|
|
tls string
|
|
quic string
|
|
}
|
|
|
|
func getDNSEncryption() (de dnsEncryption) {
|
|
tlsConf := tlsConfigSettings{}
|
|
|
|
Context.tls.WriteDiskConfig(&tlsConf)
|
|
|
|
if tlsConf.Enabled && len(tlsConf.ServerName) != 0 {
|
|
hostname := tlsConf.ServerName
|
|
if tlsConf.PortHTTPS != 0 {
|
|
addr := hostname
|
|
if tlsConf.PortHTTPS != 443 {
|
|
addr = net.JoinHostPort(addr, strconv.Itoa(tlsConf.PortHTTPS))
|
|
}
|
|
|
|
de.https = (&url.URL{
|
|
Scheme: "https",
|
|
Host: addr,
|
|
Path: "/dns-query",
|
|
}).String()
|
|
}
|
|
|
|
if tlsConf.PortDNSOverTLS != 0 {
|
|
de.tls = (&url.URL{
|
|
Scheme: "tls",
|
|
Host: net.JoinHostPort(hostname, strconv.Itoa(tlsConf.PortDNSOverTLS)),
|
|
}).String()
|
|
}
|
|
|
|
if tlsConf.PortDNSOverQUIC != 0 {
|
|
de.quic = (&url.URL{
|
|
Scheme: "quic",
|
|
Host: net.JoinHostPort(hostname, strconv.Itoa(int(tlsConf.PortDNSOverQUIC))),
|
|
}).String()
|
|
}
|
|
}
|
|
|
|
return de
|
|
}
|
|
|
|
// Get the list of DNS addresses the server is listening on
|
|
func getDNSAddresses() []string {
|
|
dnsAddresses := []string{}
|
|
|
|
if config.DNS.BindHost.IsUnspecified() {
|
|
ifaces, e := util.GetValidNetInterfacesForWeb()
|
|
if e != nil {
|
|
log.Error("Couldn't get network interfaces: %v", e)
|
|
return []string{}
|
|
}
|
|
|
|
for _, iface := range ifaces {
|
|
for _, addr := range iface.Addresses {
|
|
addDNSAddress(&dnsAddresses, addr)
|
|
}
|
|
}
|
|
} else {
|
|
addDNSAddress(&dnsAddresses, config.DNS.BindHost)
|
|
}
|
|
|
|
dnsEncryption := getDNSEncryption()
|
|
if dnsEncryption.https != "" {
|
|
dnsAddresses = append(dnsAddresses, dnsEncryption.https)
|
|
}
|
|
if dnsEncryption.tls != "" {
|
|
dnsAddresses = append(dnsAddresses, dnsEncryption.tls)
|
|
}
|
|
if dnsEncryption.quic != "" {
|
|
dnsAddresses = append(dnsAddresses, dnsEncryption.quic)
|
|
}
|
|
|
|
return dnsAddresses
|
|
}
|
|
|
|
// applyAdditionalFiltering adds additional client information and settings if
|
|
// the client has them.
|
|
func applyAdditionalFiltering(clientAddr net.IP, clientID string, setts *dnsfilter.RequestFilteringSettings) {
|
|
Context.dnsFilter.ApplyBlockedServices(setts, nil, true)
|
|
|
|
if clientAddr == nil {
|
|
return
|
|
}
|
|
|
|
setts.ClientIP = clientAddr
|
|
|
|
c, ok := Context.clients.Find(clientID)
|
|
if !ok {
|
|
c, ok = Context.clients.Find(clientAddr.String())
|
|
if !ok {
|
|
return
|
|
}
|
|
}
|
|
|
|
log.Debug("using settings for client %s with ip %s and id %q", c.Name, clientAddr, clientID)
|
|
|
|
if c.UseOwnBlockedServices {
|
|
Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)
|
|
}
|
|
|
|
setts.ClientName = c.Name
|
|
setts.ClientTags = c.Tags
|
|
|
|
if !c.UseOwnSettings {
|
|
return
|
|
}
|
|
|
|
setts.FilteringEnabled = c.FilteringEnabled
|
|
setts.SafeSearchEnabled = c.SafeSearchEnabled
|
|
setts.SafeBrowsingEnabled = c.SafeBrowsingEnabled
|
|
setts.ParentalEnabled = c.ParentalEnabled
|
|
}
|
|
|
|
func startDNSServer() error {
|
|
if isRunning() {
|
|
return fmt.Errorf("unable to start forwarding DNS server: Already running")
|
|
}
|
|
|
|
enableFilters(false)
|
|
|
|
Context.clients.Start()
|
|
|
|
err := Context.dnsServer.Start()
|
|
if err != nil {
|
|
return fmt.Errorf("couldn't start forwarding DNS server: %w", err)
|
|
}
|
|
|
|
Context.dnsFilter.Start()
|
|
Context.filters.Start()
|
|
Context.stats.Start()
|
|
Context.queryLog.Start()
|
|
|
|
const topClientsNumber = 100 // the number of clients to get
|
|
for _, ip := range Context.stats.GetTopClientsIP(topClientsNumber) {
|
|
if !ip.IsLoopback() {
|
|
Context.rdns.Begin(ip)
|
|
}
|
|
if !Context.ipDetector.detectSpecialNetwork(ip) {
|
|
Context.whois.Begin(ip)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func reconfigureDNSServer() (err error) {
|
|
var newconfig dnsforward.ServerConfig
|
|
newconfig, err = generateServerConfig()
|
|
if err != nil {
|
|
return fmt.Errorf("generating forwarding dns server config: %w", err)
|
|
}
|
|
|
|
err = Context.dnsServer.Reconfigure(&newconfig)
|
|
if err != nil {
|
|
return fmt.Errorf("starting forwarding dns server: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func stopDNSServer() error {
|
|
if !isRunning() {
|
|
return nil
|
|
}
|
|
|
|
err := Context.dnsServer.Stop()
|
|
if err != nil {
|
|
return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
|
|
}
|
|
|
|
closeDNSServer()
|
|
return nil
|
|
}
|
|
|
|
func closeDNSServer() {
|
|
// DNS forward module must be closed BEFORE stats or queryLog because it depends on them
|
|
if Context.dnsServer != nil {
|
|
Context.dnsServer.Close()
|
|
Context.dnsServer = nil
|
|
}
|
|
|
|
if Context.dnsFilter != nil {
|
|
Context.dnsFilter.Close()
|
|
Context.dnsFilter = nil
|
|
}
|
|
|
|
if Context.stats != nil {
|
|
Context.stats.Close()
|
|
Context.stats = nil
|
|
}
|
|
|
|
if Context.queryLog != nil {
|
|
Context.queryLog.Close()
|
|
Context.queryLog = nil
|
|
}
|
|
|
|
Context.filters.Close()
|
|
|
|
log.Debug("Closed all DNS modules")
|
|
}
|