Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-12-22 01:55:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for misleading SOA parser warnings (#7774)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/file/file.go
View File

@@ -166,15 +166,11 @@ func Parse(f io.Reader, origin, fileName string, serial int64) (*Zone, error) {
return nil, err return nil, err
} }
} }
if !seenSOA {
return nil, fmt.Errorf("file %q has no SOA record for origin %s", fileName, origin)
}
if zp.Err() != nil { if zp.Err() != nil {
return nil, fmt.Errorf("failed to parse file %q for origin %s with error %v", fileName, origin, zp.Err()) return nil, fmt.Errorf("failed to parse file %q for origin %s with error %v", fileName, origin, zp.Err())
} }
if !seenSOA {
if err := zp.Err(); err != nil { return nil, fmt.Errorf("file %q has no SOA record for origin %s", fileName, origin)
return nil, err
} }
return z, nil return z, nil

50
plugin/file/file_test.go
View File

@@ -57,3 +57,53 @@ www IN A 192.168.0.14
mail IN A 192.168.0.15 mail IN A 192.168.0.15
imap IN CNAME mail imap IN CNAME mail
` `
func TestParseMalformedSOA(t *testing.T) {
_, err := Parse(strings.NewReader(dbMalformedSOA), "example.org.", "stdin", 0)
if err == nil {
t.Fatalf("Zone %q should have failed to load", "example.org.")
}
if !strings.Contains(err.Error(), "bad SOA zone parameter") {
t.Fatalf("Expected parse error containing 'bad SOA zone parameter', got: %s", err)
}
}
const dbMalformedSOA = `
$TTL 1M
$ORIGIN example.org.
@ IN SOA ns1.example.com. admin.example.com. (
abc ; Serial - invalid
1200 ; Refresh
144 ; Retry
1814400 ; Expire
2h ) ; Minimum
@ IN NS ns1.example.com.
www IN A 192.168.0.14
`
func TestParseSOASerialTooLarge(t *testing.T) {
_, err := Parse(strings.NewReader(dbSOASerialTooLarge), "example.org.", "stdin", 0)
if err == nil {
t.Fatalf("Zone %q should have failed to load", "example.org.")
}
if !strings.Contains(err.Error(), "bad SOA zone parameter") {
t.Fatalf("Expected parse error containing 'bad SOA zone parameter', got: %s", err)
}
}
const dbSOASerialTooLarge = `
$TTL 1M
$ORIGIN example.org.
@ IN SOA ns1.example.com. admin.example.com. (
202512200817 ; Serial - exceeds 32-bit uint
1200 ; Refresh
144 ; Retry
1814400 ; Expire
2h ) ; Minimum
@ IN NS ns1.example.com.
www IN A 192.168.0.14
`