From b6e6a19b50f3c1cfa1e8247259bfef48a933d24f Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 4 Jun 2018 20:52:16 +0200
Subject: [PATCH] Make logging plugins independent from query/response plugins

---
 dnscrypt-proxy/plugins.go | 38 +++++++++++++++++++++++++++++++++++---
 dnscrypt-proxy/proxy.go   |  3 ++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/dnscrypt-proxy/plugins.go b/dnscrypt-proxy/plugins.go
index 5c7c892b..1a3b4c9b 100644
--- a/dnscrypt-proxy/plugins.go
+++ b/dnscrypt-proxy/plugins.go
@@ -23,6 +23,7 @@ type PluginsGlobals struct {
 	sync.RWMutex
 	queryPlugins    *[]Plugin
 	responsePlugins *[]Plugin
+	loggingPlugins  *[]Plugin
 }
 
 type PluginsState struct {
@@ -39,13 +40,11 @@ type PluginsState struct {
 	cacheNegMaxTTL         uint32
 	cacheMinTTL            uint32
 	cacheMaxTTL            uint32
+	questionMsg            *dns.Msg
 }
 
 func InitPluginsGlobals(pluginsGlobals *PluginsGlobals, proxy *Proxy) error {
 	queryPlugins := &[]Plugin{}
-	if len(proxy.queryLogFile) != 0 {
-		*queryPlugins = append(*queryPlugins, Plugin(new(PluginQueryLog)))
-	}
 	if len(proxy.whitelistNameFile) != 0 {
 		*queryPlugins = append(*queryPlugins, Plugin(new(PluginWhitelistName)))
 	}
@@ -76,6 +75,12 @@ func InitPluginsGlobals(pluginsGlobals *PluginsGlobals, proxy *Proxy) error {
 	if proxy.cache {
 		*responsePlugins = append(*responsePlugins, Plugin(new(PluginCacheResponse)))
 	}
+
+	loggingPlugins := &[]Plugin{}
+	if len(proxy.queryLogFile) != 0 {
+		*loggingPlugins = append(*loggingPlugins, Plugin(new(PluginQueryLog)))
+	}
+
 	for _, plugin := range *queryPlugins {
 		if err := plugin.Init(proxy); err != nil {
 			return err
@@ -86,9 +91,15 @@ func InitPluginsGlobals(pluginsGlobals *PluginsGlobals, proxy *Proxy) error {
 			return err
 		}
 	}
+	for _, plugin := range *loggingPlugins {
+		if err := plugin.Init(proxy); err != nil {
+			return err
+		}
+	}
 
 	(*pluginsGlobals).queryPlugins = queryPlugins
 	(*pluginsGlobals).responsePlugins = responsePlugins
+	(*pluginsGlobals).loggingPlugins = loggingPlugins
 	return nil
 }
 
@@ -112,6 +123,7 @@ func NewPluginsState(proxy *Proxy, clientProto string, clientAddr *net.Addr) Plu
 		cacheNegMaxTTL: proxy.cacheNegMaxTTL,
 		cacheMinTTL:    proxy.cacheMinTTL,
 		cacheMaxTTL:    proxy.cacheMaxTTL,
+		questionMsg:    nil,
 	}
 }
 
@@ -127,6 +139,7 @@ func (pluginsState *PluginsState) ApplyQueryPlugins(pluginsGlobals *PluginsGloba
 	if len(msg.Question) > 1 {
 		return packet, errors.New("Unexpected number of questions")
 	}
+	pluginsState.questionMsg = &msg
 	pluginsGlobals.RLock()
 	for _, plugin := range *pluginsGlobals.queryPlugins {
 		if ret := plugin.Eval(pluginsState, &msg); ret != nil {
@@ -194,3 +207,22 @@ func (pluginsState *PluginsState) ApplyResponsePlugins(pluginsGlobals *PluginsGl
 	}
 	return packet2, nil
 }
+
+func (pluginsState *PluginsState) ApplyLoggingPlugins(pluginsGlobals *PluginsGlobals) error {
+	if len(*pluginsGlobals.loggingPlugins) == 0 {
+		return nil
+	}
+	questionMsg := pluginsState.questionMsg
+	if questionMsg == nil || len(questionMsg.Question) > 1 {
+		return errors.New("Unexpected number of questions")
+	}
+	pluginsGlobals.RLock()
+	for _, plugin := range *pluginsGlobals.loggingPlugins {
+		if ret := plugin.Eval(pluginsState, questionMsg); ret != nil {
+			pluginsGlobals.RUnlock()
+			return ret
+		}
+	}
+	pluginsGlobals.RUnlock()
+	return nil
+}
diff --git a/dnscrypt-proxy/proxy.go b/dnscrypt-proxy/proxy.go
index 3b19b01b..c0e7e019 100644
--- a/dnscrypt-proxy/proxy.go
+++ b/dnscrypt-proxy/proxy.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/jedisct1/dlog"
-	stamps "github.com/jedisct1/go-dnsstamps"
 	clocksmith "github.com/jedisct1/go-clocksmith"
+	stamps "github.com/jedisct1/go-dnsstamps"
 	"golang.org/x/crypto/curve25519"
 )
 
@@ -260,6 +260,7 @@ func (proxy *Proxy) processIncomingQuery(serverInfo *ServerInfo, clientProto str
 	}
 	pluginsState := NewPluginsState(proxy, clientProto, clientAddr)
 	query, _ = pluginsState.ApplyQueryPlugins(&proxy.pluginsGlobals, query)
+	pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
 	var response []byte
 	var err error
 	if pluginsState.action != PluginsActionForward {