Every plugin needs to deal with EDNS0 and should call Scrub to make a message fit the client's buffer. Move this functionality into the server and wrapping the ResponseWriter into a ScrubWriter that handles these bits for us. Result: Less code and faster, because multiple chained plugins could all be calling scrub and SizeAndDo - now there is just one place. Most tests in file/* and dnssec/* needed adjusting because in those unit tests you don't see OPT RRs anymore. The DNSSEC signer was also looking at the returned OPT RR to see if it needed to sign - as those are now added by the server (and thus later), this needed to change slightly. Scrub itself still exist (for backward compat reasons), but has been made a noop. Scrub has been renamed to scrub as it should not be used by external plugins. Fixes: #2010 Signed-off-by: Miek Gieben <miek@miek.nl>
215 lines
8.5 KiB
Go
215 lines
8.5 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: "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\n", err)
|
|
return
|
|
}
|
|
|
|
resp := rec.Msg
|
|
test.SortAndCheck(t, resp, tc)
|
|
}
|
|
}
|
|
|
|
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`
|