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

plugin/kubernetes: Don't do a zone transfer for NS requests (#3098)

Browse source 
* fix switch order

* remove fallthough

* add test

* fix test

* distingush nxdomain/nodata for at least first subdomain of zone

* restore fallthough; reorder switch cases
This commit is contained in:
Chris O'Haver 2019-08-09 17:14:48 -04:00 • committed by Miek Gieben
parent 6a6e9a9b33
commit 3a59c833a0
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugin/kubernetes/handler.go
View file

@ -28,6 +28,8 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
) )
switch state.QType() { switch state.QType() {
case dns.TypeAXFR, dns.TypeIXFR:
k.Transfer(ctx, state)
case dns.TypeA: case dns.TypeA:
records, err = plugin.A(ctx, &k, zone, state, nil, plugin.Options{}) records, err = plugin.A(ctx, &k, zone, state, nil, plugin.Options{})
case dns.TypeAAAA: case dns.TypeAAAA:
@ -50,8 +52,6 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
break break
} }
fallthrough fallthrough
case dns.TypeAXFR, dns.TypeIXFR:
k.Transfer(ctx, state)
default: default:
// Do a fake A lookup, so we can distinguish between NODATA and NXDOMAIN // Do a fake A lookup, so we can distinguish between NODATA and NXDOMAIN
_, err = plugin.A(ctx, &k, zone, state, nil, plugin.Options{}) _, err = plugin.A(ctx, &k, zone, state, nil, plugin.Options{})

8
plugin/kubernetes/handler_test.go
View file

@ -341,6 +341,14 @@ var dnsTestCases = []test.Case{
test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"), test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
}, },
}, },
// NS query for qname != zone (existing domain)
{
Qname: "svc.cluster.local.", Qtype: dns.TypeNS,
Rcode: dns.RcodeSuccess,
Ns: []dns.RR{
test.SOA("cluster.local. 5 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 5"),
},
},
} }
func TestServeDNS(t *testing.T) { func TestServeDNS(t *testing.T) {