Fix error detection if query was blocked by upstream

nameserver/nameserver.go

@@ -261,7 +261,7 @@ func handleRequest(ctx context.Context, w dns.ResponseWriter, query *dns.Msg) er
 		// 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)
 
-		if errors.Is(err, &resolver.BlockedUpstreamError{}) {
+		if errors.Is(err, resolver.ErrBlocked) {
 			conn.Block(err.Error())
 		} else {
 			conn.Failed("failed to resolve: " + err.Error())

resolver/resolve.go

@@ -42,7 +42,7 @@ type BlockedUpstreamError struct {
 }
 
 func (blocked *BlockedUpstreamError) Error() string {
-	return fmt.Sprintf("Endpoint blocked by upstream DNS resolver %s", blocked.ResolverName)
+	return fmt.Sprintf("%s by upstream DNS resolver %s", ErrBlocked, blocked.ResolverName)
 }
 
 // Unwrap implements errors.Unwrapper