Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix zone parser error handling #6680

Merged
merged 1 commit into from
Jul 1, 2024
Merged

Fix zone parser error handling #6680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugin/file/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -160,5 +156,9 @@ func Parse(f io.Reader, origin, fileName string, serial int64) (*Zone, error) {
return nil, fmt.Errorf("file %q has no SOA record for origin %s", fileName, origin)
}

if err := zp.Err(); err != nil {
return nil, err
}

return z, nil
}
28 changes: 28 additions & 0 deletions plugin/file/file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 4 additions & 4 deletions plugin/sign/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 changes: 1 addition & 5 deletions plugin/sign/signer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down