From d28ad9ebaf8a1d062c324064a9f828c006450458 Mon Sep 17 00:00:00 2001
From: xaos <xaos@xaos.tech>
Date: Mon, 27 Feb 2023 04:22:04 +0100
Subject: [PATCH] style: simplify query handling some more

---
 stub.go | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/stub.go b/stub.go
index 4e86267..8f420b9 100644
--- a/stub.go
+++ b/stub.go
@@ -173,20 +173,6 @@ func (s *StubDNS) make_handler(fqdn string, txt string) dns.HandlerFunc {
 			zap.Object("request", LoggableDNSMsg{r}),
 		)
 
-		if len(r.Question) != 1 {
-			m.Rcode = dns.RcodeRefused
-			m.Answer = []dns.RR{}
-			logger.Info(
-				"refusing invalid request",
-				zap.Object("response", LoggableDNSMsg{m}),
-			)
-			w.WriteMsg(m)
-			return
-		}
-
-		q := r.Question[0]
-		domain := q.Name
-
 		reject_and_log := func(code int, reason string) {
 			m.Rcode = code
 			m.Answer = []dns.RR{}
@@ -198,6 +184,13 @@ func (s *StubDNS) make_handler(fqdn string, txt string) dns.HandlerFunc {
 			w.WriteMsg(m)
 		}
 
+		if len(r.Question) != 1 {
+			reject_and_log(dns.RcodeRefused, "not exactly 1 question")
+			return
+		}
+		q := r.Question[0]
+		domain := q.Name
+
 		switch {
 		case r.Response:
 			reject_and_log(dns.RcodeRefused, "not a query")