mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

BIND: Fix panic on CNAME (#347)

Browse Source 
* BIND: Fix panic on CNAME
* Improve tests
This commit is contained in:
Tom Limoncelli
2018-03-22 09:25:40 -04:00
committed by GitHub
parent f9d748011e
commit acaa77dc22
2 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
providers/bind/prettyzone.go
View File

@ -41,8 +41,6 @@ func (z *zoneGenData) Less(i, j int) bool {
return zoneRrtypeLess(rrtypeA, rrtypeB) return zoneRrtypeLess(rrtypeA, rrtypeB)
} }
switch rrtypeA { // #rtype_variations switch rrtypeA { // #rtype_variations
case dns.TypeNS, dns.TypeTXT, dns.TypeTLSA:
// pass through.
case dns.TypeA: case dns.TypeA:
ta2, tb2 := a.(*dns.A), b.(*dns.A) ta2, tb2 := a.(*dns.A), b.(*dns.A)
ipa, ipb := ta2.A.To4(), tb2.A.To4() ipa, ipb := ta2.A.To4(), tb2.A.To4()
@ -57,7 +55,11 @@ func (z *zoneGenData) Less(i, j int) bool {
case dns.TypeMX: case dns.TypeMX:
ta2, tb2 := a.(*dns.MX), b.(*dns.MX) ta2, tb2 := a.(*dns.MX), b.(*dns.MX)
pa, pb := ta2.Preference, tb2.Preference pa, pb := ta2.Preference, tb2.Preference
return pa < pb // sort by priority. If they are equal, sort by Mx.
if pa != pb {
return pa < pb
}
return ta2.Mx < tb2.Mx
case dns.TypeSRV: case dns.TypeSRV:
ta2, tb2 := a.(*dns.SRV), b.(*dns.SRV) ta2, tb2 := a.(*dns.SRV), b.(*dns.SRV)
pa, pb := ta2.Port, tb2.Port pa, pb := ta2.Port, tb2.Port
@ -92,9 +94,7 @@ func (z *zoneGenData) Less(i, j int) bool {
return fa > fb return fa > fb
} }
default: default:
panic(fmt.Sprintf("zoneGenData Less: unimplemented rtype %v", dns.TypeToString[rrtypeA])) // pass through. String comparison is sufficient.
// We panic so that we quickly find any switch statements
// that have not been updated for a new RR type.
} }
return a.String() < b.String() return a.String() < b.String()
} }

50
providers/bind/prettyzone_test.go
View File

@ -229,6 +229,56 @@ var testdataZFCAA = `$TTL 300
IN CAA 0 issuewild ";" IN CAA 0 issuewild ";"
` `
// Test 1 of each record type
func mustNewRR(s string) dns.RR {
r, err := dns.NewRR(s)
if err != nil {
panic(err)
}
return r
}
func TestWriteZoneFileEach(t *testing.T) {
// Each rtype should be listed in this test exactly once.
// If an rtype has more than one variations, add a test like TestWriteZoneFileCaa to test each.
var d []dns.RR
// #rtype_variations
d = append(d, mustNewRR(`4.5 300 IN PTR y.bosun.org.`)) // Wouldn't actually be in this domain.
d = append(d, mustNewRR(`bosun.org. 300 IN A 1.2.3.4`))
d = append(d, mustNewRR(`bosun.org. 300 IN MX 1 bosun.org.`))
d = append(d, mustNewRR(`bosun.org. 300 IN TXT "my text"`))
d = append(d, mustNewRR(`bosun.org. 300 IN AAAA 4500:fe::1`))
d = append(d, mustNewRR(`bosun.org. 300 IN SRV 10 10 9999 foo.com.`))
d = append(d, mustNewRR(`bosun.org. 300 IN CAA 0 issue "letsencrypt.org"`))
d = append(d, mustNewRR(`_443._tcp.bosun.org. 300 IN TLSA 3 1 1 abcdef0`)) // Label must be _port._proto
d = append(d, mustNewRR(`sub.bosun.org. 300 IN NS bosun.org.`)) // Must be a label with no other records.
d = append(d, mustNewRR(`x.bosun.org. 300 IN CNAME bosun.org.`)) // Must be a label with no other records.
buf := &bytes.Buffer{}
WriteZoneFile(buf, d, "bosun.org")
if buf.String() != testdataZFEach {
t.Log(buf.String())
t.Log(testdataZFEach)
t.Fatalf("Zone file does not match.")
}
parseAndRegen(t, buf, testdataZFEach)
}
var testdataZFEach = `$TTL 300
4.5. IN PTR y.bosun.org.
@ IN A 1.2.3.4
IN MX 1 bosun.org.
IN TXT "my text"
IN AAAA 4500:fe::1
IN SRV 10 10 9999 foo.com.
IN CAA 0 issue "letsencrypt.org"
_443._tcp IN TLSA 3 1 1 abcdef0
sub IN NS bosun.org.
x IN CNAME bosun.org.
`
// Test sorting
func TestWriteZoneFileOrder(t *testing.T) { func TestWriteZoneFileOrder(t *testing.T) {
var records []dns.RR var records []dns.RR
for i, td := range []string{ for i, td := range []string{