Move all (almost all) Go files in middleware into their own packages. This makes for better naming and discoverability. Lot of changes elsewhere to make this change. The middleware.State was renamed to request.Request which is better, but still does not cover all use-cases. It was also moved out middleware because it is used by `dnsserver` as well. A pkg/dnsutil packages was added for shared, handy, dns util functions. All normalize functions are now put in normalize.go
51 lines
1 KiB
Go
51 lines
1 KiB
Go
package log
|
|
|
|
import (
|
|
"bytes"
|
|
"log"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
|
|
"github.com/miekg/coredns/middleware/test"
|
|
|
|
"github.com/miekg/dns"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
type erroringMiddleware struct{}
|
|
|
|
func (erroringMiddleware) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
|
|
return dns.RcodeServerFailure, nil
|
|
}
|
|
|
|
func TestLoggedStatus(t *testing.T) {
|
|
var f bytes.Buffer
|
|
var next erroringMiddleware
|
|
rule := Rule{
|
|
NameScope: ".",
|
|
Format: DefaultLogFormat,
|
|
Log: log.New(&f, "", 0),
|
|
}
|
|
|
|
logger := Logger{
|
|
Rules: []Rule{rule},
|
|
Next: next,
|
|
}
|
|
|
|
ctx := context.TODO()
|
|
r := new(dns.Msg)
|
|
r.SetQuestion("example.org.", dns.TypeA)
|
|
|
|
rec := dnsrecorder.New(&test.ResponseWriter{})
|
|
|
|
rcode, _ := logger.ServeDNS(ctx, rec, r)
|
|
if rcode != 0 {
|
|
t.Error("Expected rcode to be 0 - was", rcode)
|
|
}
|
|
|
|
logged := f.String()
|
|
if !strings.Contains(logged, "A IN example.org. udp false 512") {
|
|
t.Error("Expected it to be logged. Logged string -", logged)
|
|
}
|
|
}
|