Fix tests and linters

nameserver/config.go

@@ -8,10 +8,8 @@ import (
 	"github.com/safing/portmaster/core"
 )
 
-// Config Keys
-const (
-	CfgDefaultNameserverAddressKey = "dns/listenAddress"
-)
+// CfgDefaultNameserverAddressKey is the config key for the listen address..
+const CfgDefaultNameserverAddressKey = "dns/listenAddress"
 
 var (
 	defaultNameserverAddress = "localhost:53"

nameserver/failing.go

@@ -36,7 +36,7 @@ var (
 	failingQueriesNetworkChangedFlag = netenv.GetNetworkChangedFlag()
 )
 
-func checkIfQueryIsFailing(q *resolver.Query) (failingErr error, failingUntil *time.Time) {
+func checkIfQueryIsFailing(q *resolver.Query) (failingUntil *time.Time, failingErr error) {
 	// If the network changed, reset the failed queries.
 	if failingQueriesNetworkChangedFlag.IsSet() {
 		failingQueriesNetworkChangedFlag.Refresh()
@@ -45,7 +45,7 @@ func checkIfQueryIsFailing(q *resolver.Query) (failingErr error, failingUntil *t
 		defer failingQueriesLock.Unlock()
 
 		// Compiler optimized map reset.
-		for key, _ := range failingQueries {
+		for key := range failingQueries {
 			delete(failingQueries, key)
 		}
 
@@ -72,7 +72,7 @@ func checkIfQueryIsFailing(q *resolver.Query) (failingErr error, failingUntil *t
 	}
 
 	// Return failing error and until when it's valid.
-	return failing.Err, &failing.Until
+	return &failing.Until, failing.Err
 }
 
 func addFailingQuery(q *resolver.Query, err error) {

nameserver/module.go

@@ -7,13 +7,13 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/miekg/dns"
+
 	"github.com/safing/portbase/log"
 	"github.com/safing/portbase/modules"
 	"github.com/safing/portbase/modules/subsystems"
 	"github.com/safing/portmaster/firewall"
 	"github.com/safing/portmaster/netenv"
-
-	"github.com/miekg/dns"
 )
 
 var (
@@ -69,32 +69,31 @@ func start() error {
 				}
 				return dstIsMe
 			})
-		} else {
-			return firewall.SetNameserverIPMatcher(func(ip net.IP) bool {
-				return ip.Equal(ip1)
-			})
 		}
-
-	} else {
-		// Dual listener.
-		dnsServer1 := startListener(ip1, port)
-		dnsServer2 := startListener(ip2, port)
-		stopListener = func() error {
-			// Shutdown both listeners.
-			err1 := dnsServer1.Shutdown()
-			err2 := dnsServer2.Shutdown()
-			// Return first error.
-			if err1 != nil {
-				return err1
-			}
-			return err2
-		}
-
-		// Fast track dns queries destined for one of the listener IPs.
 		return firewall.SetNameserverIPMatcher(func(ip net.IP) bool {
-			return ip.Equal(ip1) || ip.Equal(ip2)
+			return ip.Equal(ip1)
 		})
+
 	}
+
+	// Dual listener.
+	dnsServer1 := startListener(ip1, port)
+	dnsServer2 := startListener(ip2, port)
+	stopListener = func() error {
+		// Shutdown both listeners.
+		err1 := dnsServer1.Shutdown()
+		err2 := dnsServer2.Shutdown()
+		// Return first error.
+		if err1 != nil {
+			return err1
+		}
+		return err2
+	}
+
+	// Fast track dns queries destined for one of the listener IPs.
+	return firewall.SetNameserverIPMatcher(func(ip net.IP) bool {
+		return ip.Equal(ip1) || ip.Equal(ip2)
+	})
 }
 
 func startListener(ip net.IP, port uint16) *dns.Server {

nameserver/nameserver.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/miekg/dns"
+
 	"github.com/safing/portbase/log"
 	"github.com/safing/portmaster/firewall"
 	"github.com/safing/portmaster/nameserver/nsutil"
@@ -15,8 +17,6 @@ import (
 	"github.com/safing/portmaster/network"
 	"github.com/safing/portmaster/network/netutils"
 	"github.com/safing/portmaster/resolver"
-
-	"github.com/miekg/dns"
 )
 
 var hostname string
@@ -30,7 +30,7 @@ func handleRequestAsWorker(w dns.ResponseWriter, query *dns.Msg) {
 	}
 }
 
-func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg) error { //nolint:gocognit // TODO
+func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg) error { //nolint:maintidx // TODO
 	// Record metrics.
 	startTime := time.Now()
 	defer requestsHistogram.UpdateDuration(startTime)
@@ -113,7 +113,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
 	// will fail with a very high probability, it is beneficial to just kill the
 	// query for some time before doing any expensive work.
 	defer cleanFailingQueries(10, 3)
-	failingErr, failingUntil := checkIfQueryIsFailing(q)
+	failingUntil, failingErr := checkIfQueryIsFailing(q)
 	if failingErr != nil {
 		remainingFailingDuration := time.Until(*failingUntil)
 		tracer.Debugf("nameserver: returning previous error for %s: %s", q.ID(), failingErr)
@@ -205,6 +205,8 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
 			network.SaveOpenDNSRequest(q, rrCache, conn)
 			firewall.UpdateIPsAndCNAMEs(q, rrCache, conn)
 
+		case network.VerdictUndeterminable:
+			fallthrough
 		default:
 			tracer.Warningf("nameserver: unexpected verdict %s for connection %s, not saving", conn.Verdict, conn)
 		}
@@ -224,7 +226,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
 	}
 
 	// Check if there is a Verdict to act upon.
-	switch conn.Verdict {
+	switch conn.Verdict { //nolint:exhaustive // Only checking for specific values.
 	case network.VerdictBlock, network.VerdictDrop, network.VerdictFailed:
 		tracer.Infof(
 			"nameserver: returning %s response for %s to %s",
@@ -289,7 +291,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, request *dns.Msg)
 	}
 
 	// Check if there is a Verdict to act upon.
-	switch conn.Verdict {
+	switch conn.Verdict { //nolint:exhaustive // Only checking for specific values.
 	case network.VerdictBlock, network.VerdictDrop, network.VerdictFailed:
 		tracer.Infof(
 			"nameserver: returning %s response for %s to %s",

nameserver/nsutil/nsutil.go

@@ -9,13 +9,12 @@ import (
 	"time"
 
 	"github.com/miekg/dns"
+
 	"github.com/safing/portbase/log"
 )
 
-var (
-	// ErrNilRR is returned when a parsed RR is nil.
-	ErrNilRR = errors.New("is nil")
-)
+// ErrNilRR is returned when a parsed RR is nil.
+var ErrNilRR = errors.New("is nil")
 
 // Responder defines the interface that any block/deny reason interface
 // may implement to support sending custom DNS responses for a given reason.

nameserver/response.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/miekg/dns"
+
 	"github.com/safing/portbase/log"
 	"github.com/safing/portmaster/nameserver/nsutil"
 )

nameserver/takeover.go

@@ -13,15 +13,13 @@ import (
 	"github.com/safing/portmaster/network/state"
 )
 
-var (
-	commonResolverIPs = []net.IP{
-		net.IPv4zero,
-		net.IPv4(127, 0, 0, 1),  // default
-		net.IPv4(127, 0, 0, 53), // some resolvers on Linux
-		net.IPv6zero,
-		net.IPv6loopback,
-	}
-)
+var commonResolverIPs = []net.IP{
+	net.IPv4zero,
+	net.IPv4(127, 0, 0, 1),  // default
+	net.IPv4(127, 0, 0, 53), // some resolvers on Linux
+	net.IPv6zero,
+	net.IPv6loopback,
+}
 
 func checkForConflictingService(ip net.IP, port uint16) error {
 	// Evaluate which IPs to check.
@@ -34,6 +32,7 @@ func checkForConflictingService(ip net.IP, port uint16) error {
 
 	// Check if there is another resolver when need to take over.
 	var killed int
+ipsToCheckLoop:
 	for _, resolverIP := range ipsToCheck {
 		pid, err := takeover(resolverIP, port)
 		switch {
@@ -44,7 +43,7 @@ func checkForConflictingService(ip net.IP, port uint16) error {
 		case pid != 0:
 			// Conflicting service identified and killed!
 			killed = pid
-			break
+			break ipsToCheckLoop
 		}
 	}
 
@@ -92,7 +91,7 @@ func takeover(resolverIP net.IP, resolverPort uint16) (int, error) {
 	}, true)
 	if err != nil {
 		// there may be nothing listening on :53
-		return 0, nil
+		return 0, nil //nolint:nilerr // Treat lookup error as "not found".
 	}
 
 	// Just don't, uh, kill ourselves...