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

plugin/file: New zone should have zero records (#3025)

Browse Source 
After calling NewZone the number of records should be zero, but due to
how zone.All() was implemented so empty RRs would be added. This then
fails the == 0 check in xfr.go and put nil in the slice, this then
subsequently panics on the Len().

Fix this making All() smarter when adding records. Added little test to
enfore this.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2019-07-20 18:13:43 +00:00
committed by Yong Tang
parent f7b26db9d0
commit 01e13c622e
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/file/xfr_test.go
View File

@@ -3,6 +3,7 @@ package file
import (
"fmt"
"strings"
"testing"
)
func ExampleZone_All() {
@@ -32,3 +33,11 @@ func ExampleZone_All() {
// xfr_test.go:15: a.miek.nl. 1800 IN A 139.162.196.78
// xfr_test.go:15: a.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735
}
func TestAllNewZone(t *testing.T) {
zone := NewZone("example.org.", "stdin")
records := zone.All()
if len(records) != 0 {
t.Errorf("Expected %d records in empty zone, got %d", 0, len(records))
}
}

10
plugin/file/zone.go
View File

@@ -173,15 +173,21 @@ func (z *Zone) All() []dns.RR {
records = append(records, a.All()...)
}
// Either the entire Apex is filled or none it, this isn't enforced here though.
if len(z.Apex.SIGNS) > 0 {
records = append(z.Apex.SIGNS, records...)
}
records = append(z.Apex.NS, records...)
if len(z.Apex.NS) > 0 {
records = append(z.Apex.NS, records...)
}
if len(z.Apex.SIGSOA) > 0 {
records = append(z.Apex.SIGSOA, records...)
}
return append([]dns.RR{z.Apex.SOA}, records...)
if z.Apex.SOA != nil {
return append([]dns.RR{z.Apex.SOA}, records...)
}
return records
}
// NameFromRight returns the labels from the right, staring with the