From 5cbc2e2664a21b2071be2189bdb0158f12cd250a Mon Sep 17 00:00:00 2001
From: ryan <33b5e5@users.noreply.github.com>
Date: Thu, 21 Oct 2021 06:53:22 -0700
Subject: [PATCH] Add option to enable/disable local query logs (#2385)

---
 dns/dnscrypt-proxy/pkg-descr                               | 4 ++++
 .../controllers/OPNsense/Dnscryptproxy/forms/general.xml   | 7 +++++++
 .../mvc/app/models/OPNsense/Dnscryptproxy/General.xml      | 6 +++++-
 .../templates/OPNsense/Dnscryptproxy/dnscrypt-proxy.toml   | 2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dns/dnscrypt-proxy/pkg-descr b/dns/dnscrypt-proxy/pkg-descr
index aad8c9492..4d379c601 100644
--- a/dns/dnscrypt-proxy/pkg-descr
+++ b/dns/dnscrypt-proxy/pkg-descr
@@ -5,6 +5,10 @@ such as DNSCrypt v2 and DNS-over-HTTPS.
 Plugin Changelog
 ================
 
+1.10 
+
+* Add option to enable/disable local query logs
+
 1.9
 
 * Fix logging due to Phalcon4 update
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/forms/general.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/forms/general.xml
index cda8bf070..d9e01d545 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/forms/general.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/forms/general.xml
@@ -165,4 +165,11 @@
         <allownew>true</allownew>
         <help><![CDATA[Set a list of <a href="https://dnscrypt.info/public-servers">known servers</a> e.g. if you want to stick with Cisco only. You can also put your manually added servers here. Please use on your own risk.]]></help>
     </field>
+    </field>
+        <field>
+        <id>general.query_logs</id>
+        <label>Enable query logs</label>
+        <type>checkbox</type>
+        <help>This will enable/disable local logs. This includes both [query_log] and [nx_log] as described in the DNSCrypt-Proxy documentation.</help>
+    </field>
 </form>
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
index 806459a5b..e3f51b353 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/dnscryptproxy/general</mount>
     <description>dnscrypt-proxy configuration</description>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -136,5 +136,9 @@
         <serverlist type="CSVListField">
             <Required>N</Required>
         </serverlist>
+        <query_logs type="BooleanField">
+            <default>1</default>
+            <Required>Y</Required>
+        </query_logs>
     </items>
 </model>
diff --git a/dns/dnscrypt-proxy/src/opnsense/service/templates/OPNsense/Dnscryptproxy/dnscrypt-proxy.toml b/dns/dnscrypt-proxy/src/opnsense/service/templates/OPNsense/Dnscryptproxy/dnscrypt-proxy.toml
index dcade82df..48b0f609c 100644
--- a/dns/dnscrypt-proxy/src/opnsense/service/templates/OPNsense/Dnscryptproxy/dnscrypt-proxy.toml
+++ b/dns/dnscrypt-proxy/src/opnsense/service/templates/OPNsense/Dnscryptproxy/dnscrypt-proxy.toml
@@ -118,6 +118,7 @@ cache_neg_max_ttl = {{ OPNsense.dnscryptproxy.general.cache_neg_max_ttl }}
 cache = false
 {%   endif %}
 
+{%   if helpers.exists('OPNsense.dnscryptproxy.general.query_logs') and OPNsense.dnscryptproxy.general.query_logs == '1' %}
 [query_log]
   file = '/var/log/dnscrypt-proxy/query.log'
   format = 'tsv'
@@ -125,6 +126,7 @@ cache = false
 [nx_log]
   file = '/var/log/dnscrypt-proxy/nx.log'
   format = 'tsv'
+{%   endif %}
 
 [allowed_names]
   allowed_names_file = 'whitelist.txt'