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

Fix zone parser error handling (#6680)

Browse source 
Signed-off-by: Nathan Currier <nathan.currier@broadcom.com>
This commit is contained in:
Nathan Currier 2024-07-01 10:27:50 -05:00 • committed by GitHub
parent 2e9986c622
commit 626333a1b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugin/file/file.go
View file

@ -136,10 +136,6 @@ func Parse(f io.Reader, origin, fileName string, serial int64) (*Zone, error) {
z := NewZone(origin, fileName)
seenSOA := false
for rr, ok := zp.Next(); ok; rr, ok = zp.Next() {
if err := zp.Err(); err != nil {
return nil, err
}
if !seenSOA {
if s, ok := rr.(*dns.SOA); ok {
seenSOA = true
@ -163,5 +159,9 @@ func Parse(f io.Reader, origin, fileName string, serial int64) (*Zone, error) {
return nil, fmt.Errorf("failed to parse file %q for origin %s with error %v", fileName, origin, zp.Err())
}
if err := zp.Err(); err != nil {
return nil, err
}
return z, nil
}

28
plugin/file/file_test.go
View file

@ -29,3 +29,31 @@ www IN A 192.168.0.14
mail IN A 192.168.0.15
imap IN CNAME mail
`
func TestParseSyntaxError(t *testing.T) {
_, err := Parse(strings.NewReader(dbSyntaxError), "example.org.", "stdin", 0)
if err == nil {
t.Fatalf("Zone %q should have failed to load", "example.org.")
}
if !strings.Contains(err.Error(), "\"invalid\"") {
t.Fatalf("Zone %q should have failed with syntax error: %s", "example.org.", err)
}
}
const dbSyntaxError = `
$TTL 1M
$ORIGIN example.org.
@ IN SOA ns1.example.com. admin.example.com. (
2005011437 ; Serial
1200 ; Refresh
144 ; Retry
1814400 ; Expire
2h ) ; Minimum
@ IN NS ns1.example.com.
# invalid comment
www IN A 192.168.0.14
mail IN A 192.168.0.15
imap IN CNAME mail
`

8
plugin/sign/file.go
View file

@ -66,10 +66,6 @@ func Parse(f io.Reader, origin, fileName string) (*file.Zone, error) {
seenSOA := false
for rr, ok := zp.Next(); ok; rr, ok = zp.Next() {
if err := zp.Err(); err != nil {
return nil, err
}
switch rr.(type) {
case *dns.DNSKEY, *dns.RRSIG, *dns.CDNSKEY, *dns.CDS:
continue
@ -88,5 +84,9 @@ func Parse(f io.Reader, origin, fileName string) (*file.Zone, error) {
return nil, fmt.Errorf("file %q has no SOA record", fileName)
}
if err := zp.Err(); err != nil {
return nil, err
}
return z, nil
}

6
plugin/sign/signer.go
View file

@ -133,10 +133,6 @@ func resign(rd io.Reader, now time.Time) (why error) {
i := 0
for rr, ok := zp.Next(); ok; rr, ok = zp.Next() {
if err := zp.Err(); err != nil {
return err
}
switch x := rr.(type) {
case *dns.RRSIG:
if x.TypeCovered != dns.TypeSOA {
@ -166,7 +162,7 @@ func resign(rd io.Reader, now time.Time) (why error) {
}
}
return nil
return zp.Err()
}
func signAndLog(s *Signer, why error) {