mirror of
https://github.com/miekg/dns.git
synced 2025-08-10 03:26:57 +02:00
* Allow use of fs.FS for $INCLUDE and wrap errors This adds ZoneParser.SetIncludeAllowedFS, to specify an fs.FS when enabling support for $INCLUDE, for reading included files from somewhere other than the local filesystem. I've also modified ParseError to support wrapping another error, such as errors encountered while opening the $INCLUDE target. This allows for much more robust handling, using errors.Is() instead of testing for particular strings (which may not be identical between fs.FS implementations). ParseError was being constructed in a lot of places using positional instead of named members. Updating ParseError initialization after the new member field was added makes this change seem a lot larger than it actually is. The changes here should be completely backwards compatible. The ParseError change should be invisible to anyone not trying to unwrap it, and ZoneParser will continue to use os.Open if the existing SetIncludeAllowed method is called instead of the new SetIncludeAllowedFS method. * Don't duplicate SetIncludeAllowed; clarify edge cases Rather than duplicate functionality between SetIncludeAllowed and SetIncludeAllowedFS, have a method SetIncludeFS, which only sets the fs.FS. I've improved the documentation to point out some considerations for users hoping to use fs.FS as a security boundary. Per the fs.ValidPath documentation, fs.FS implementations must use path (not filepath) semantics, with slash as a separator (even on Windows). Some, like os.DirFS, also require all paths to be relative. I've clarified this in the documentation, made the includePath manipulation more robust to edge cases, and added some additional tests for relative and absolute paths.
421 lines
11 KiB
Go
421 lines
11 KiB
Go
package dns
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"io/fs"
|
|
"net"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
"testing/fstest"
|
|
)
|
|
|
|
func TestZoneParserGenerate(t *testing.T) {
|
|
zone := "$ORIGIN example.org.\n$GENERATE 10-12 foo${2,3,d} IN A 127.0.0.$"
|
|
|
|
wantRRs := []RR{
|
|
&A{Hdr: RR_Header{Name: "foo012.example.org."}, A: net.ParseIP("127.0.0.10")},
|
|
&A{Hdr: RR_Header{Name: "foo013.example.org."}, A: net.ParseIP("127.0.0.11")},
|
|
&A{Hdr: RR_Header{Name: "foo014.example.org."}, A: net.ParseIP("127.0.0.12")},
|
|
}
|
|
|
|
wantIdx := 0
|
|
|
|
z := NewZoneParser(strings.NewReader(zone), "", "")
|
|
|
|
for rr, ok := z.Next(); ok; rr, ok = z.Next() {
|
|
if wantIdx >= len(wantRRs) {
|
|
t.Fatalf("expected %d RRs, but got more", len(wantRRs))
|
|
}
|
|
if got, want := rr.Header().Name, wantRRs[wantIdx].Header().Name; got != want {
|
|
t.Fatalf("expected name %s, but got %s", want, got)
|
|
}
|
|
a, okA := rr.(*A)
|
|
if !okA {
|
|
t.Fatalf("expected *A RR, but got %T", rr)
|
|
}
|
|
if got, want := a.A, wantRRs[wantIdx].(*A).A; !got.Equal(want) {
|
|
t.Fatalf("expected A with IP %v, but got %v", got, want)
|
|
}
|
|
wantIdx++
|
|
}
|
|
|
|
if err := z.Err(); err != nil {
|
|
t.Fatalf("expected no error, but got %s", err)
|
|
}
|
|
|
|
if wantIdx != len(wantRRs) {
|
|
t.Errorf("too few records, expected %d, got %d", len(wantRRs), wantIdx)
|
|
}
|
|
}
|
|
|
|
func TestZoneParserInclude(t *testing.T) {
|
|
tmpfile, err := os.CreateTemp("", "dns")
|
|
if err != nil {
|
|
t.Fatalf("could not create tmpfile for test: %s", err)
|
|
}
|
|
defer os.Remove(tmpfile.Name())
|
|
|
|
if _, err := tmpfile.WriteString("foo\tIN\tA\t127.0.0.1"); err != nil {
|
|
t.Fatalf("unable to write content to tmpfile %q: %s", tmpfile.Name(), err)
|
|
}
|
|
if err := tmpfile.Close(); err != nil {
|
|
t.Fatalf("could not close tmpfile %q: %s", tmpfile.Name(), err)
|
|
}
|
|
|
|
zone := "$ORIGIN example.org.\n$INCLUDE " + tmpfile.Name() + "\nbar\tIN\tA\t127.0.0.2"
|
|
|
|
var got int
|
|
z := NewZoneParser(strings.NewReader(zone), "", "")
|
|
z.SetIncludeAllowed(true)
|
|
for rr, ok := z.Next(); ok; _, ok = z.Next() {
|
|
switch rr.Header().Name {
|
|
case "foo.example.org.", "bar.example.org.":
|
|
default:
|
|
t.Fatalf("expected foo.example.org. or bar.example.org., but got %s", rr.Header().Name)
|
|
}
|
|
got++
|
|
}
|
|
if err := z.Err(); err != nil {
|
|
t.Fatalf("expected no error, but got %s", err)
|
|
}
|
|
|
|
if expected := 2; got != expected {
|
|
t.Errorf("failed to parse zone after include, expected %d records, got %d", expected, got)
|
|
}
|
|
|
|
os.Remove(tmpfile.Name())
|
|
|
|
z = NewZoneParser(strings.NewReader(zone), "", "")
|
|
z.SetIncludeAllowed(true)
|
|
z.Next()
|
|
if err := z.Err(); err == nil ||
|
|
!strings.Contains(err.Error(), "failed to open") ||
|
|
!strings.Contains(err.Error(), tmpfile.Name()) ||
|
|
!strings.Contains(err.Error(), "no such file or directory") {
|
|
t.Fatalf(`expected error to contain: "failed to open", %q and "no such file or directory" but got: %s`,
|
|
tmpfile.Name(), err)
|
|
}
|
|
}
|
|
|
|
func TestZoneParserIncludeFS(t *testing.T) {
|
|
fsys := fstest.MapFS{
|
|
"db.foo": &fstest.MapFile{
|
|
Data: []byte("foo\tIN\tA\t127.0.0.1"),
|
|
},
|
|
}
|
|
zone := "$ORIGIN example.org.\n$INCLUDE db.foo\nbar\tIN\tA\t127.0.0.2"
|
|
|
|
var got int
|
|
z := NewZoneParser(strings.NewReader(zone), "", "")
|
|
z.SetIncludeAllowed(true)
|
|
z.SetIncludeFS(fsys)
|
|
for rr, ok := z.Next(); ok; _, ok = z.Next() {
|
|
switch rr.Header().Name {
|
|
case "foo.example.org.", "bar.example.org.":
|
|
default:
|
|
t.Fatalf("expected foo.example.org. or bar.example.org., but got %s", rr.Header().Name)
|
|
}
|
|
got++
|
|
}
|
|
if err := z.Err(); err != nil {
|
|
t.Fatalf("expected no error, but got %s", err)
|
|
}
|
|
|
|
if expected := 2; got != expected {
|
|
t.Errorf("failed to parse zone after include, expected %d records, got %d", expected, got)
|
|
}
|
|
|
|
fsys = fstest.MapFS{}
|
|
|
|
z = NewZoneParser(strings.NewReader(zone), "", "")
|
|
z.SetIncludeAllowed(true)
|
|
z.SetIncludeFS(fsys)
|
|
z.Next()
|
|
if err := z.Err(); !errors.Is(err, fs.ErrNotExist) {
|
|
t.Fatalf(`expected fs.ErrNotExist but got: %T %v`, err, err)
|
|
}
|
|
}
|
|
|
|
func TestZoneParserIncludeFSPaths(t *testing.T) {
|
|
fsys := fstest.MapFS{
|
|
"baz/bat/db.foo": &fstest.MapFile{
|
|
Data: []byte("foo\tIN\tA\t127.0.0.1"),
|
|
},
|
|
}
|
|
|
|
for _, p := range []string{
|
|
"../bat/db.foo",
|
|
"/baz/bat/db.foo",
|
|
} {
|
|
zone := "$ORIGIN example.org.\n$INCLUDE " + p + "\nbar\tIN\tA\t127.0.0.2"
|
|
var got int
|
|
z := NewZoneParser(strings.NewReader(zone), "", "baz/quux/db.bar")
|
|
z.SetIncludeAllowed(true)
|
|
z.SetIncludeFS(fsys)
|
|
for rr, ok := z.Next(); ok; _, ok = z.Next() {
|
|
switch rr.Header().Name {
|
|
case "foo.example.org.", "bar.example.org.":
|
|
default:
|
|
t.Fatalf("$INCLUDE %q: expected foo.example.org. or bar.example.org., but got %s", p, rr.Header().Name)
|
|
}
|
|
got++
|
|
}
|
|
if err := z.Err(); err != nil {
|
|
t.Fatalf("$INCLUDE %q: expected no error, but got %s", p, err)
|
|
}
|
|
if expected := 2; got != expected {
|
|
t.Errorf("$INCLUDE %q: failed to parse zone after include, expected %d records, got %d", p, expected, got)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestZoneParserIncludeDisallowed(t *testing.T) {
|
|
tmpfile, err := os.CreateTemp("", "dns")
|
|
if err != nil {
|
|
t.Fatalf("could not create tmpfile for test: %s", err)
|
|
}
|
|
defer os.Remove(tmpfile.Name())
|
|
|
|
if _, err := tmpfile.WriteString("foo\tIN\tA\t127.0.0.1"); err != nil {
|
|
t.Fatalf("unable to write content to tmpfile %q: %s", tmpfile.Name(), err)
|
|
}
|
|
if err := tmpfile.Close(); err != nil {
|
|
t.Fatalf("could not close tmpfile %q: %s", tmpfile.Name(), err)
|
|
}
|
|
|
|
zp := NewZoneParser(strings.NewReader("$INCLUDE "+tmpfile.Name()), "example.org.", "")
|
|
|
|
for _, ok := zp.Next(); ok; _, ok = zp.Next() {
|
|
}
|
|
|
|
const expect = "$INCLUDE directive not allowed"
|
|
if err := zp.Err(); err == nil || !strings.Contains(err.Error(), expect) {
|
|
t.Errorf("expected error to contain %q, got %v", expect, err)
|
|
}
|
|
}
|
|
|
|
func TestZoneParserAddressAAAA(t *testing.T) {
|
|
tests := []struct {
|
|
record string
|
|
want *AAAA
|
|
}{
|
|
{
|
|
record: "1.example.org. 600 IN AAAA ::1",
|
|
want: &AAAA{Hdr: RR_Header{Name: "1.example.org."}, AAAA: net.IPv6loopback},
|
|
},
|
|
{
|
|
record: "2.example.org. 600 IN AAAA ::FFFF:127.0.0.1",
|
|
want: &AAAA{Hdr: RR_Header{Name: "2.example.org."}, AAAA: net.ParseIP("::FFFF:127.0.0.1")},
|
|
},
|
|
}
|
|
|
|
for _, tc := range tests {
|
|
got, err := NewRR(tc.record)
|
|
if err != nil {
|
|
t.Fatalf("expected no error, but got %s", err)
|
|
}
|
|
aaaa, ok := got.(*AAAA)
|
|
if !ok {
|
|
t.Fatalf("expected *AAAA RR, but got %T", got)
|
|
}
|
|
if !aaaa.AAAA.Equal(tc.want.AAAA) {
|
|
t.Fatalf("expected AAAA with IP %v, but got %v", tc.want.AAAA, aaaa.AAAA)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestZoneParserAddressBad(t *testing.T) {
|
|
records := []string{
|
|
"1.bad.example.org. 600 IN A ::1",
|
|
"2.bad.example.org. 600 IN A ::FFFF:127.0.0.1",
|
|
"3.bad.example.org. 600 IN AAAA 127.0.0.1",
|
|
}
|
|
|
|
for _, record := range records {
|
|
const expect = "bad A"
|
|
if got, err := NewRR(record); err == nil || !strings.Contains(err.Error(), expect) {
|
|
t.Errorf("NewRR(%v) = %v, want err to contain %q", record, got, expect)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestParseTA(t *testing.T) {
|
|
rr, err := NewRR(` Ta 0 0 0`)
|
|
if err != nil {
|
|
t.Fatalf("expected no error, but got %s", err)
|
|
}
|
|
if rr == nil {
|
|
t.Fatal(`expected a normal RR, but got nil`)
|
|
}
|
|
}
|
|
|
|
var errTestReadError = &Error{"test error"}
|
|
|
|
type errReader struct{}
|
|
|
|
func (errReader) Read(p []byte) (int, error) { return 0, errTestReadError }
|
|
|
|
func TestParseZoneReadError(t *testing.T) {
|
|
rr, err := ReadRR(errReader{}, "")
|
|
if err == nil || !strings.Contains(err.Error(), errTestReadError.Error()) {
|
|
t.Errorf("expected error to contain %q, but got %v", errTestReadError, err)
|
|
}
|
|
if rr != nil {
|
|
t.Errorf("expected a nil RR, but got %v", rr)
|
|
}
|
|
}
|
|
|
|
func TestUnexpectedNewline(t *testing.T) {
|
|
zone := `
|
|
example.com. 60 PX
|
|
1000 TXT 1K
|
|
`
|
|
zp := NewZoneParser(strings.NewReader(zone), "example.com.", "")
|
|
for _, ok := zp.Next(); ok; _, ok = zp.Next() {
|
|
}
|
|
|
|
const expect = `dns: unexpected newline: "\n" at line: 2:18`
|
|
if err := zp.Err(); err == nil || err.Error() != expect {
|
|
t.Errorf("expected error to contain %q, got %v", expect, err)
|
|
}
|
|
|
|
// Test that newlines inside braces still work.
|
|
zone = `
|
|
example.com. 60 PX (
|
|
1000 TXT 1K )
|
|
`
|
|
zp = NewZoneParser(strings.NewReader(zone), "example.com.", "")
|
|
|
|
var count int
|
|
for _, ok := zp.Next(); ok; _, ok = zp.Next() {
|
|
count++
|
|
}
|
|
|
|
if count != 1 {
|
|
t.Errorf("expected 1 record, got %d", count)
|
|
}
|
|
|
|
if err := zp.Err(); err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestParseRFC3597InvalidLength(t *testing.T) {
|
|
// We need to space separate the 00s otherwise it will exceed the maximum token size
|
|
// of the zone lexer.
|
|
_, err := NewRR("example. 3600 CLASS1 TYPE1 \\# 65536 " + strings.Repeat("00 ", 65536))
|
|
if err == nil {
|
|
t.Error("should not have parsed excessively long RFC3579 record")
|
|
}
|
|
}
|
|
|
|
func TestParseKnownRRAsRFC3597(t *testing.T) {
|
|
t.Run("with RDATA", func(t *testing.T) {
|
|
// This was found by oss-fuzz.
|
|
_, err := NewRR("example. 3600 tYpe44 \\# 03 75 0100")
|
|
if err != nil {
|
|
t.Errorf("failed to parse RFC3579 format: %v", err)
|
|
}
|
|
|
|
rr, err := NewRR("example. 3600 CLASS1 TYPE1 \\# 4 7f000001")
|
|
if err != nil {
|
|
t.Fatalf("failed to parse RFC3579 format: %v", err)
|
|
}
|
|
|
|
if rr.Header().Rrtype != TypeA {
|
|
t.Errorf("expected TypeA (1) Rrtype, but got %v", rr.Header().Rrtype)
|
|
}
|
|
|
|
a, ok := rr.(*A)
|
|
if !ok {
|
|
t.Fatalf("expected *A RR, but got %T", rr)
|
|
}
|
|
|
|
localhost := net.IPv4(127, 0, 0, 1)
|
|
if !a.A.Equal(localhost) {
|
|
t.Errorf("expected A with IP %v, but got %v", localhost, a.A)
|
|
}
|
|
})
|
|
t.Run("without RDATA", func(t *testing.T) {
|
|
rr, err := NewRR("example. 3600 CLASS1 TYPE1 \\# 0")
|
|
if err != nil {
|
|
t.Fatalf("failed to parse RFC3579 format: %v", err)
|
|
}
|
|
|
|
if rr.Header().Rrtype != TypeA {
|
|
t.Errorf("expected TypeA (1) Rrtype, but got %v", rr.Header().Rrtype)
|
|
}
|
|
|
|
a, ok := rr.(*A)
|
|
if !ok {
|
|
t.Fatalf("expected *A RR, but got %T", rr)
|
|
}
|
|
|
|
if len(a.A) != 0 {
|
|
t.Errorf("expected A with empty IP, but got %v", a.A)
|
|
}
|
|
})
|
|
}
|
|
|
|
func BenchmarkNewRR(b *testing.B) {
|
|
const name1 = "12345678901234567890123456789012345.12345678.123."
|
|
const s = name1 + " 3600 IN MX 10 " + name1
|
|
|
|
for n := 0; n < b.N; n++ {
|
|
_, err := NewRR(s)
|
|
if err != nil {
|
|
b.Fatal(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func BenchmarkReadRR(b *testing.B) {
|
|
const name1 = "12345678901234567890123456789012345.12345678.123."
|
|
const s = name1 + " 3600 IN MX 10 " + name1 + "\n"
|
|
|
|
for n := 0; n < b.N; n++ {
|
|
r := struct{ io.Reader }{strings.NewReader(s)}
|
|
// r is now only an io.Reader and won't benefit from the
|
|
// io.ByteReader special-case in zlexer.Next.
|
|
|
|
_, err := ReadRR(r, "")
|
|
if err != nil {
|
|
b.Fatal(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
const benchZone = `
|
|
foo. IN A 10.0.0.1 ; this is comment 1
|
|
foo. IN A (
|
|
10.0.0.2 ; this is comment 2
|
|
)
|
|
; this is comment 3
|
|
foo. IN A 10.0.0.3
|
|
foo. IN A ( 10.0.0.4 ); this is comment 4
|
|
|
|
foo. IN A 10.0.0.5
|
|
; this is comment 5
|
|
|
|
foo. IN A 10.0.0.6
|
|
|
|
foo. IN DNSKEY 256 3 5 AwEAAb+8l ; this is comment 6
|
|
foo. IN NSEC miek.nl. TXT RRSIG NSEC; this is comment 7
|
|
foo. IN TXT "THIS IS TEXT MAN"; this is comment 8
|
|
`
|
|
|
|
func BenchmarkZoneParser(b *testing.B) {
|
|
for n := 0; n < b.N; n++ {
|
|
zp := NewZoneParser(strings.NewReader(benchZone), "example.org.", "")
|
|
|
|
for _, ok := zp.Next(); ok; _, ok = zp.Next() {
|
|
}
|
|
|
|
if err := zp.Err(); err != nil {
|
|
b.Fatal(err)
|
|
}
|
|
}
|
|
}
|