2019-10-30 11:52:58 +03:00
|
|
|
package dnsforward
|
|
|
|
|
|
|
|
import (
|
|
|
|
"encoding/json"
|
|
|
|
"fmt"
|
|
|
|
"net"
|
|
|
|
"net/http"
|
2022-02-14 16:56:14 +03:00
|
|
|
"sort"
|
2019-10-30 11:52:58 +03:00
|
|
|
"strings"
|
2021-06-15 17:36:49 +03:00
|
|
|
"time"
|
2019-10-30 11:52:58 +03:00
|
|
|
|
2021-12-16 20:54:59 +03:00
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
2021-02-16 18:46:49 +03:00
|
|
|
"github.com/AdguardTeam/dnsproxy/proxy"
|
2019-10-30 11:52:58 +03:00
|
|
|
"github.com/AdguardTeam/dnsproxy/upstream"
|
2021-05-24 17:28:11 +03:00
|
|
|
"github.com/AdguardTeam/golibs/errors"
|
2019-10-30 11:52:58 +03:00
|
|
|
"github.com/AdguardTeam/golibs/log"
|
2021-08-09 16:03:37 +03:00
|
|
|
"github.com/AdguardTeam/golibs/netutil"
|
2021-07-29 17:40:31 +03:00
|
|
|
"github.com/AdguardTeam/golibs/stringutil"
|
2019-10-30 11:52:58 +03:00
|
|
|
"github.com/miekg/dns"
|
|
|
|
)
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
type dnsConfig struct {
|
|
|
|
Upstreams *[]string `json:"upstream_dns"`
|
|
|
|
UpstreamsFile *string `json:"upstream_dns_file"`
|
|
|
|
Bootstraps *[]string `json:"bootstrap_dns"`
|
|
|
|
|
2021-06-17 14:09:16 +03:00
|
|
|
ProtectionEnabled *bool `json:"protection_enabled"`
|
|
|
|
RateLimit *uint32 `json:"ratelimit"`
|
|
|
|
BlockingMode *BlockingMode `json:"blocking_mode"`
|
|
|
|
BlockingIPv4 net.IP `json:"blocking_ipv4"`
|
|
|
|
BlockingIPv6 net.IP `json:"blocking_ipv6"`
|
|
|
|
EDNSCSEnabled *bool `json:"edns_cs_enabled"`
|
|
|
|
DNSSECEnabled *bool `json:"dnssec_enabled"`
|
|
|
|
DisableIPv6 *bool `json:"disable_ipv6"`
|
|
|
|
UpstreamMode *string `json:"upstream_mode"`
|
|
|
|
CacheSize *uint32 `json:"cache_size"`
|
|
|
|
CacheMinTTL *uint32 `json:"cache_ttl_min"`
|
|
|
|
CacheMaxTTL *uint32 `json:"cache_ttl_max"`
|
2021-07-14 21:03:56 +03:00
|
|
|
CacheOptimistic *bool `json:"cache_optimistic"`
|
2021-06-17 14:09:16 +03:00
|
|
|
ResolveClients *bool `json:"resolve_clients"`
|
|
|
|
UsePrivateRDNS *bool `json:"use_private_ptr_resolvers"`
|
|
|
|
LocalPTRUpstreams *[]string `json:"local_ptr_upstreams"`
|
2019-11-08 14:59:12 +03:00
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
func (s *Server) getDNSConfig() (c *dnsConfig) {
|
2021-05-26 17:55:19 +03:00
|
|
|
s.serverLock.RLock()
|
|
|
|
defer s.serverLock.RUnlock()
|
2021-04-07 20:16:06 +03:00
|
|
|
|
2021-07-29 17:40:31 +03:00
|
|
|
upstreams := stringutil.CloneSliceOrEmpty(s.conf.UpstreamDNS)
|
2020-11-20 17:32:41 +03:00
|
|
|
upstreamFile := s.conf.UpstreamDNSFileName
|
2021-07-29 17:40:31 +03:00
|
|
|
bootstraps := stringutil.CloneSliceOrEmpty(s.conf.BootstrapDNS)
|
2020-11-20 17:32:41 +03:00
|
|
|
protectionEnabled := s.conf.ProtectionEnabled
|
|
|
|
blockingMode := s.conf.BlockingMode
|
2021-04-07 20:16:06 +03:00
|
|
|
blockingIPv4 := s.conf.BlockingIPv4
|
|
|
|
blockingIPv6 := s.conf.BlockingIPv6
|
|
|
|
ratelimit := s.conf.Ratelimit
|
|
|
|
enableEDNSClientSubnet := s.conf.EnableEDNSClientSubnet
|
|
|
|
enableDNSSEC := s.conf.EnableDNSSEC
|
|
|
|
aaaaDisabled := s.conf.AAAADisabled
|
|
|
|
cacheSize := s.conf.CacheSize
|
|
|
|
cacheMinTTL := s.conf.CacheMinTTL
|
|
|
|
cacheMaxTTL := s.conf.CacheMaxTTL
|
2021-07-14 21:03:56 +03:00
|
|
|
cacheOptimistic := s.conf.CacheOptimistic
|
2021-04-07 20:16:06 +03:00
|
|
|
resolveClients := s.conf.ResolveClients
|
2021-05-26 17:55:19 +03:00
|
|
|
usePrivateRDNS := s.conf.UsePrivateRDNS
|
2021-07-29 17:40:31 +03:00
|
|
|
localPTRUpstreams := stringutil.CloneSliceOrEmpty(s.conf.LocalPTRResolvers)
|
2020-11-20 17:32:41 +03:00
|
|
|
var upstreamMode string
|
2020-06-10 15:33:23 +03:00
|
|
|
if s.conf.FastestAddr {
|
2020-11-20 17:32:41 +03:00
|
|
|
upstreamMode = "fastest_addr"
|
2020-06-10 15:33:23 +03:00
|
|
|
} else if s.conf.AllServers {
|
2020-11-20 17:32:41 +03:00
|
|
|
upstreamMode = "parallel"
|
2020-06-10 15:33:23 +03:00
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
return &dnsConfig{
|
2020-11-20 17:32:41 +03:00
|
|
|
Upstreams: &upstreams,
|
|
|
|
UpstreamsFile: &upstreamFile,
|
|
|
|
Bootstraps: &bootstraps,
|
|
|
|
ProtectionEnabled: &protectionEnabled,
|
|
|
|
BlockingMode: &blockingMode,
|
2021-04-07 20:16:06 +03:00
|
|
|
BlockingIPv4: blockingIPv4,
|
|
|
|
BlockingIPv6: blockingIPv6,
|
|
|
|
RateLimit: &ratelimit,
|
|
|
|
EDNSCSEnabled: &enableEDNSClientSubnet,
|
|
|
|
DNSSECEnabled: &enableDNSSEC,
|
|
|
|
DisableIPv6: &aaaaDisabled,
|
|
|
|
CacheSize: &cacheSize,
|
|
|
|
CacheMinTTL: &cacheMinTTL,
|
|
|
|
CacheMaxTTL: &cacheMaxTTL,
|
2021-07-14 21:03:56 +03:00
|
|
|
CacheOptimistic: &cacheOptimistic,
|
2020-11-20 17:32:41 +03:00
|
|
|
UpstreamMode: &upstreamMode,
|
2021-04-07 20:16:06 +03:00
|
|
|
ResolveClients: &resolveClients,
|
2021-05-26 17:55:19 +03:00
|
|
|
UsePrivateRDNS: &usePrivateRDNS,
|
2021-04-07 20:16:06 +03:00
|
|
|
LocalPTRUpstreams: &localPTRUpstreams,
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
|
2021-06-01 14:28:34 +03:00
|
|
|
defLocalPTRUps, err := s.filterOurDNSAddrs(s.sysResolvers.Get())
|
|
|
|
if err != nil {
|
|
|
|
log.Debug("getting dns configuration: %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
resp := struct {
|
|
|
|
dnsConfig
|
|
|
|
// DefautLocalPTRUpstreams is used to pass the addresses from
|
|
|
|
// systemResolvers to the front-end. It's not a pointer to the slice
|
|
|
|
// since there is no need to omit it while decoding from JSON.
|
|
|
|
DefautLocalPTRUpstreams []string `json:"default_local_ptr_upstreams,omitempty"`
|
|
|
|
}{
|
2022-02-14 16:56:14 +03:00
|
|
|
dnsConfig: *s.getDNSConfig(),
|
2021-06-01 14:28:34 +03:00
|
|
|
DefautLocalPTRUpstreams: defLocalPTRUps,
|
|
|
|
}
|
2020-11-20 17:32:41 +03:00
|
|
|
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
2019-11-08 14:59:12 +03:00
|
|
|
|
2021-06-01 14:28:34 +03:00
|
|
|
if err = json.NewEncoder(w).Encode(resp); err != nil {
|
2021-12-16 20:54:59 +03:00
|
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
|
|
|
|
|
2019-11-08 14:59:12 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
func (req *dnsConfig) checkBlockingMode() bool {
|
|
|
|
if req.BlockingMode == nil {
|
|
|
|
return true
|
2019-11-08 16:19:56 +03:00
|
|
|
}
|
|
|
|
|
2021-06-17 14:09:16 +03:00
|
|
|
switch bm := *req.BlockingMode; bm {
|
|
|
|
case BlockingModeDefault,
|
|
|
|
BlockingModeREFUSED,
|
|
|
|
BlockingModeNXDOMAIN,
|
|
|
|
BlockingModeNullIP:
|
|
|
|
return true
|
|
|
|
case BlockingModeCustomIP:
|
|
|
|
return req.BlockingIPv4.To4() != nil && req.BlockingIPv6 != nil
|
|
|
|
default:
|
|
|
|
return false
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (req *dnsConfig) checkUpstreamsMode() bool {
|
2022-02-14 16:56:14 +03:00
|
|
|
valid := []string{"", "fastest_addr", "parallel"}
|
|
|
|
|
|
|
|
return req.UpstreamMode == nil || stringutil.InSlice(valid, *req.UpstreamMode)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (req *dnsConfig) checkBootstrap() (err error) {
|
|
|
|
if req.Bootstraps == nil {
|
|
|
|
return nil
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
var b string
|
|
|
|
defer func() { err = errors.Annotate(err, "checking bootstrap %s: invalid address: %w", b) }()
|
|
|
|
|
|
|
|
for _, b = range *req.Bootstraps {
|
|
|
|
if b == "" {
|
|
|
|
return errors.Error("empty")
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, err = upstream.NewResolver(b, nil); err != nil {
|
|
|
|
return err
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
return nil
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
// validate returns an error if any field of req is invalid.
|
2022-03-18 13:37:27 +03:00
|
|
|
func (req *dnsConfig) validate(privateNets netutil.SubnetSet) (err error) {
|
2022-02-14 16:56:14 +03:00
|
|
|
if req.Upstreams != nil {
|
|
|
|
err = ValidateUpstreams(*req.Upstreams)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("validating upstream servers: %w", err)
|
|
|
|
}
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
if req.LocalPTRUpstreams != nil {
|
2022-03-18 13:37:27 +03:00
|
|
|
err = ValidateUpstreamsPrivate(*req.LocalPTRUpstreams, privateNets)
|
2022-02-14 16:56:14 +03:00
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("validating private upstream servers: %w", err)
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
2022-02-14 16:56:14 +03:00
|
|
|
}
|
2020-11-20 17:32:41 +03:00
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
err = req.checkBootstrap()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2019-11-08 16:19:56 +03:00
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
switch {
|
|
|
|
case !req.checkBlockingMode():
|
|
|
|
return errors.Error("blocking_mode: incorrect value")
|
|
|
|
case !req.checkUpstreamsMode():
|
|
|
|
return errors.Error("upstream_mode: incorrect value")
|
|
|
|
case !req.checkCacheTTL():
|
|
|
|
return errors.Error("cache_ttl_min must be less or equal than cache_ttl_max")
|
|
|
|
default:
|
|
|
|
return nil
|
|
|
|
}
|
2019-11-08 16:19:56 +03:00
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
func (req *dnsConfig) checkCacheTTL() bool {
|
|
|
|
if req.CacheMinTTL == nil && req.CacheMaxTTL == nil {
|
|
|
|
return true
|
|
|
|
}
|
2020-12-21 15:43:27 +03:00
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
var min, max uint32
|
|
|
|
if req.CacheMinTTL != nil {
|
|
|
|
min = *req.CacheMinTTL
|
2020-08-21 15:54:16 +03:00
|
|
|
}
|
2020-12-21 15:43:27 +03:00
|
|
|
if req.CacheMaxTTL != nil {
|
2020-11-20 17:32:41 +03:00
|
|
|
max = *req.CacheMaxTTL
|
2020-08-21 15:54:16 +03:00
|
|
|
}
|
2020-11-20 17:32:41 +03:00
|
|
|
|
|
|
|
return min <= max
|
2020-08-21 15:54:16 +03:00
|
|
|
}
|
|
|
|
|
2019-11-08 14:59:12 +03:00
|
|
|
func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
|
2022-02-14 16:56:14 +03:00
|
|
|
req := &dnsConfig{}
|
|
|
|
err := json.NewDecoder(r.Body).Decode(req)
|
2022-01-13 15:05:44 +03:00
|
|
|
if err != nil {
|
2022-02-14 16:56:14 +03:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "decoding request: %s", err)
|
2021-12-16 20:54:59 +03:00
|
|
|
|
2019-11-08 14:59:12 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2022-03-18 13:37:27 +03:00
|
|
|
err = req.validate(s.privateNets)
|
2022-02-14 16:56:14 +03:00
|
|
|
if err != nil {
|
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
|
2021-12-16 20:54:59 +03:00
|
|
|
|
2020-07-03 20:35:04 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2021-03-26 13:29:33 +03:00
|
|
|
restart := s.setConfig(req)
|
|
|
|
s.conf.ConfigModified()
|
|
|
|
|
|
|
|
if restart {
|
2022-02-14 16:56:14 +03:00
|
|
|
err = s.Reconfigure(nil)
|
|
|
|
if err != nil {
|
2021-12-16 20:54:59 +03:00
|
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "%s", err)
|
2020-11-20 17:32:41 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
func (s *Server) setConfigRestartable(dc *dnsConfig) (restart bool) {
|
2020-11-20 17:32:41 +03:00
|
|
|
if dc.Upstreams != nil {
|
|
|
|
s.conf.UpstreamDNS = *dc.Upstreams
|
2020-04-22 19:14:04 +03:00
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
if dc.LocalPTRUpstreams != nil {
|
|
|
|
s.conf.LocalPTRResolvers = *dc.LocalPTRUpstreams
|
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
if dc.UpstreamsFile != nil {
|
|
|
|
s.conf.UpstreamDNSFileName = *dc.UpstreamsFile
|
2020-09-01 14:33:35 +03:00
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
if dc.Bootstraps != nil {
|
|
|
|
s.conf.BootstrapDNS = *dc.Bootstraps
|
2020-04-22 19:14:04 +03:00
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
if dc.RateLimit != nil && s.conf.Ratelimit != *dc.RateLimit {
|
2020-11-20 17:32:41 +03:00
|
|
|
s.conf.Ratelimit = *dc.RateLimit
|
2022-02-14 16:56:14 +03:00
|
|
|
restart = true
|
2019-11-08 16:19:56 +03:00
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
if dc.EDNSCSEnabled != nil {
|
|
|
|
s.conf.EnableEDNSClientSubnet = *dc.EDNSCSEnabled
|
2019-11-12 19:45:55 +03:00
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
if dc.CacheSize != nil {
|
|
|
|
s.conf.CacheSize = *dc.CacheSize
|
2020-07-03 20:35:04 +03:00
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
if dc.CacheMinTTL != nil {
|
|
|
|
s.conf.CacheMinTTL = *dc.CacheMinTTL
|
2020-07-03 20:35:04 +03:00
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2020-11-20 17:32:41 +03:00
|
|
|
if dc.CacheMaxTTL != nil {
|
|
|
|
s.conf.CacheMaxTTL = *dc.CacheMaxTTL
|
2020-07-03 20:35:04 +03:00
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2021-07-14 21:03:56 +03:00
|
|
|
if dc.CacheOptimistic != nil {
|
|
|
|
s.conf.CacheOptimistic = *dc.CacheOptimistic
|
|
|
|
restart = true
|
|
|
|
}
|
|
|
|
|
2021-03-26 13:29:33 +03:00
|
|
|
return restart
|
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
func (s *Server) setConfig(dc *dnsConfig) (restart bool) {
|
2021-05-26 17:55:19 +03:00
|
|
|
s.serverLock.Lock()
|
|
|
|
defer s.serverLock.Unlock()
|
2021-03-26 13:29:33 +03:00
|
|
|
|
|
|
|
if dc.ProtectionEnabled != nil {
|
|
|
|
s.conf.ProtectionEnabled = *dc.ProtectionEnabled
|
|
|
|
}
|
|
|
|
|
|
|
|
if dc.BlockingMode != nil {
|
|
|
|
s.conf.BlockingMode = *dc.BlockingMode
|
|
|
|
if *dc.BlockingMode == "custom_ip" {
|
|
|
|
s.conf.BlockingIPv4 = dc.BlockingIPv4.To4()
|
|
|
|
s.conf.BlockingIPv6 = dc.BlockingIPv6.To16()
|
2020-06-10 15:33:23 +03:00
|
|
|
}
|
2020-04-22 19:14:04 +03:00
|
|
|
}
|
2021-03-26 13:29:33 +03:00
|
|
|
|
|
|
|
if dc.DNSSECEnabled != nil {
|
|
|
|
s.conf.EnableDNSSEC = *dc.DNSSECEnabled
|
|
|
|
}
|
|
|
|
|
|
|
|
if dc.DisableIPv6 != nil {
|
|
|
|
s.conf.AAAADisabled = *dc.DisableIPv6
|
|
|
|
}
|
|
|
|
|
|
|
|
if dc.UpstreamMode != nil {
|
|
|
|
s.conf.AllServers = *dc.UpstreamMode == "parallel"
|
|
|
|
s.conf.FastestAddr = *dc.UpstreamMode == "fastest_addr"
|
|
|
|
}
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
if dc.ResolveClients != nil {
|
|
|
|
s.conf.ResolveClients = *dc.ResolveClients
|
|
|
|
}
|
|
|
|
|
2021-05-26 17:55:19 +03:00
|
|
|
if dc.UsePrivateRDNS != nil {
|
|
|
|
s.conf.UsePrivateRDNS = *dc.UsePrivateRDNS
|
|
|
|
}
|
|
|
|
|
2021-03-26 13:29:33 +03:00
|
|
|
return s.setConfigRestartable(dc)
|
2019-11-08 14:59:12 +03:00
|
|
|
}
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
// upstreamJSON is a request body for handleTestUpstreamDNS endpoint.
|
2019-10-30 11:52:58 +03:00
|
|
|
type upstreamJSON struct {
|
2021-04-07 20:16:06 +03:00
|
|
|
Upstreams []string `json:"upstream_dns"`
|
|
|
|
BootstrapDNS []string `json:"bootstrap_dns"`
|
|
|
|
PrivateUpstreams []string `json:"private_upstream"`
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
// IsCommentOrEmpty returns true if s starts with a "#" character or is empty.
|
|
|
|
// This function is useful for filtering out non-upstream lines from upstream
|
|
|
|
// configs.
|
2021-07-29 17:40:31 +03:00
|
|
|
func IsCommentOrEmpty(s string) (ok bool) {
|
|
|
|
return len(s) == 0 || s[0] == '#'
|
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
// newUpstreamConfig validates upstreams and returns an appropriate upstream
|
|
|
|
// configuration or nil if it can't be built.
|
2021-04-07 20:16:06 +03:00
|
|
|
//
|
2022-02-14 16:56:14 +03:00
|
|
|
// TODO(e.burkov): Perhaps proxy.ParseUpstreamsConfig should validate upstreams
|
|
|
|
// slice already so that this function may be considered useless.
|
|
|
|
func newUpstreamConfig(upstreams []string) (conf *proxy.UpstreamConfig, err error) {
|
|
|
|
// No need to validate comments and empty lines.
|
2021-07-29 17:40:31 +03:00
|
|
|
upstreams = stringutil.FilterOut(upstreams, IsCommentOrEmpty)
|
2020-09-22 15:04:17 +03:00
|
|
|
if len(upstreams) == 0 {
|
2022-02-14 16:56:14 +03:00
|
|
|
// Consider this case valid since it means the default server should be
|
|
|
|
// used.
|
|
|
|
return nil, nil
|
2020-09-22 15:04:17 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
for _, u := range upstreams {
|
|
|
|
var ups string
|
|
|
|
var domains []string
|
|
|
|
ups, domains, err = separateUpstream(u)
|
|
|
|
if err != nil {
|
|
|
|
// Don't wrap the error since it's informative enough as is.
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = validateUpstream(ups, domains)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("validating upstream %q: %w", u, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
conf, err = proxy.ParseUpstreamsConfig(
|
2021-03-11 12:17:54 +03:00
|
|
|
upstreams,
|
2022-02-14 16:56:14 +03:00
|
|
|
&upstream.Options{Bootstrap: []string{}, Timeout: DefaultTimeout},
|
2021-03-03 15:27:25 +03:00
|
|
|
)
|
2021-02-16 18:46:49 +03:00
|
|
|
if err != nil {
|
2022-02-14 16:56:14 +03:00
|
|
|
return nil, err
|
|
|
|
} else if len(conf.Upstreams) == 0 {
|
|
|
|
return nil, errors.Error("no default upstreams specified")
|
2021-02-16 18:46:49 +03:00
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
return conf, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ValidateUpstreams validates each upstream and returns an error if any
|
|
|
|
// upstream is invalid or if there are no default upstreams specified.
|
|
|
|
//
|
|
|
|
// TODO(e.burkov): Move into aghnet or even into dnsproxy.
|
|
|
|
func ValidateUpstreams(upstreams []string) (err error) {
|
|
|
|
_, err = newUpstreamConfig(upstreams)
|
|
|
|
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// stringKeysSorted returns the sorted slice of string keys of m.
|
|
|
|
//
|
|
|
|
// TODO(e.burkov): Use generics in Go 1.18. Move into golibs.
|
|
|
|
func stringKeysSorted(m map[string][]upstream.Upstream) (sorted []string) {
|
|
|
|
sorted = make([]string, 0, len(m))
|
|
|
|
for s := range m {
|
|
|
|
sorted = append(sorted, s)
|
|
|
|
}
|
|
|
|
|
|
|
|
sort.Strings(sorted)
|
|
|
|
|
|
|
|
return sorted
|
|
|
|
}
|
|
|
|
|
|
|
|
// ValidateUpstreamsPrivate validates each upstream and returns an error if any
|
|
|
|
// upstream is invalid or if there are no default upstreams specified. It also
|
|
|
|
// checks each domain of domain-specific upstreams for being ARPA pointing to
|
2022-03-18 13:37:27 +03:00
|
|
|
// a locally-served network. privateNets must not be nil.
|
|
|
|
func ValidateUpstreamsPrivate(upstreams []string, privateNets netutil.SubnetSet) (err error) {
|
2022-02-14 16:56:14 +03:00
|
|
|
conf, err := newUpstreamConfig(upstreams)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if conf == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var errs []error
|
|
|
|
|
|
|
|
for _, domain := range stringKeysSorted(conf.DomainReservedUpstreams) {
|
|
|
|
var subnet *net.IPNet
|
|
|
|
subnet, err = netutil.SubnetFromReversedAddr(domain)
|
|
|
|
if err != nil {
|
|
|
|
errs = append(errs, err)
|
|
|
|
|
|
|
|
continue
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-03-18 13:37:27 +03:00
|
|
|
if !privateNets.Contains(subnet.IP) {
|
2022-02-14 16:56:14 +03:00
|
|
|
errs = append(
|
|
|
|
errs,
|
|
|
|
fmt.Errorf("arpa domain %q should point to a locally-served network", domain),
|
|
|
|
)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-14 16:56:14 +03:00
|
|
|
if len(errs) > 0 {
|
|
|
|
return errors.List("checking domain-specific upstreams", errs...)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-02 14:21:33 +03:00
|
|
|
var protocols = []string{"udp://", "tcp://", "tls://", "https://", "sdns://", "quic://"}
|
2019-10-30 11:52:58 +03:00
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
// validateUpstream returns an error if u alongside with domains is not a valid
|
|
|
|
// upstream configuration. useDefault is true if the upstream is
|
|
|
|
// domain-specific and is configured to point at the default upstream server
|
|
|
|
// which is validated separately. The upstream is considered domain-specific
|
|
|
|
// only if domains is at least not nil.
|
|
|
|
func validateUpstream(u string, domains []string) (useDefault bool, err error) {
|
2022-01-13 15:05:44 +03:00
|
|
|
// The special server address '#' means that default server must be used.
|
2022-07-29 19:27:15 +03:00
|
|
|
if useDefault = u == "#" && domains != nil; useDefault {
|
2021-04-07 16:36:38 +03:00
|
|
|
return useDefault, nil
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-01-13 15:05:44 +03:00
|
|
|
// Check if the upstream has a valid protocol prefix.
|
|
|
|
//
|
|
|
|
// TODO(e.burkov): Validate the domain name.
|
2019-10-30 11:52:58 +03:00
|
|
|
for _, proto := range protocols {
|
|
|
|
if strings.HasPrefix(u, proto) {
|
2021-04-07 16:36:38 +03:00
|
|
|
return useDefault, nil
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if strings.Contains(u, "://") {
|
2022-01-13 15:05:44 +03:00
|
|
|
return useDefault, errors.Error("wrong protocol")
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-01-13 15:05:44 +03:00
|
|
|
// Check if upstream is either an IP or IP with port.
|
|
|
|
if net.ParseIP(u) != nil {
|
|
|
|
return useDefault, nil
|
|
|
|
} else if _, err = netutil.ParseIPPort(u); err != nil {
|
|
|
|
return useDefault, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return useDefault, nil
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
// separateUpstream returns the upstream and the specified domains. domains is
|
|
|
|
// nil when the upstream is not domains-specific. Otherwise it may also be
|
|
|
|
// empty.
|
|
|
|
func separateUpstream(upstreamStr string) (ups string, domains []string, err error) {
|
2021-04-07 16:36:38 +03:00
|
|
|
if !strings.HasPrefix(upstreamStr, "[/") {
|
2022-07-29 19:27:15 +03:00
|
|
|
return upstreamStr, nil, nil
|
2021-04-07 16:36:38 +03:00
|
|
|
}
|
2022-07-29 19:27:15 +03:00
|
|
|
|
2022-01-13 15:05:44 +03:00
|
|
|
defer func() { err = errors.Annotate(err, "bad upstream for domain %q: %w", upstreamStr) }()
|
2021-04-07 16:36:38 +03:00
|
|
|
|
|
|
|
parts := strings.Split(upstreamStr[2:], "/]")
|
2022-01-13 15:05:44 +03:00
|
|
|
switch len(parts) {
|
|
|
|
case 2:
|
|
|
|
// Go on.
|
|
|
|
case 1:
|
2022-07-29 19:27:15 +03:00
|
|
|
return "", nil, errors.Error("missing separator")
|
2022-01-13 15:05:44 +03:00
|
|
|
default:
|
2022-07-29 19:27:15 +03:00
|
|
|
return "", []string{}, errors.Error("duplicated separator")
|
2021-04-07 16:36:38 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
for i, host := range strings.Split(parts[0], "/") {
|
2021-04-07 16:36:38 +03:00
|
|
|
if host == "" {
|
|
|
|
continue
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
err = netutil.ValidateDomainName(strings.TrimPrefix(host, "*."))
|
2021-04-07 16:36:38 +03:00
|
|
|
if err != nil {
|
2022-07-29 19:27:15 +03:00
|
|
|
return "", domains, fmt.Errorf("domain at index %d: %w", i, err)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
2022-07-29 19:27:15 +03:00
|
|
|
|
|
|
|
domains = append(domains, host)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
2021-04-07 16:36:38 +03:00
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
return parts[1], domains, nil
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
// healthCheckFunc is a signature of function to check if upstream exchanges
|
|
|
|
// properly.
|
|
|
|
type healthCheckFunc func(u upstream.Upstream) (err error)
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
// checkDNSUpstreamExc checks if the DNS upstream exchanges correctly.
|
|
|
|
func checkDNSUpstreamExc(u upstream.Upstream) (err error) {
|
2022-07-29 19:27:15 +03:00
|
|
|
// testTLD is the special-use fully-qualified domain name for testing the
|
|
|
|
// DNS server reachability.
|
|
|
|
//
|
|
|
|
// See https://datatracker.ietf.org/doc/html/rfc6761#section-6.2.
|
|
|
|
const testTLD = "test."
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
req := &dns.Msg{
|
|
|
|
MsgHdr: dns.MsgHdr{
|
|
|
|
Id: dns.Id(),
|
|
|
|
RecursionDesired: true,
|
|
|
|
},
|
|
|
|
Question: []dns.Question{{
|
2022-07-29 19:27:15 +03:00
|
|
|
Name: testTLD,
|
2021-04-07 20:16:06 +03:00
|
|
|
Qtype: dns.TypeA,
|
|
|
|
Qclass: dns.ClassINET,
|
|
|
|
}},
|
|
|
|
}
|
|
|
|
|
|
|
|
var reply *dns.Msg
|
|
|
|
reply, err = u.Exchange(req)
|
2019-10-30 11:52:58 +03:00
|
|
|
if err != nil {
|
2021-04-07 20:16:06 +03:00
|
|
|
return fmt.Errorf("couldn't communicate with upstream: %w", err)
|
2022-07-29 19:27:15 +03:00
|
|
|
} else if len(reply.Answer) != 0 {
|
|
|
|
return errors.Error("wrong response")
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// checkPrivateUpstreamExc checks if the upstream for resolving private
|
|
|
|
// addresses exchanges correctly.
|
2022-07-29 19:27:15 +03:00
|
|
|
//
|
|
|
|
// TODO(e.burkov): Think about testing the ip6.arpa. as well.
|
2021-04-07 20:16:06 +03:00
|
|
|
func checkPrivateUpstreamExc(u upstream.Upstream) (err error) {
|
2022-07-29 19:27:15 +03:00
|
|
|
// inAddrArpaTLD is the special-use fully-qualified domain name for PTR IP
|
|
|
|
// address resolution.
|
|
|
|
//
|
|
|
|
// See https://datatracker.ietf.org/doc/html/rfc1035#section-3.5.
|
|
|
|
const inAddrArpaTLD = "in-addr.arpa."
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
req := &dns.Msg{
|
|
|
|
MsgHdr: dns.MsgHdr{
|
|
|
|
Id: dns.Id(),
|
|
|
|
RecursionDesired: true,
|
|
|
|
},
|
|
|
|
Question: []dns.Question{{
|
2022-07-29 19:27:15 +03:00
|
|
|
Name: inAddrArpaTLD,
|
2021-04-07 20:16:06 +03:00
|
|
|
Qtype: dns.TypePTR,
|
|
|
|
Qclass: dns.ClassINET,
|
|
|
|
}},
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
if _, err = u.Exchange(req); err != nil {
|
|
|
|
return fmt.Errorf("couldn't communicate with upstream: %w", err)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
return nil
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
// domainSpecificTestError is a wrapper for errors returned by checkDNS to mark
|
|
|
|
// the tested upstream domain-specific and therefore consider its errors
|
|
|
|
// non-critical.
|
|
|
|
//
|
|
|
|
// TODO(a.garipov): Some common mechanism of distinguishing between errors and
|
|
|
|
// warnings (non-critical errors) is desired.
|
|
|
|
type domainSpecificTestError struct {
|
|
|
|
error
|
|
|
|
}
|
|
|
|
|
|
|
|
// checkDNS checks the upstream server defined by upstreamConfigStr using
|
|
|
|
// healthCheck for actually exchange messages. It uses bootstrap to resolve the
|
|
|
|
// upstream's address.
|
|
|
|
func checkDNS(
|
|
|
|
upstreamConfigStr string,
|
|
|
|
bootstrap []string,
|
|
|
|
timeout time.Duration,
|
|
|
|
healthCheck healthCheckFunc,
|
|
|
|
) (err error) {
|
|
|
|
if IsCommentOrEmpty(upstreamConfigStr) {
|
2020-09-22 15:04:17 +03:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
// Separate upstream from domains list.
|
2022-07-29 19:27:15 +03:00
|
|
|
upstreamAddr, domains, err := separateUpstream(upstreamConfigStr)
|
|
|
|
if err != nil {
|
2020-11-05 15:20:57 +03:00
|
|
|
return fmt.Errorf("wrong upstream format: %w", err)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
useDefault, err := validateUpstream(upstreamAddr, domains)
|
|
|
|
if err != nil {
|
2020-11-05 15:20:57 +03:00
|
|
|
return fmt.Errorf("wrong upstream format: %w", err)
|
2022-07-29 19:27:15 +03:00
|
|
|
} else if useDefault {
|
|
|
|
return nil
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if len(bootstrap) == 0 {
|
|
|
|
bootstrap = defaultBootstrap
|
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
log.Debug("dnsforward: checking if upstream %q works", upstreamAddr)
|
2022-01-13 15:05:44 +03:00
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
u, err := upstream.AddressToUpstream(upstreamAddr, &upstream.Options{
|
2021-04-07 20:16:06 +03:00
|
|
|
Bootstrap: bootstrap,
|
2021-06-15 17:36:49 +03:00
|
|
|
Timeout: timeout,
|
2021-04-07 20:16:06 +03:00
|
|
|
})
|
2019-10-30 11:52:58 +03:00
|
|
|
if err != nil {
|
2022-07-29 19:27:15 +03:00
|
|
|
return fmt.Errorf("failed to choose upstream for %q: %w", upstreamAddr, err)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
if err = healthCheck(u); err != nil {
|
|
|
|
err = fmt.Errorf("upstream %q fails to exchange: %w", upstreamAddr, err)
|
|
|
|
if domains != nil {
|
|
|
|
return domainSpecificTestError{error: err}
|
|
|
|
}
|
|
|
|
|
|
|
|
return err
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
2022-07-29 19:27:15 +03:00
|
|
|
log.Debug("dnsforward: upstream %q is ok", upstreamAddr)
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) {
|
|
|
|
req := &upstreamJSON{}
|
|
|
|
err := json.NewDecoder(r.Body).Decode(req)
|
2019-10-30 11:52:58 +03:00
|
|
|
if err != nil {
|
2021-12-16 20:54:59 +03:00
|
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Failed to read request body: %s", err)
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
return
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
result := map[string]string{}
|
|
|
|
bootstraps := req.BootstrapDNS
|
|
|
|
|
2021-06-15 17:36:49 +03:00
|
|
|
timeout := s.conf.UpstreamTimeout
|
2021-04-07 20:16:06 +03:00
|
|
|
for _, host := range req.Upstreams {
|
2021-06-15 17:36:49 +03:00
|
|
|
err = checkDNS(host, bootstraps, timeout, checkDNSUpstreamExc)
|
2021-04-07 20:16:06 +03:00
|
|
|
if err != nil {
|
|
|
|
log.Info("%v", err)
|
|
|
|
result[host] = err.Error()
|
2022-07-29 19:27:15 +03:00
|
|
|
if _, ok := err.(domainSpecificTestError); ok {
|
|
|
|
result[host] = fmt.Sprintf("WARNING: %s", result[host])
|
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
result[host] = "OK"
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
for _, host := range req.PrivateUpstreams {
|
2021-06-15 17:36:49 +03:00
|
|
|
err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc)
|
2021-04-07 20:16:06 +03:00
|
|
|
if err != nil {
|
|
|
|
log.Info("%v", err)
|
2022-01-13 15:05:44 +03:00
|
|
|
// TODO(e.burkov): If passed upstream have already written an error
|
|
|
|
// above, we rewriting the error for it. These cases should be
|
|
|
|
// handled properly instead.
|
2021-04-07 20:16:06 +03:00
|
|
|
result[host] = err.Error()
|
2022-07-29 19:27:15 +03:00
|
|
|
if _, ok := err.(domainSpecificTestError); ok {
|
|
|
|
result[host] = fmt.Sprintf("WARNING: %s", result[host])
|
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
continue
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
result[host] = "OK"
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2021-04-07 20:16:06 +03:00
|
|
|
jsonVal, err := json.Marshal(result)
|
|
|
|
if err != nil {
|
2021-12-16 20:54:59 +03:00
|
|
|
aghhttp.Error(
|
|
|
|
r,
|
|
|
|
w,
|
|
|
|
http.StatusInternalServerError,
|
|
|
|
"Unable to marshal status json: %s",
|
|
|
|
err,
|
|
|
|
)
|
2021-04-07 20:16:06 +03:00
|
|
|
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
|
|
_, err = w.Write(jsonVal)
|
|
|
|
if err != nil {
|
2021-12-16 20:54:59 +03:00
|
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
|
2021-04-07 20:16:06 +03:00
|
|
|
}
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|
|
|
|
|
2020-05-29 11:15:31 +03:00
|
|
|
// Control flow:
|
|
|
|
// web
|
2021-06-18 18:13:36 +03:00
|
|
|
// -> dnsforward.handleDoH -> dnsforward.ServeHTTP
|
2020-05-29 11:15:31 +03:00
|
|
|
// -> proxy.ServeHTTP -> proxy.handleDNSRequest
|
|
|
|
// -> dnsforward.handleDNSRequest
|
2021-06-18 18:13:36 +03:00
|
|
|
func (s *Server) handleDoH(w http.ResponseWriter, r *http.Request) {
|
|
|
|
if !s.conf.TLSAllowUnencryptedDoH && r.TLS == nil {
|
2021-12-16 20:54:59 +03:00
|
|
|
aghhttp.Error(r, w, http.StatusNotFound, "Not Found")
|
2020-02-27 11:48:59 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if !s.IsRunning() {
|
2021-12-16 20:54:59 +03:00
|
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "dns server is not running")
|
2020-02-27 11:48:59 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
s.ServeHTTP(w, r)
|
|
|
|
}
|
|
|
|
|
2019-10-30 11:52:58 +03:00
|
|
|
func (s *Server) registerHandlers() {
|
2021-01-13 17:26:57 +03:00
|
|
|
s.conf.HTTPRegister(http.MethodGet, "/control/dns_info", s.handleGetConfig)
|
|
|
|
s.conf.HTTPRegister(http.MethodPost, "/control/dns_config", s.handleSetConfig)
|
|
|
|
s.conf.HTTPRegister(http.MethodPost, "/control/test_upstream_dns", s.handleTestUpstreamDNS)
|
2019-10-30 15:11:16 +03:00
|
|
|
|
2021-01-13 17:26:57 +03:00
|
|
|
s.conf.HTTPRegister(http.MethodGet, "/control/access/list", s.handleAccessList)
|
|
|
|
s.conf.HTTPRegister(http.MethodPost, "/control/access/set", s.handleAccessSet)
|
2020-02-27 11:48:59 +03:00
|
|
|
|
2021-02-02 14:15:13 +03:00
|
|
|
// Register both versions, with and without the trailing slash, to
|
|
|
|
// prevent a 301 Moved Permanently redirect when clients request the
|
|
|
|
// path without the trailing slash. Those redirects break some clients.
|
|
|
|
//
|
|
|
|
// See go doc net/http.ServeMux.
|
|
|
|
//
|
|
|
|
// See also https://github.com/AdguardTeam/AdGuardHome/issues/2628.
|
2021-06-18 18:13:36 +03:00
|
|
|
s.conf.HTTPRegister("", "/dns-query", s.handleDoH)
|
|
|
|
s.conf.HTTPRegister("", "/dns-query/", s.handleDoH)
|
2019-10-30 11:52:58 +03:00
|
|
|
}
|