Rework tcp resolver to make it cleaner

From PR Review #78
safing · Jul 12, 2020 · 6298d1d · 6298d1d
1 parent 7c6c455
commit 6298d1d
Show file tree

Hide file tree

Showing 5 changed files with 311 additions and 276 deletions.
diff --git a/nameserver/nameserver.go b/nameserver/nameserver.go
@@ -261,7 +261,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, query *dns.Msg) er
 	rrCache, err := resolver.Resolve(ctx, q)
 	if err != nil {
 		// TODO: analyze nxdomain requests, malware could be trying DGA-domains
-		tracer.Warningf("nameserver: %s requested %s%s: %s", conn.Process(), q.FQDN, q.QType, err)
+		tracer.Debugf("nameserver: %s requested %s%s: %s", conn.Process(), q.FQDN, q.QType, err)
 
 		if errors.Is(err, resolver.ErrBlocked) {
 			conn.Block(err.Error())

diff --git a/resolver/resolve_test.go b/resolver/resolve_test.go
diff --git a/resolver/resolver-pooled_test.go b/resolver/resolver-pooled_test.go
@@ -50,8 +50,7 @@ func TestClientPooling(t *testing.T) {
 	}
 
 	// create separate resolver for this test
-	resolver, _, err := createResolver("dot://9.9.9.9:853?verify=dns.quad9.net&name=Quad9&blockedif=empty", "config")
-	// resolver, _, err := createResolver("dot://1.1.1.2:853?verify=cloudflare-dns.com&name=Cloudflare&blockedif=zeroip", "config")
+	resolver, _, err := createResolver(testResolver, "config")
 	if err != nil {
 		t.Fatal(err)
 	}