7aaed71b92
Addresses a bug in the file plugin where SOA queries to zone delegations are inappropriately returned the SOA for the delegating zone, and not a downward referral to the delegated zone. Here is an example of what I believe the expected downward referral in response to a SOA query for a delegated zone should be (note that no SOA record is returned): ~~~ ; <<>> DiG 9.11.3-1ubuntu1.5-Ubuntu <<>> @k.root-servers.net. miek.nl. SOA ; (2 servers found) ;; global options: +cmd ;; Got answer: ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 58381 ;; flags: qr rd; QUERY: 1, ANSWER: 0, AUTHORITY: 3, ADDITIONAL: 7 ;; WARNING: recursion requested but not available ;; OPT PSEUDOSECTION: ; EDNS: version: 0, flags:; udp: 4096 ;; QUESTION SECTION: ;miek.nl. IN SOA ;; AUTHORITY SECTION: nl. 172800 IN NS ns1.dns.nl. nl. 172800 IN NS ns2.dns.nl. nl. 172800 IN NS ns3.dns.nl. ;; ADDITIONAL SECTION: ns1.dns.nl. 172800 IN A 194.0.28.53 ns2.dns.nl. 172800 IN A 194.146.106.42 ns3.dns.nl. 172800 IN A 194.0.25.24 ns1.dns.nl. 172800 IN AAAA 2001:678:2c:0:194:0:28:53 ns2.dns.nl. 172800 IN AAAA 2001:67c:1010:10::53 ns3.dns.nl. 172800 IN AAAA 2001:678:20::24 ~~~ See #3852 for the original fix. Modified clouddns/route53 and removed the faulty tests there. Signed-off-by: Miek Gieben <miek@miek.nl>
228 lines
8.9 KiB
Go
228 lines
8.9 KiB
Go
package file
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/coredns/coredns/plugin/pkg/dnstest"
|
|
"github.com/coredns/coredns/plugin/test"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
var delegationTestCases = []test.Case{
|
|
{
|
|
Qname: "a.delegated.miek.nl.", Qtype: dns.TypeTXT,
|
|
Ns: []dns.RR{
|
|
test.NS("delegated.miek.nl. 1800 IN NS a.delegated.miek.nl."),
|
|
test.NS("delegated.miek.nl. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "delegated.miek.nl.", Qtype: dns.TypeNS,
|
|
Ns: []dns.RR{
|
|
test.NS("delegated.miek.nl. 1800 IN NS a.delegated.miek.nl."),
|
|
test.NS("delegated.miek.nl. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "foo.delegated.miek.nl.", Qtype: dns.TypeA,
|
|
Ns: []dns.RR{
|
|
test.NS("delegated.miek.nl. 1800 IN NS a.delegated.miek.nl."),
|
|
test.NS("delegated.miek.nl. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "foo.delegated.miek.nl.", Qtype: dns.TypeTXT,
|
|
Ns: []dns.RR{
|
|
test.NS("delegated.miek.nl. 1800 IN NS a.delegated.miek.nl."),
|
|
test.NS("delegated.miek.nl. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "foo.delegated.miek.nl.", Qtype: dns.TypeSOA,
|
|
Ns: []dns.RR{
|
|
test.NS("delegated.miek.nl. 1800 IN NS a.delegated.miek.nl."),
|
|
test.NS("delegated.miek.nl. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.miek.nl. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "miek.nl.", Qtype: dns.TypeSOA,
|
|
Answer: []dns.RR{
|
|
test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
|
|
},
|
|
Ns: miekAuth,
|
|
},
|
|
{
|
|
Qname: "miek.nl.", Qtype: dns.TypeAAAA,
|
|
Ns: []dns.RR{
|
|
test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
|
|
},
|
|
},
|
|
}
|
|
|
|
var secureDelegationTestCases = []test.Case{
|
|
{
|
|
Qname: "a.delegated.example.org.", Qtype: dns.TypeTXT, Do: true,
|
|
Ns: []dns.RR{
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
|
|
test.NS("delegated.example.org. 1800 IN NS a.delegated.example.org."),
|
|
test.NS("delegated.example.org. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
test.RRSIG("delegated.example.org. 1800 IN RRSIG DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "delegated.example.org.", Qtype: dns.TypeNS, Do: true,
|
|
Ns: []dns.RR{
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
|
|
test.NS("delegated.example.org. 1800 IN NS a.delegated.example.org."),
|
|
test.NS("delegated.example.org. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
test.RRSIG("delegated.example.org. 1800 IN RRSIG DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "foo.delegated.example.org.", Qtype: dns.TypeA, Do: true,
|
|
Ns: []dns.RR{
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
|
|
test.NS("delegated.example.org. 1800 IN NS a.delegated.example.org."),
|
|
test.NS("delegated.example.org. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
test.RRSIG("delegated.example.org. 1800 IN RRSIG DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "foo.delegated.example.org.", Qtype: dns.TypeDS, Do: true,
|
|
Ns: []dns.RR{
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
|
|
test.NS("delegated.example.org. 1800 IN NS a.delegated.example.org."),
|
|
test.NS("delegated.example.org. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
test.RRSIG("delegated.example.org. 1800 IN RRSIG DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
|
|
},
|
|
Extra: []dns.RR{
|
|
test.A("a.delegated.example.org. 1800 IN A 139.162.196.78"),
|
|
test.AAAA("a.delegated.example.org. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
|
|
},
|
|
},
|
|
{
|
|
Qname: "delegated.example.org.", Qtype: dns.TypeDS, Do: true,
|
|
Answer: []dns.RR{
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 1 EE72CABD1927759CDDA92A10DBF431504B9E1F13"),
|
|
test.DS("delegated.example.org. 1800 IN DS 10056 5 2 E4B05F87725FA86D9A64F1E53C3D0E6250946599DFE639C45955B0ED416CDDFA"),
|
|
test.RRSIG("delegated.example.org. 1800 IN RRSIG DS 13 3 1800 20161129153240 20161030153240 49035 example.org. rlNNzcUmtbjLSl02ZzQGUbWX75yCUx0Mug1jHtKVqRq1hpPE2S3863tIWSlz+W9wz4o19OI4jbznKKqk+DGKog=="),
|
|
},
|
|
Ns: []dns.RR{
|
|
test.NS("example.org. 1800 IN NS a.iana-servers.net."),
|
|
test.NS("example.org. 1800 IN NS b.iana-servers.net."),
|
|
test.RRSIG("example.org. 1800 IN RRSIG NS 13 2 1800 20161129153240 20161030153240 49035 example.org. llrHoIuw="),
|
|
},
|
|
},
|
|
}
|
|
|
|
var miekAuth = []dns.RR{
|
|
test.NS("miek.nl. 1800 IN NS ext.ns.whyscream.net."),
|
|
test.NS("miek.nl. 1800 IN NS linode.atoom.net."),
|
|
test.NS("miek.nl. 1800 IN NS ns-ext.nlnetlabs.nl."),
|
|
test.NS("miek.nl. 1800 IN NS omval.tednet.nl."),
|
|
}
|
|
|
|
func TestLookupDelegation(t *testing.T) {
|
|
testDelegation(t, dbMiekNLDelegation, testzone, delegationTestCases)
|
|
}
|
|
|
|
func TestLookupSecureDelegation(t *testing.T) {
|
|
testDelegation(t, exampleOrgSigned, "example.org.", secureDelegationTestCases)
|
|
}
|
|
|
|
func testDelegation(t *testing.T, z, origin string, testcases []test.Case) {
|
|
zone, err := Parse(strings.NewReader(z), origin, "stdin", 0)
|
|
if err != nil {
|
|
t.Fatalf("Expect no error when reading zone, got %q", err)
|
|
}
|
|
|
|
fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{origin: zone}, Names: []string{origin}}}
|
|
ctx := context.TODO()
|
|
|
|
for _, tc := range testcases {
|
|
m := tc.Msg()
|
|
|
|
rec := dnstest.NewRecorder(&test.ResponseWriter{})
|
|
_, err := fm.ServeDNS(ctx, rec, m)
|
|
if err != nil {
|
|
t.Errorf("Expected no error, got %q", err)
|
|
return
|
|
}
|
|
|
|
resp := rec.Msg
|
|
if err := test.SortAndCheck(resp, tc); err != nil {
|
|
t.Error(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
const dbMiekNLDelegation = `
|
|
$TTL 30M
|
|
$ORIGIN miek.nl.
|
|
@ IN SOA linode.atoom.net. miek.miek.nl. (
|
|
1282630057 ; Serial
|
|
4H ; Refresh
|
|
1H ; Retry
|
|
7D ; Expire
|
|
4H ) ; Negative Cache TTL
|
|
IN NS linode.atoom.net.
|
|
IN NS ns-ext.nlnetlabs.nl.
|
|
IN NS omval.tednet.nl.
|
|
IN NS ext.ns.whyscream.net.
|
|
|
|
IN MX 1 aspmx.l.google.com.
|
|
IN MX 5 alt1.aspmx.l.google.com.
|
|
IN MX 5 alt2.aspmx.l.google.com.
|
|
IN MX 10 aspmx2.googlemail.com.
|
|
IN MX 10 aspmx3.googlemail.com.
|
|
|
|
delegated IN NS a.delegated
|
|
IN NS ns-ext.nlnetlabs.nl.
|
|
|
|
a.delegated IN TXT "obscured"
|
|
IN A 139.162.196.78
|
|
IN AAAA 2a01:7e00::f03c:91ff:fef1:6735
|
|
|
|
a IN A 139.162.196.78
|
|
IN AAAA 2a01:7e00::f03c:91ff:fef1:6735
|
|
www IN CNAME a
|
|
archive IN CNAME a`
|