diff options
author | 2018-08-29 12:26:22 +0100 | |
---|---|---|
committer | 2018-08-29 12:26:22 +0100 | |
commit | ba1efee4f1c2258e43b1bd8035ac6d1208675b95 (patch) | |
tree | 17ec11d7616120357c2828b6374d02ab081c5e42 /plugin/file/wildcard_test.go | |
parent | eb51e8bac90fac86d34c9e1cb89b04ea0936b034 (diff) | |
download | coredns-ba1efee4f1c2258e43b1bd8035ac6d1208675b95.tar.gz coredns-ba1efee4f1c2258e43b1bd8035ac6d1208675b95.tar.zst coredns-ba1efee4f1c2258e43b1bd8035ac6d1208675b95.zip |
Default to scrubbing replies in the server (#2012)
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>
Diffstat (limited to 'plugin/file/wildcard_test.go')
-rw-r--r-- | plugin/file/wildcard_test.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugin/file/wildcard_test.go b/plugin/file/wildcard_test.go index 8f73d1543..314b699c6 100644 --- a/plugin/file/wildcard_test.go +++ b/plugin/file/wildcard_test.go @@ -11,6 +11,7 @@ import ( "github.com/miekg/dns" ) +// these examples don't have an additional opt RR set, because that's gets added by the server. var wildcardTestCases = []test.Case{ { Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT, @@ -36,7 +37,6 @@ var wildcardTestCases = []test.Case{ test.NSEC("a.dnssex.nl. 14400 IN NSEC www.dnssex.nl. A AAAA RRSIG NSEC"), test.RRSIG("a.dnssex.nl. 14400 IN RRSIG NSEC 8 3 14400 20160428190224 20160329190224 14460 dnssex.nl. S+UMs2ySgRaaRY"), }, dnssexAuth...), - Extra: []dns.RR{test.OPT(4096, true)}, }, { Qname: "a.wild.dnssex.nl.", Qtype: dns.TypeTXT, Do: true, @@ -48,7 +48,6 @@ var wildcardTestCases = []test.Case{ test.NSEC("a.dnssex.nl. 14400 IN NSEC www.dnssex.nl. A AAAA RRSIG NSEC"), test.RRSIG("a.dnssex.nl. 14400 IN RRSIG NSEC 8 3 14400 20160428190224 20160329190224 14460 dnssex.nl. S+UMs2ySgRaaRY"), }, dnssexAuth...), - Extra: []dns.RR{test.OPT(4096, true)}, }, // nodata responses { @@ -66,7 +65,6 @@ var wildcardTestCases = []test.Case{ test.RRSIG(`dnssex.nl. 1800 IN RRSIG SOA 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. CA/Y3m9hCOiKC/8ieSOv8SeP964Bq++lyH8BZJcTaabAsERs4xj5PRtcxicwQXZiF8fYUCpROlUS0YR8Cdw=`), test.SOA(`dnssex.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1459281744 14400 3600 604800 14400`), }, - Extra: []dns.RR{test.OPT(4096, true)}, }, } |