TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Enable dnstap plugin to insert other plugin's specific data into extra field of tap.Dnstap message (#1101)

Browse source 
* Add custom data into dnstap context

* Fix error and fix UT compile errors

* Add UTs

* Change as per review comments.  Use boolean to indicate which Dnstap message to send out

* Merge with master and fix lint warning

* Remove newline

* Fix review comments
This commit is contained in:
Thong Huynh 2017-09-29 13:38:01 -07:00 • committed by John Belamaric
parent 4b3a430ff2
commit 2f9c42d82e
3 changed files with 99 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugin/dnstap/handler.go
View file

@ -36,6 +36,14 @@ type (
}
)
// ContextKey defines the type of key that is used to save data into the context
type ContextKey string
const (
// DnstapSendOption specifies the Dnstap message to be send. Default is sent all.
DnstapSendOption ContextKey = "dnstap-send-option"
)
// TapperFromContext will return a Tapper if the dnstap plugin is enabled.
func TapperFromContext(ctx context.Context) (t Tapper) {
t, _ = ctx.(Tapper)
@ -64,10 +72,16 @@ func (h Dnstap) TapBuilder() msg.Builder {
// ServeDNS logs the client query and response to dnstap and passes the dnstap Context.
func (h Dnstap) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
rw := &taprw.ResponseWriter{ResponseWriter: w, Tapper: &h, Query: r}
// Add send option into context so other plugin can decide on which DNSTap
// message to be sent out
sendOption := taprw.SendOption{Cq: true, Cr: true}
newCtx := context.WithValue(ctx, DnstapSendOption, &sendOption)
rw := &taprw.ResponseWriter{ResponseWriter: w, Tapper: &h, Query: r, Send: &sendOption}
rw.QueryEpoch()
code, err := plugin.NextOrFailure(h.Name(), h.Next, tapContext{ctx, h}, rw, r)
code, err := plugin.NextOrFailure(h.Name(), h.Next, tapContext{newCtx, h}, rw, r)
if err != nil {
// ignore dnstap errors
return code, err