Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 08:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not muck with ordering of XFRs (#2329)

Browse Source 
The loadbalancer plugin reorders records. It was doing this for zone
transfers - if you had a CNAME in the zone then your transfer would
be broken because it would get put before the SOA record.
This commit is contained in:
John Belamaric
2018-11-20 23:38:19 -08:00
committed by Miek Gieben
parent 973349592e
commit 9d41fa663c
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/loadbalance/loadbalance.go
View File

@@ -14,6 +14,10 @@ func (r *RoundRobinResponseWriter) WriteMsg(res *dns.Msg) error {
return r.ResponseWriter.WriteMsg(res) return r.ResponseWriter.WriteMsg(res)
} }
if res.Question[0].Qtype == dns.TypeAXFR || res.Question[0].Qtype == dns.TypeIXFR {
return r.ResponseWriter.WriteMsg(res)
}
res.Answer = roundRobin(res.Answer) res.Answer = roundRobin(res.Answer)
res.Ns = roundRobin(res.Ns) res.Ns = roundRobin(res.Ns)
res.Extra = roundRobin(res.Extra) res.Extra = roundRobin(res.Extra)

36
plugin/loadbalance/loadbalance_test.go
View File

@@ -124,6 +124,42 @@ func TestLoadBalance(t *testing.T) {
} }
} }
func TestLoadBalanceXFR(t *testing.T) {
rm := RoundRobin{Next: handler()}
answer := []dns.RR{
test.SOA("skydns.test. 30 IN SOA ns.dns.skydns.test. hostmaster.skydns.test. 1542756695 7200 1800 86400 30"),
test.MX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.2"),
test.MX("mx.region2.skydns.test. 300 IN MX 1 mx2.region2.skydns.test."),
test.CNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.3"),
test.MX("mx.region2.skydns.test. 300 IN MX 1 mx3.region2.skydns.test."),
test.SOA("skydns.test. 30 IN SOA ns.dns.skydns.test. hostmaster.skydns.test. 1542756695 7200 1800 86400 30"),
}
for _, xfrtype := range []uint16{dns.TypeIXFR, dns.TypeAXFR} {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
req := new(dns.Msg)
req.SetQuestion("skydns.test.", xfrtype)
req.Answer = answer
_, err := rm.ServeDNS(context.TODO(), rec, req)
if err != nil {
t.Errorf("Expected no error, but got %s for %s", err, dns.TypeToString[xfrtype])
continue
}
if rec.Msg.Answer[0].Header().Rrtype != dns.TypeSOA {
t.Errorf("Expected SOA record for first answer for %s", dns.TypeToString[xfrtype])
}
if rec.Msg.Answer[len(rec.Msg.Answer)-1].Header().Rrtype != dns.TypeSOA {
t.Errorf("Expected SOA record for last answer for %s", dns.TypeToString[xfrtype])
}
}
}
func countRecords(result []dns.RR) (cname int, address int, mx int, sorted bool) { func countRecords(result []dns.RR) (cname int, address int, mx int, sorted bool) {
const ( const (
Start = iota Start = iota