Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix NSID not being set on cached responses (#3822)

Browse Source 
* Add NSID to the cached responses

Signed-off-by: Erfan Besharat <erbesharat@gmail.com>

* Add test for NSID being set on cached responses

Signed-off-by: Erfan Besharat <erbesharat@gmail.com>
This commit is contained in:
Erfan Besharat
2020-04-27 20:19:56 +04:30
committed by GitHub
parent 758f82631c
commit dcdbec53e4
2 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugin/nsid/nsid.go
View File

@@ -19,7 +19,8 @@ type Nsid struct {
// ResponseWriter is a response writer that adds NSID response
type ResponseWriter struct {
dns.ResponseWriter
Data string
Data string
request *dns.Msg
}
// ServeDNS implements the plugin.Handler interface.
@@ -27,7 +28,7 @@ func (n Nsid) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
if option := r.IsEdns0(); option != nil {
for _, o := range option.Option {
if _, ok := o.(*dns.EDNS0_NSID); ok {
nw := &ResponseWriter{ResponseWriter: w, Data: n.Data}
nw := &ResponseWriter{ResponseWriter: w, Data: n.Data, request: r}
return plugin.NextOrFailure(n.Name(), n.Next, ctx, nw, r)
}
}
@@ -37,16 +38,31 @@ func (n Nsid) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
// WriteMsg implements the dns.ResponseWriter interface.
func (w *ResponseWriter) WriteMsg(res *dns.Msg) error {
if w.request.IsEdns0() != nil && res.IsEdns0() == nil {
res.SetEdns0(w.request.IsEdns0().UDPSize(), true)
}
if option := res.IsEdns0(); option != nil {
var exists bool
for _, o := range option.Option {
if e, ok := o.(*dns.EDNS0_NSID); ok {
e.Code = dns.EDNS0NSID
e.Nsid = hex.EncodeToString([]byte(w.Data))
exists = true
}
}
// Append the NSID if it doesn't exist in EDNS0 options
if !exists {
option.Option = append(option.Option, &dns.EDNS0_NSID{
Code: dns.EDNS0NSID,
Nsid: hex.EncodeToString([]byte(w.Data)),
})
}
}
returned := w.ResponseWriter.WriteMsg(res)
return returned
return w.ResponseWriter.WriteMsg(res)
}
// Name implements the Handler interface.