Fix zone parser error handling (#6680)

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
4 changed files with 37 additions and 13 deletions

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
}