diff options
| author |  Miek Gieben <miek@miek.nl>
| 2020-09-17 16:28:43 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-09-17 07:28:43 -0700 |
| commit | acf9a0fa19928e605ac8ac3314890c9fef73e16b (patch) | |
| tree | a442ad2a7894d86b462eade46c44db4572016333 /plugin/cache/cache_test.go | |
| parent | 22b68466262219284a47063e7f7bf9a833d21b61 (diff) | |
| download | coredns-acf9a0fa19928e605ac8ac3314890c9fef73e16b.tar.gz coredns-acf9a0fa19928e605ac8ac3314890c9fef73e16b.tar.zst coredns-acf9a0fa19928e605ac8ac3314890c9fef73e16b.zip | |
cache: default to DNSSEC (#4085)
* cache: default to DNSSEC
This change does away with the DNS/DNSSEC distinction the cache
currently makes. Cache will always make coredns perform a DNSSEC query
and store that result. If a client just needs plain DNS, the DNSSEC
records are stripped from the response.
It should also be more memory efficient, because we store a reply once
and not one DNS and another for DNSSEC.
Fixes: #3836
Signed-off-by: Miek Gieben <miek@miek.nl>
* Change OPT RR when one is present in the msg.
Signed-off-by: Miek Gieben <miek@miek.nl>
* Fix comment for isDNSSEC
Signed-off-by: Miek Gieben <miek@miek.nl>
* Update plugin/cache/handler.go
Co-authored-by: Chris O'Haver <cohaver@infoblox.com>
* Update plugin/cache/item.go
Co-authored-by: Chris O'Haver <cohaver@infoblox.com>
* Code review; fix comment for isDNSSEC
Signed-off-by: Miek Gieben <miek@miek.nl>
* Update doc and set AD to false
Set Authenticated Data to false when DNSSEC was not wanted. Also update
the readme with the new behavior.
Signed-off-by: Miek Gieben <miek@miek.nl>
* Update plugin/cache/handler.go
Co-authored-by: Chris O'Haver <cohaver@infoblox.com>
Co-authored-by: Chris O'Haver <cohaver@infoblox.com>
Diffstat (limited to 'plugin/cache/cache_test.go')
| -rw-r--r-- | plugin/cache/cache_test.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/plugin/cache/cache_test.go b/plugin/cache/cache_test.go index b3ed6d6cc..717276e66 100644 --- a/plugin/cache/cache_test.go +++ b/plugin/cache/cache_test.go @@ -46,17 +46,19 @@ var cacheTestCases = []cacheTestCase{ { RecursionAvailable: true, AuthenticatedData: true, Case: test.Case{ - Qname: "mIEK.nL.", Qtype: dns.TypeMX, + Qname: "miek.nl.", Qtype: dns.TypeMX, Answer: []dns.RR{ - test.MX("mIEK.nL. 3600 IN MX 1 aspmx.l.google.com."), - test.MX("mIEK.nL. 3600 IN MX 10 aspmx2.googlemail.com."), + test.MX("miek.nl. 3600 IN MX 1 aspmx.l.google.com."), + test.MX("miek.nl. 3600 IN MX 10 aspmx2.googlemail.com."), }, }, in: test.Case{ Qname: "mIEK.nL.", Qtype: dns.TypeMX, Answer: []dns.RR{ - test.MX("mIEK.nL. 3601 IN MX 1 aspmx.l.google.com."), - test.MX("mIEK.nL. 3601 IN MX 10 aspmx2.googlemail.com."), + test.MX("miek.nl. 3601 IN MX 1 aspmx.l.google.com."), + test.MX("miek.nl. 3601 IN MX 10 aspmx2.googlemail.com."), + // RRSIG must be here, because we are always doing DNSSEC lookups, and miek.nl MX is tested later in this list as well. + test.RRSIG("miek.nl. 3600 IN RRSIG MX 8 2 1800 20160521031301 20160421031301 12051 miek.nl. lAaEzB5teQLLKyDenatmyhca7blLRg9DoGNrhe3NReBZN5C5/pMQk8Jc u25hv2fW23/SLm5IC2zaDpp2Fzgm6Jf7e90/yLcwQPuE7JjS55WMF+HE LEh7Z6AEb+Iq4BWmNhUz6gPxD4d9eRMs7EAzk13o1NYi5/JhfL6IlaYy qkc="), }, }, shouldCache: true, @@ -136,7 +138,7 @@ var cacheTestCases = []cacheTestCase{ test.RRSIG("miek.nl. 1800 IN RRSIG MX 8 2 1800 20160521031301 20160421031301 12051 miek.nl. lAaEzB5teQLLKyDenatmyhca7blLRg9DoGNrhe3NReBZN5C5/pMQk8Jc u25hv2fW23/SLm5IC2zaDpp2Fzgm6Jf7e90/yLcwQPuE7JjS55WMF+HE LEh7Z6AEb+Iq4BWmNhUz6gPxD4d9eRMs7EAzk13o1NYi5/JhfL6IlaYy qkc="), }, }, - shouldCache: false, + shouldCache: true, }, { RecursionAvailable: true, @@ -196,7 +198,7 @@ func TestCache(t *testing.T) { state := request.Request{W: &test.ResponseWriter{}, Req: m} mt, _ := response.Typify(m, utc) - valid, k := key(state.Name(), m, mt, state.Do()) + valid, k := key(state.Name(), m, mt) if valid { crr.set(m, k, mt, c.pttl) @@ -211,14 +213,16 @@ func TestCache(t *testing.T) { } if ok { - resp := i.toMsg(m, time.Now().UTC()) + resp := i.toMsg(m, time.Now().UTC(), state.Do()) if err := test.Header(tc.Case, resp); err != nil { + t.Logf("Bla %v", resp) t.Error(err) continue } if err := test.Section(tc.Case, test.Answer, resp.Answer); err != nil { + t.Logf("Bla %v -- %v", test.Answer, resp.Answer) t.Error(err) } if err := test.Section(tc.Case, test.Ns, resp.Ns); err != nil { |