diff --git a/internal/dnsforward/config.go b/internal/dnsforward/config.go index 10b69cbe..3c2c74ee 100644 --- a/internal/dnsforward/config.go +++ b/internal/dnsforward/config.go @@ -163,10 +163,10 @@ type TLSConfig struct { // DNSCryptConfig is the DNSCrypt server configuration struct. type DNSCryptConfig struct { + ResolverCert *dnscrypt.Cert + ProviderName string UDPListenAddrs []*net.UDPAddr TCPListenAddrs []*net.TCPAddr - ProviderName string - ResolverCert *dnscrypt.Cert Enabled bool } @@ -214,68 +214,67 @@ var defaultValues = ServerConfig{ FilteringConfig: FilteringConfig{BlockedResponseTTL: 3600}, } -// createProxyConfig creates and validates configuration for the main proxy -func (s *Server) createProxyConfig() (proxy.Config, error) { - proxyConfig := proxy.Config{ - UDPListenAddr: s.conf.UDPListenAddrs, - TCPListenAddr: s.conf.TCPListenAddrs, - Ratelimit: int(s.conf.Ratelimit), - RatelimitWhitelist: s.conf.RatelimitWhitelist, - RefuseAny: s.conf.RefuseAny, - TrustedProxies: s.conf.TrustedProxies, - CacheMinTTL: s.conf.CacheMinTTL, - CacheMaxTTL: s.conf.CacheMaxTTL, - CacheOptimistic: s.conf.CacheOptimistic, - UpstreamConfig: s.conf.UpstreamConfig, +// createProxyConfig creates and validates configuration for the main proxy. +func (s *Server) createProxyConfig() (conf proxy.Config, err error) { + srvConf := s.conf + conf = proxy.Config{ + UDPListenAddr: srvConf.UDPListenAddrs, + TCPListenAddr: srvConf.TCPListenAddrs, + Ratelimit: int(srvConf.Ratelimit), + RatelimitWhitelist: srvConf.RatelimitWhitelist, + RefuseAny: srvConf.RefuseAny, + TrustedProxies: srvConf.TrustedProxies, + CacheMinTTL: srvConf.CacheMinTTL, + CacheMaxTTL: srvConf.CacheMaxTTL, + CacheOptimistic: srvConf.CacheOptimistic, + UpstreamConfig: srvConf.UpstreamConfig, BeforeRequestHandler: s.beforeRequestHandler, RequestHandler: s.handleDNSRequest, - EnableEDNSClientSubnet: s.conf.EnableEDNSClientSubnet, - MaxGoroutines: int(s.conf.MaxGoroutines), + EnableEDNSClientSubnet: srvConf.EnableEDNSClientSubnet, + MaxGoroutines: int(srvConf.MaxGoroutines), } - if s.conf.CacheSize != 0 { - proxyConfig.CacheEnabled = true - proxyConfig.CacheSizeBytes = int(s.conf.CacheSize) + if srvConf.CacheSize != 0 { + conf.CacheEnabled = true + conf.CacheSizeBytes = int(srvConf.CacheSize) } - proxyConfig.UpstreamMode = proxy.UModeLoadBalance - if s.conf.AllServers { - proxyConfig.UpstreamMode = proxy.UModeParallel - } else if s.conf.FastestAddr { - proxyConfig.UpstreamMode = proxy.UModeFastestAddr - proxyConfig.FastestPingTimeout = s.conf.FastestTimeout.Duration - } + setProxyUpstreamMode( + &conf, + srvConf.AllServers, + srvConf.FastestAddr, + srvConf.FastestTimeout.Duration, + ) - for i, s := range s.conf.BogusNXDomain { - subnet, err := netutil.ParseSubnet(s) + for i, s := range srvConf.BogusNXDomain { + var subnet *net.IPNet + subnet, err = netutil.ParseSubnet(s) if err != nil { log.Error("subnet at index %d: %s", i, err) continue } - proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, subnet) + conf.BogusNXDomain = append(conf.BogusNXDomain, subnet) } - // TLS settings - err := s.prepareTLS(&proxyConfig) + err = s.prepareTLS(&conf) if err != nil { - return proxyConfig, err + return conf, fmt.Errorf("validating tls: %w", err) } - if s.conf.DNSCryptConfig.Enabled { - proxyConfig.DNSCryptUDPListenAddr = s.conf.DNSCryptConfig.UDPListenAddrs - proxyConfig.DNSCryptTCPListenAddr = s.conf.DNSCryptConfig.TCPListenAddrs - proxyConfig.DNSCryptProviderName = s.conf.DNSCryptConfig.ProviderName - proxyConfig.DNSCryptResolverCert = s.conf.DNSCryptConfig.ResolverCert + if c := srvConf.DNSCryptConfig; c.Enabled { + conf.DNSCryptUDPListenAddr = c.UDPListenAddrs + conf.DNSCryptTCPListenAddr = c.TCPListenAddrs + conf.DNSCryptProviderName = c.ProviderName + conf.DNSCryptResolverCert = c.ResolverCert } - // Validate proxy config - if proxyConfig.UpstreamConfig == nil || len(proxyConfig.UpstreamConfig.Upstreams) == 0 { - return proxyConfig, errors.Error("no default upstream servers configured") + if conf.UpstreamConfig == nil || len(conf.UpstreamConfig.Upstreams) == 0 { + return conf, errors.Error("no default upstream servers configured") } - return proxyConfig, nil + return conf, nil } const ( @@ -381,27 +380,46 @@ func (s *Server) prepareUpstreamSettings() error { return nil } -// prepareIntlProxy - initializes DNS proxy that we use for internal DNS queries -func (s *Server) prepareIntlProxy() { - proxyConfig := &proxy.Proxy{ - Config: proxy.Config{ - CacheEnabled: true, - CacheSizeBytes: 4096, - UpstreamConfig: s.conf.UpstreamConfig, - MaxGoroutines: int(s.conf.MaxGoroutines), - }, +// prepareInternalProxy initializes the DNS proxy that is used for internal DNS +// queries, such at client PTR resolving and udpater hostname resolving. +func (s *Server) prepareInternalProxy() { + conf := &proxy.Config{ + CacheEnabled: true, + CacheSizeBytes: 4096, + UpstreamConfig: s.conf.UpstreamConfig, + MaxGoroutines: int(s.conf.MaxGoroutines), } - if s.conf.AllServers { - proxyConfig.UpstreamMode = proxy.UModeParallel - } else if s.conf.FastestAddr { - proxyConfig.UpstreamMode = proxy.UModeFastestAddr - proxyConfig.FastestPingTimeout = s.conf.FastestTimeout.Duration + srvConf := s.conf + setProxyUpstreamMode( + conf, + srvConf.AllServers, + srvConf.FastestAddr, + srvConf.FastestTimeout.Duration, + ) + + // TODO(a.garipov): Make a proper constructor for proxy.Proxy. + s.internalProxy = &proxy.Proxy{ + Config: *conf, + } +} + +// setProxyUpstreamMode sets the upstream mode and related settings in conf +// based on provided parameters. +func setProxyUpstreamMode( + conf *proxy.Config, + allServers bool, + fastestAddr bool, + fastestTimeout time.Duration, +) { + if allServers { + conf.UpstreamMode = proxy.UModeParallel + } else if fastestAddr { + conf.UpstreamMode = proxy.UModeFastestAddr + conf.FastestPingTimeout = fastestTimeout } else { - proxyConfig.UpstreamMode = proxy.UModeLoadBalance + conf.UpstreamMode = proxy.UModeLoadBalance } - - s.internalProxy = proxyConfig } // prepareTLS - prepares TLS configuration for the DNS proxy diff --git a/internal/dnsforward/dnsforward.go b/internal/dnsforward/dnsforward.go index ca479fc4..63086d3d 100644 --- a/internal/dnsforward/dnsforward.go +++ b/internal/dnsforward/dnsforward.go @@ -49,11 +49,12 @@ type hostToIPTable = map[string]net.IP // Server is the main way to start a DNS server. // // Example: -// s := dnsforward.Server{} -// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine -// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535 -// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines -// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine +// +// s := dnsforward.Server{} +// err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine +// err := s.Reconfigure(ServerConfig{UDPListenAddr: &net.UDPAddr{Port: 53535}}) // will reconfigure running DNS server to listen on UDP port 53535 +// err := s.Stop() // will stop listening on port 53535 and cancel all goroutines +// err := s.Start(nil) // will start listening again, on port 53535, in a goroutine // // The zero Server is empty and ready for use. type Server struct { @@ -176,18 +177,6 @@ func NewServer(p DNSCreateParams) (s *Server, err error) { return s, nil } -// NewCustomServer creates a new instance of *Server with custom internal proxy. -func NewCustomServer(internalProxy *proxy.Proxy) *Server { - s := &Server{ - recDetector: newRecursionDetector(0, 1), - } - if internalProxy != nil { - s.internalProxy = internalProxy - } - - return s -} - // Close gracefully closes the server. It is safe for concurrent use. // // TODO(e.burkov): A better approach would be making Stop method waiting for all @@ -488,7 +477,7 @@ func (s *Server) Prepare(config *ServerConfig) error { // Prepare a DNS proxy instance that we use for internal DNS queries // -- - s.prepareIntlProxy() + s.prepareInternalProxy() s.access, err = newAccessCtx(s.conf.AllowedClients, s.conf.DisallowedClients, s.conf.BlockedHosts) if err != nil { diff --git a/internal/dnsforward/dnsforward_test.go b/internal/dnsforward/dnsforward_test.go index 5144680b..1da83ad4 100644 --- a/internal/dnsforward/dnsforward_test.go +++ b/internal/dnsforward/dnsforward_test.go @@ -1217,13 +1217,17 @@ func TestServer_Exchange(t *testing.T) { errUpstream := aghtest.NewErrorUpstream() nonPtrUpstream := aghtest.NewBlockUpstream("some-host", true) - srv := NewCustomServer(&proxy.Proxy{ - Config: proxy.Config{ - UpstreamConfig: &proxy.UpstreamConfig{ - Upstreams: []upstream.Upstream{extUpstream}, + srv := &Server{ + recDetector: newRecursionDetector(0, 1), + internalProxy: &proxy.Proxy{ + Config: proxy.Config{ + UpstreamConfig: &proxy.UpstreamConfig{ + Upstreams: []upstream.Upstream{extUpstream}, + }, }, }, - }) + } + srv.conf.ResolveClients = true srv.conf.UsePrivateRDNS = true diff --git a/internal/dnsforward/http.go b/internal/dnsforward/http.go index 93121fac..49b65be4 100644 --- a/internal/dnsforward/http.go +++ b/internal/dnsforward/http.go @@ -711,11 +711,16 @@ func (s *Server) handleTestUpstreamDNS(w http.ResponseWriter, r *http.Request) { } } +// handleDoH is the DNS-over-HTTPs handler. +// // Control flow: -// web -// -> dnsforward.handleDoH -> dnsforward.ServeHTTP -// -> proxy.ServeHTTP -> proxy.handleDNSRequest -// -> dnsforward.handleDNSRequest +// +// HTTP server +// -> dnsforward.handleDoH +// -> dnsforward.ServeHTTP +// -> proxy.ServeHTTP +// -> proxy.handleDNSRequest +// -> dnsforward.handleDNSRequest func (s *Server) handleDoH(w http.ResponseWriter, r *http.Request) { if !s.conf.TLSAllowUnencryptedDoH && r.TLS == nil { aghhttp.Error(r, w, http.StatusNotFound, "Not Found") diff --git a/internal/dnsforward/svcbmsg.go b/internal/dnsforward/svcbmsg.go index d1e3e3d8..96983dee 100644 --- a/internal/dnsforward/svcbmsg.go +++ b/internal/dnsforward/svcbmsg.go @@ -157,10 +157,10 @@ var svcbKeyHandlers = map[string]svcbKeyHandler{ // Firstly, the parsing of non-contiguous values isn't supported. Secondly, the // parsing of value-lists is not supported either. // -// ipv4hint=127.0.0.1 // Supported. -// ipv4hint="127.0.0.1" // Unsupported. -// ipv4hint=127.0.0.1,127.0.0.2 // Unsupported. -// ipv4hint="127.0.0.1,127.0.0.2" // Unsupported. +// ipv4hint=127.0.0.1 // Supported. +// ipv4hint="127.0.0.1" // Unsupported. +// ipv4hint=127.0.0.1,127.0.0.2 // Unsupported. +// ipv4hint="127.0.0.1,127.0.0.2" // Unsupported. // // TODO(a.garipov): Support all of these. func (s *Server) genAnswerSVCB(req *dns.Msg, svcb *rules.DNSSVCB) (ans *dns.SVCB) { diff --git a/internal/home/dns.go b/internal/home/dns.go index ab5b0330..88ae8ef2 100644 --- a/internal/home/dns.go +++ b/internal/home/dns.go @@ -280,10 +280,10 @@ func newDNSCrypt(hosts []net.IP, tlsConf tlsConfigSettings) (dnscc dnsforward.DN } return dnsforward.DNSCryptConfig{ - UDPListenAddrs: ipsToUDPAddrs(hosts, tlsConf.PortDNSCrypt), - TCPListenAddrs: ipsToTCPAddrs(hosts, tlsConf.PortDNSCrypt), ResolverCert: cert, ProviderName: rc.ProviderName, + UDPListenAddrs: ipsToUDPAddrs(hosts, tlsConf.PortDNSCrypt), + TCPListenAddrs: ipsToTCPAddrs(hosts, tlsConf.PortDNSCrypt), Enabled: true, }, nil } diff --git a/internal/version/version.go b/internal/version/version.go index eec8c4d0..2091d859 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -73,8 +73,7 @@ const ( // fmtModule returns formatted information about module. The result looks like: // -// github.com/Username/module@v1.2.3 (sum: someHASHSUM=) -// +// github.com/Username/module@v1.2.3 (sum: someHASHSUM=) func fmtModule(m *debug.Module) (formatted string) { if m == nil { return "" @@ -118,18 +117,18 @@ const ( // Verbose returns formatted build information. Output example: // -// AdGuard Home -// Version: v0.105.3 -// Channel: development -// Go version: go1.15.3 -// Build time: 2021-03-30T16:26:08Z+0300 -// GOOS: darwin -// GOARCH: amd64 -// Race: false -// Main module: -// ... -// Dependencies: -// ... +// AdGuard Home +// Version: v0.105.3 +// Channel: development +// Go version: go1.15.3 +// Build time: 2021-03-30T16:26:08Z+0300 +// GOOS: darwin +// GOARCH: amd64 +// Race: false +// Main module: +// ... +// Dependencies: +// ... // // TODO(e.burkov): Make it write into passed io.Writer. func Verbose() (v string) {