Fix for misleading SOA parser warnings (#7774)

* Improve SOA error handling/reporting.

Signed-off-by: Ross Golder <ross@golder.org>

* Add tests for malformed SOA records

Signed-off-by: Ross Golder <ross@golder.org>

* Address review comments: assert exact parse errors in SOA tests and fix gofmt

Signed-off-by: Ross Golder <ross@golder.org>

---------

Signed-off-by: Ross Golder <ross@golder.org>
This commit is contained in:
Ross Golder
2025-12-21 16:54:59 +07:00
committed by GitHub
parent 0d8cbb1a6b
commit f35e57f301
2 changed files with 52 additions and 6 deletions

View File

@@ -166,15 +166,11 @@ func Parse(f io.Reader, origin, fileName string, serial int64) (*Zone, error) {
return nil, err
}
}
if !seenSOA {
return nil, fmt.Errorf("file %q has no SOA record for origin %s", fileName, origin)
}
if zp.Err() != nil {
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
if !seenSOA {
return nil, fmt.Errorf("file %q has no SOA record for origin %s", fileName, origin)
}
return z, nil