TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

oops forget to checkin (#111)

Browse source
This commit is contained in:
Miek Gieben 2016-04-12 21:50:01 +01:00
parent 9ee41a399a
commit 842953f179
2 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
middleware/etcd/stub_cycle_test.go
View file

@ -3,7 +3,6 @@
package etcd package etcd
import ( import (
"sort"
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
@ -11,7 +10,7 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
) )
func TestStubLookup(t *testing.T) { func TestStubCycle(t *testing.T) {
// reuse servics from stub_test.go // reuse servics from stub_test.go
for _, serv := range servicesStub { for _, serv := range servicesStub {
set(t, etc, serv.Key, 0, serv) set(t, etc, serv.Key, 0, serv)
@ -28,34 +27,13 @@ func TestStubLookup(t *testing.T) {
rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m) _, err := etc.ServeDNS(ctx, rec, m)
if err != nil { if err == nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected error, got none")
continue continue
} }
resp := rec.Msg() // err should have been, set msg is nil, CoreDNS middlware handling takes
// care of proper error to client.
sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns))
sort.Sort(test.RRSet(resp.Extra))
if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp)
continue
}
if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("%v\n", resp)
}
if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("%v\n", resp)
}
if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("%v\n", resp)
}
} }
} }
var dnsTestCasesCycleStub = []test.Case{ var dnsTestCasesCycleStub = []test.Case{{Qname: "example.org.", Qtype: dns.TypeA, Rcode: dns.RcodeRefused, Do: true}}
{
Qname: "example.org.", Qtype: dns.TypeA, Rcode: dns.RcodeRefused, Do: true,
},
}

3
middleware/etcd/stub_handler.go
View file

@ -1,6 +1,7 @@
package etcd package etcd
import ( import (
"errors"
"log" "log"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
@ -18,7 +19,7 @@ type Stub struct {
func (s Stub) ServeDNS(ctx context.Context, w dns.ResponseWriter, req *dns.Msg) (int, error) { func (s Stub) ServeDNS(ctx context.Context, w dns.ResponseWriter, req *dns.Msg) (int, error) {
if hasStubEdns0(req) { if hasStubEdns0(req) {
log.Printf("[WARNING] Forwarding cycle detected, refusing msg: %s", req.Question[0].Name) log.Printf("[WARNING] Forwarding cycle detected, refusing msg: %s", req.Question[0].Name)
return dns.RcodeRefused, nil return dns.RcodeRefused, errors.New("stub forward cycle")
} }
req = addStubEdns0(req) req = addStubEdns0(req)
proxy, ok := (*s.Etcd.Stubmap)[s.Zone] proxy, ok := (*s.Etcd.Stubmap)[s.Zone]