Merge pull request #210 from anywherelan/disable-awldns-option

app: add DisableDNS, ListenAddress dns options

Author: pymq

application.go

@@ -52,9 +52,6 @@ func FrontendStatic() fs.FS {
 	return fsys
 }
 
-// useAwldns is used for tests
-var useAwldns = true
-
 // @title Anywherelan API
 // @version 0.1
 // @description Anywherelan API
@@ -154,7 +151,7 @@ func (a *Application) Init(ctx context.Context, tunDevice tun.Device) error {
 	go a.AuthStatus.BackgroundExchangeStatusInfo(a.ctx)
 	go a.SOCKS5.ServeConns(a.ctx)
 
-	if useAwldns && !a.Conf.VPNConfig.DisableVPNInterface {
+	if !a.Conf.DNS.DisableDNS && !a.Conf.VPNConfig.DisableVPNInterface {
 		interfaceName, err := a.vpnDevice.InterfaceName()
 		if err != nil {
 			a.logger.Errorf("failed to get TUN interface name: %v", err)
@@ -324,7 +321,14 @@ func NewDNSService(conf *config.Config, eventbus awlevent.Bus, ctx context.Conte
 
 func (a *DNSService) initDNS(interfaceName string) {
 	var err error
-	a.dnsResolver = awldns.NewResolver(awldns.DNSAddress)
+	dnsAddr := a.conf.DNS.ListenAddress
+	dnsHost, _, err := net.SplitHostPort(dnsAddr)
+	if err != nil {
+		a.logger.Errorf("invalid dns listen address %s: %v", dnsAddr, err)
+		return
+	}
+
+	a.dnsResolver = awldns.NewResolver(dnsAddr)
 	a.upstreamDNS = awldns.DefaultUpstreamDNSAddress
 	a.refreshDNSConfig()
 
@@ -338,7 +342,7 @@ func (a *DNSService) initDNS(interfaceName string) {
 		tsLogger.Infof(format, args...)
 	}, nil, &controlknobs.Knobs{}, interfaceName)
 	if err != nil {
-		a.logger.Errorf("create dns os configurator: %v", err)
+		a.logger.Errorf("unable to create dns os configurator: %v", err)
 		return
 	}
 
@@ -347,7 +351,7 @@ func (a *DNSService) initDNS(interfaceName string) {
 		panic(err)
 	}
 	newOSConfig := dns.OSConfig{
-		Nameservers:  []netip.Addr{netip.MustParseAddr(awldns.DNSIp)},
+		Nameservers:  []netip.Addr{netip.MustParseAddr(dnsHost)},
 		MatchDomains: []dnsname.FQDN{fqdn},
 	}
 

awldns/awldns.go

@@ -19,9 +19,8 @@ const (
 
 const (
 	LocalDomain               = "awl"
-	DNSIp                     = "127.0.0.66"
+	DefaultDNSAddress         = "127.0.0.66:53"
 	DefaultDNSPort            = "53"
-	DNSAddress                = "127.0.0.66:53"
 	DefaultUpstreamDNSAddress = "1.1.1.1:53"
 )
 

config/config.go

@@ -51,6 +51,7 @@ type (
 		P2pNode               P2pNodeConfig          `json:"p2pNode"`
 		VPNConfig             VPNConfig              `json:"vpn"`
 		SOCKS5                SOCKS5Config           `json:"socks5"`
+		DNS                   DNSConfig              `json:"dns"`
 		KnownPeers            map[string]KnownPeer   `json:"knownPeers"`
 		BlockedPeers          map[string]BlockedPeer `json:"blockedPeers"`
 		Update                UpdateConfig           `json:"update"`
@@ -83,6 +84,10 @@ type (
 		// peer that is set as proxy
 		UsingPeerID string `json:"usingPeerID"`
 	}
+	DNSConfig struct {
+		DisableDNS    bool   `json:"disableDNS"`
+		ListenAddress string `json:"listenAddress"`
+	}
 	KnownPeer struct {
 		// Hex-encoded multihash representing a peer ID
 		PeerID string `json:"peerId"`

config/other.go

@@ -185,6 +185,10 @@ func setDefaults(conf *Config, bus awlevent.Bus) {
 		conf.SOCKS5.ListenAddress = defaultSOCKS5ListenAddress
 	}
 
+	if conf.DNS.ListenAddress == "" {
+		conf.DNS.ListenAddress = awldns.DefaultDNSAddress
+	}
+
 	uniqAliases := make(map[string]struct{}, len(conf.KnownPeers))
 	if conf.KnownPeers == nil {
 		conf.KnownPeers = make(map[string]KnownPeer)

test_suite_test.go

@@ -39,12 +39,6 @@ import (
 
 const TestTUNBatchSize = 100
 
-func init() {
-	// TODO: move to config
-	useAwldns = false
-	config.DefaultBootstrapPeers = nil
-}
-
 // TODO: add support for goleak in TestSuite
 type TestSuite struct {
 	*require.Assertions
@@ -153,6 +147,8 @@ func (ts *TestSuite) newTestPeerWithConfig(disableLogging bool, listenAddrs []mu
 	app.Conf.HttpListenOnAdminHost = false
 	app.Conf.SetListenAddresses(listenAddrs)
 	app.Conf.P2pNode.BootstrapPeers = ts.bootstrapAddrsStr
+	t := true
+	app.Conf.P2pNode.IgnoreDefaultBootstrapPeers = &t
 	app.Conf.P2pNode.ParallelSendingStreamsCount = 1
 	app.Conf.P2pNode.UseDedicatedConnForEachStream = false
 
@@ -170,6 +166,8 @@ func (ts *TestSuite) newTestPeerWithConfig(disableLogging bool, listenAddrs []mu
 		}
 	}
 
+	app.Conf.DNS.DisableDNS = true
+
 	if configModifier != nil {
 		configModifier(app.Conf)
 	}