ba1efee4f1
Every plugin needs to deal with EDNS0 and should call Scrub to make a message fit the client's buffer. Move this functionality into the server and wrapping the ResponseWriter into a ScrubWriter that handles these bits for us. Result: Less code and faster, because multiple chained plugins could all be calling scrub and SizeAndDo - now there is just one place. Most tests in file/* and dnssec/* needed adjusting because in those unit tests you don't see OPT RRs anymore. The DNSSEC signer was also looking at the returned OPT RR to see if it needed to sign - as those are now added by the server (and thus later), this needed to change slightly. Scrub itself still exist (for backward compat reasons), but has been made a noop. Scrub has been renamed to scrub as it should not be used by external plugins. Fixes: #2010 Signed-off-by: Miek Gieben <miek@miek.nl>
87 lines
2.1 KiB
Go
87 lines
2.1 KiB
Go
// +build etcd
|
|
|
|
package etcd
|
|
|
|
import (
|
|
"net"
|
|
"strconv"
|
|
"testing"
|
|
|
|
"github.com/coredns/coredns/plugin/etcd/msg"
|
|
"github.com/coredns/coredns/plugin/pkg/dnstest"
|
|
"github.com/coredns/coredns/plugin/test"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
func fakeStubServerExampleNet(t *testing.T) (*dns.Server, string) {
|
|
server, addr, err := test.UDPServer("127.0.0.1:0")
|
|
if err != nil {
|
|
t.Fatalf("Failed to create a UDP server: %s", err)
|
|
}
|
|
// add handler for example.net
|
|
dns.HandleFunc("example.net.", func(w dns.ResponseWriter, r *dns.Msg) {
|
|
m := new(dns.Msg)
|
|
m.SetReply(r)
|
|
m.Answer = []dns.RR{test.A("example.net. 86400 IN A 93.184.216.34")}
|
|
w.WriteMsg(m)
|
|
})
|
|
|
|
return server, addr
|
|
}
|
|
|
|
func TestStubLookup(t *testing.T) {
|
|
server, addr := fakeStubServerExampleNet(t)
|
|
defer server.Shutdown()
|
|
|
|
host, p, _ := net.SplitHostPort(addr)
|
|
port, _ := strconv.Atoi(p)
|
|
exampleNetStub := &msg.Service{Host: host, Port: port, Key: "a.example.net.stub.dns.skydns.test."}
|
|
servicesStub = append(servicesStub, exampleNetStub)
|
|
|
|
etc := newEtcdPlugin()
|
|
|
|
for _, serv := range servicesStub {
|
|
set(t, etc, serv.Key, 0, serv)
|
|
defer delete(t, etc, serv.Key)
|
|
}
|
|
|
|
etc.updateStubZones()
|
|
|
|
for _, tc := range dnsTestCasesStub {
|
|
m := tc.Msg()
|
|
|
|
rec := dnstest.NewRecorder(&test.ResponseWriter{})
|
|
_, err := etc.ServeDNS(ctxt, rec, m)
|
|
if err != nil && m.Question[0].Name == "example.org." {
|
|
// This is OK, we expect this backend to *not* work.
|
|
continue
|
|
}
|
|
if err != nil {
|
|
t.Errorf("Expected no error, got %v for %s\n", err, m.Question[0].Name)
|
|
}
|
|
resp := rec.Msg
|
|
if resp == nil {
|
|
// etcd not running?
|
|
continue
|
|
}
|
|
|
|
test.SortAndCheck(t, resp, tc)
|
|
}
|
|
}
|
|
|
|
var servicesStub = []*msg.Service{
|
|
// Two tests, ask a question that should return servfail because remote it no accessible
|
|
// and one with edns0 option added, that should return refused.
|
|
{Host: "127.0.0.1", Port: 666, Key: "b.example.org.stub.dns.skydns.test."},
|
|
}
|
|
|
|
var dnsTestCasesStub = []test.Case{
|
|
{
|
|
Qname: "example.org.", Qtype: dns.TypeA, Rcode: dns.RcodeServerFailure,
|
|
},
|
|
{
|
|
Qname: "example.net.", Qtype: dns.TypeA,
|
|
Answer: []dns.RR{test.A("example.net. 86400 IN A 93.184.216.34")},
|
|
},
|
|
}
|