Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2026-08-20 23:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/cache: preserve AD when storing cache entries (#8438)

Browse Source
This commit is contained in:
Sueun Cho
2026-08-15 12:28:20 +09:00
committed by GitHub
parent ab7a8880a4
commit 29ef323f82
3 changed files with 141 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/cache/handler.go vendored
View File

@@ -36,9 +36,10 @@ func (c *Cache) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
i := c.getIfNotStale(now, state, server)
if i == nil {
crr := &ResponseWriter{ResponseWriter: w, Cache: c, state: state, server: server, do: do, ad: ad, cd: cd,
refreshState := authenticatedRefreshState(state)
crr := &ResponseWriter{ResponseWriter: w, Cache: c, state: refreshState, server: server, do: do, ad: ad, cd: cd,
nexcept: c.nexcept, pexcept: c.pexcept, wildcardFunc: wildcardFunc(ctx)}
return c.doRefresh(ctx, state, crr)
return c.doRefresh(ctx, refreshState, crr)
}
ttl := i.ttl(now)
stale := ttl <= 0
@@ -49,7 +50,8 @@ func (c *Cache) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
nowFunc := c.now
trackRefresh := failureRecheck > 0
if !trackRefresh || i.beginRefresh(now, failureRecheck) {
crr := &ResponseWriter{ResponseWriter: w, Cache: c, state: state, server: server, do: do, cd: cd}
refreshState := authenticatedRefreshState(state)
crr := &ResponseWriter{ResponseWriter: w, Cache: c, state: refreshState, server: server, do: do, ad: ad, cd: cd}
if c.verifyStaleTimeout > 0 {
// Background verify: cache the response but do not write to the wire.
// On timeout, we serve the stale entry below and let the goroutine continue.
@@ -57,14 +59,14 @@ func (c *Cache) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
}
cw := newVerifyStaleResponseWriter(crr)
if c.verifyStaleTimeout == 0 {
ret, err := c.doRefresh(ctx, state, cw)
ret, err := c.doRefresh(ctx, refreshState, cw)
if trackRefresh {
i.endRefresh(nowFunc(), failureRecheck, cw.refreshed)
}
if cw.refreshed {
return ret, err
}
} else if served, ret, err := c.verifyWithTimeout(ctx, state, w, cw, r, do, ad, i, failureRecheck, nowFunc); served {
} else if served, ret, err := c.verifyWithTimeout(ctx, refreshState, w, cw, r, do, ad, i, failureRecheck, nowFunc); served {
return ret, err
}
}
@@ -220,6 +222,12 @@ func (c *Cache) shouldPrefetch(i *item, now time.Time) bool {
return i.Hits() >= c.prefetch && i.ttl(now) <= threshold
}
func authenticatedRefreshState(state request.Request) request.Request {
state.Req = state.Req.Copy()
state.Req.AuthenticatedData = true
return state
}
// Name implements the Handler interface.
func (c *Cache) Name() string { return "cache" }