diff --git a/log.go b/log.go index 750a60b..40cf784 100644 --- a/log.go +++ b/log.go @@ -222,7 +222,6 @@ func log_libdns_record(record *libdns.Record) zapcore.ObjectMarshaler { return zapcore.ObjectMarshalerFunc(f) } - // MarshalLogObject satisfies the zapcore.ObjectMarshaler interface. func (r request) MarshalLogObject(enc zapcore.ObjectEncoder) error { enc.AddString("zone", r.zone) diff --git a/server.go b/server.go index 6800751..31d305e 100644 --- a/server.go +++ b/server.go @@ -210,7 +210,7 @@ func (srv *Server) handle_query(q query) { } // queries may be wAcKY casE // https://datatracker.ietf.org/doc/html/draft-vixie-dnsext-dns0x20-00 - key := key { + key := key{ Type: dns.Type(qstn.Qtype), Name: strings.ToLower(qstn.Name), } diff --git a/server_test.go b/server_test.go index 5c8bac4..7f06236 100644 --- a/server_test.go +++ b/server_test.go @@ -60,7 +60,6 @@ const dns_only_json string = `{ } }` - const dns_but_empty string = `{ admin localhost:2999 debug @@ -138,7 +137,6 @@ func query_dns(t *testing.T, name string, qtype uint16) *dns.Msg { return in } - func wAcKY_casE(input string) string { INPUT := strings.ToUpper(input) InPuT := "" @@ -226,15 +224,15 @@ func check_errors(t *testing.T, m *dns.Msg, rcode int) { t.Fatal(err, "\n", m) } /* - if !reflect.DeepEqual(in.Question, m.Question) { - t.Fatal( - "question section mismatch!", - "\nsent: ", - m.Question, - "\nreceived: ", - in.Question, - ) - } + if !reflect.DeepEqual(in.Question, m.Question) { + t.Fatal( + "question section mismatch!", + "\nsent: ", + m.Question, + "\nreceived: ", + in.Question, + ) + } */ if in.Rcode != rcode { t.Fatal( @@ -281,7 +279,6 @@ func check_fails(t *testing.T, m *dns.Msg, error_contains string) { } } - func TestServer(t *testing.T) { // I guess I have to seed my own RNG like a caveman rand.Seed(time.Now().UnixNano()) @@ -292,7 +289,7 @@ func TestServer(t *testing.T) { tester := caddytest.NewTester(t) tester.InitServer(dns_only, "caddyfile") - records := []string { + records := []string{ "sub123.example.com. A 127.0.0.1", "ABC123 AAAA ::", "example.com. CAA 0 issue ca.example.net", @@ -304,7 +301,6 @@ func TestServer(t *testing.T) { "whitespace. TXT Test 123 ABC XYZ", } - for _, record := range records { check_exists(t, record) /* WACKY-CASE QUERIES */ @@ -323,7 +319,6 @@ func TestServer(t *testing.T) { chaos.Question[0].Qclass = dns.ClassCHAOS check_errors(t, chaos, dns.RcodeNotImplemented) - /* IGNORE NON-QUESTIONS */ question := new(dns.Msg) question.SetQuestion("sub123.example.com.", dns.TypeA) @@ -333,7 +328,6 @@ func TestServer(t *testing.T) { not_a_question.Answer = []dns.RR{answer} check_fails(t, not_a_question, "timeout") - /* REFUSE MULTI-QUESTIONS */ multi := new(dns.Msg) multi.SetQuestion("example.com.", dns.TypeCNAME)