From cd2048a15af459f7a878a304c939906589f96cda Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Wed, 19 Nov 2014 16:34:18 +0000
Subject: [PATCH] Add Unsafe member to dns.Server

This stops it from checking if the incoming requests have the QR bit
unset, so be careful when enabling this. This can be useful in
combination with mDNS.

Also the check for only 1 question in the question section is relaxed
to be "at least one", even without setting Unsafe!

Also update TestServingResponse to test for Unsafe vs not using Unsafe.
---
 server.go      | 9 ++++++---
 server_test.go | 9 ++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/server.go b/server.go
index d21cead7..ef46c5cd 100644
--- a/server.go
+++ b/server.go
@@ -169,10 +169,10 @@ func (mux *ServeMux) HandleRemove(pattern string) {
 // is sought.
 // If no handler is found a standard SERVFAIL message is returned
 // If the request message does not have exactly one question in the
-// question section a SERVFAIL is returned.
+// question section a SERVFAIL is returned, unlesss Unsafe is true.
 func (mux *ServeMux) ServeDNS(w ResponseWriter, request *Msg) {
 	var h Handler
-	if len(request.Question) != 1 {
+	if len(request.Question) < 1 { // allow more than one question
 		h = failedHandler()
 	} else {
 		if h = mux.match(request.Question[0].Name, request.Question[0].Qtype); h == nil {
@@ -220,6 +220,9 @@ type Server struct {
 	IdleTimeout func() time.Duration
 	// Secret(s) for Tsig map[<zonename>]<base64 secret>.
 	TsigSecret map[string]string
+	// Unsafe instructs the server to disregard any sanity checks and directly hand the message to
+	// the handler. It will specfically not check if the query has the QR bit not set.
+	Unsafe bool
 
 	// For graceful shutdown.
 	stopUDP chan bool
@@ -442,7 +445,7 @@ Redo:
 		w.WriteMsg(x)
 		goto Exit
 	}
-	if req.Response {
+	if !srv.Unsafe && req.Response {
 		goto Exit
 	}
 
diff --git a/server_test.go b/server_test.go
index bc425a3a..d8e63785 100644
--- a/server_test.go
+++ b/server_test.go
@@ -325,7 +325,14 @@ func TestServingResponse(t *testing.T) {
 	m.Response = true
 	_, _, err = c.Exchange(m, addrstr)
 	if err == nil {
-		t.Log("exchanged response message", err)
+		t.Log("exchanged response message")
+		t.Fatal()
+	}
+	s.Unsafe = true
+	m.Response = true
+	_, _, err = c.Exchange(m, addrstr)
+	if err != nil {
+		t.Log("could exchanged response message in Unsafe mode")
 		t.Fatal()
 	}
 }