diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/cache/cache.go | 8 | ||||
| -rw-r--r-- | plugin/cache/dnssec.go | 3 | ||||
| -rw-r--r-- | plugin/cache/handler.go | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/plugin/cache/cache.go b/plugin/cache/cache.go index f5edc001b..8dae9a42b 100644 --- a/plugin/cache/cache.go +++ b/plugin/cache/cache.go @@ -104,6 +104,7 @@ type ResponseWriter struct { state request.Request server string // Server handling the request. + do bool // When true the original request had the DO bit set. prefetch bool // When true write nothing back to the client. remoteAddr net.Addr } @@ -176,13 +177,12 @@ func (w *ResponseWriter) WriteMsg(res *dns.Msg) error { return nil } - do := w.state.Do() // Apply capped TTL to this reply to avoid jarring TTL experience 1799 -> 8 (e.g.) // We also may need to filter out DNSSEC records, see toMsg() for similar code. ttl := uint32(duration.Seconds()) - resc.Answer = filterRRSlice(resc.Answer, ttl, do, false) - resc.Ns = filterRRSlice(resc.Ns, ttl, do, false) - resc.Extra = filterRRSlice(resc.Extra, ttl, do, false) + resc.Answer = filterRRSlice(resc.Answer, ttl, w.do, false) + resc.Ns = filterRRSlice(resc.Ns, ttl, w.do, false) + resc.Extra = filterRRSlice(resc.Extra, ttl, w.do, false) return w.ResponseWriter.WriteMsg(resc) } diff --git a/plugin/cache/dnssec.go b/plugin/cache/dnssec.go index 72520e345..7f880db75 100644 --- a/plugin/cache/dnssec.go +++ b/plugin/cache/dnssec.go @@ -31,6 +31,9 @@ func filterRRSlice(rrs []dns.RR, ttl uint32, do, dup bool) []dns.RR { if !do && isDNSSEC(r) { continue } + if r.Header().Rrtype == dns.TypeOPT { + continue + } r.Header().Ttl = ttl if dup { rs[j] = dns.Copy(r) diff --git a/plugin/cache/handler.go b/plugin/cache/handler.go index f079e6c51..987dd61b2 100644 --- a/plugin/cache/handler.go +++ b/plugin/cache/handler.go @@ -41,7 +41,7 @@ func (c *Cache) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) if !do { setDo(r) } - crr := &ResponseWriter{ResponseWriter: w, Cache: c, state: state, server: server} + crr := &ResponseWriter{ResponseWriter: w, Cache: c, state: state, server: server, do: do} return plugin.NextOrFailure(c.Name(), c.Next, ctx, crr, r) } if ttl < 0 { @@ -53,7 +53,7 @@ func (c *Cache) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) if !do { setDo(r) } - crr := &ResponseWriter{Cache: c, state: state, server: server, prefetch: true, remoteAddr: w.LocalAddr()} + crr := &ResponseWriter{Cache: c, state: state, server: server, prefetch: true, remoteAddr: w.LocalAddr(), do: do} plugin.NextOrFailure(c.Name(), c.Next, ctx, crr, r) }() } |