From 0335ae7578e202f9f5a79cf39292089dd3b332bb Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 4 Feb 2019 18:36:43 +0100
Subject: [PATCH] dns/dnscrypt-proxy: add logging to UI (#1131)

---
 dns/dnscrypt-proxy/Makefile                   |  2 +-
 dns/dnscrypt-proxy/pkg-descr                  | 17 +++++++++++++++++
 .../OPNsense/Dnscryptproxy/Menu/Menu.xml      |  7 ++++++-
 .../src/www/diag_logs_dnscrypt.php            | 19 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php

diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index 228c89630..e7a60c446 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		dnscrypt-proxy
-PLUGIN_VERSION=		1.1
+PLUGIN_VERSION=		1.2
 PLUGIN_COMMENT=		Flexible DNS proxy supporting DNSCrypt and DoH
 PLUGIN_DEPENDS=		dnscrypt-proxy2
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/dnscrypt-proxy/pkg-descr b/dns/dnscrypt-proxy/pkg-descr
index e5c1bc90d..0ecd2919a 100644
--- a/dns/dnscrypt-proxy/pkg-descr
+++ b/dns/dnscrypt-proxy/pkg-descr
@@ -1,4 +1,21 @@
 A flexible DNS proxy, with support for modern encrypted DNS protocols
 such as DNSCrypt v2 and DNS-over-HTTPS.
 
+
+Plugin Changelog
+================
+
+1.2
+
+* Add logging to menu
+
+1.1
+
+* Allow manual server addition and selection
+
+1.0
+
+* Initial release
+
+
 WWW: https://github.com/jedisct1/dnscrypt-proxy
diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
index 345c11266..0ab98a781 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
@@ -1,5 +1,10 @@
 <menu>
     <Services>
-        <DNSCrypt-Proxy cssClass="fa fa-lock fa-fw" url="/ui/dnscryptproxy/general/index" />
+        <DNSCrypt-Proxy cssClass="fa fa-lock fa-fw">
+            <Configuration url="/ui/dnscryptproxy/general/index" order="10"/>
+            <Log VisibleName="Log File" url="/diag_logs_dnscrypt.php?type=dnscrypt-proxy" order="20">
+                <More url="/diag_logs_dnscrypt.php*" visibility="hidden"/>
+            </Log>
+        </DNSCrypt-Proxy>
     </Services>
 </menu>
diff --git a/dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php b/dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php
new file mode 100644
index 000000000..9128d9964
--- /dev/null
+++ b/dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php
@@ -0,0 +1,19 @@
+<?php
+
+$type = 'dnscrypt-proxy';
+if (isset($_GET['type']) && ($_GET['type'] === 'dnscrypt-proxy' || $_GET['type'] === 'query' || $_GET['type'] === 'nx')) {
+    $type = $_GET['type'];
+}
+
+$logfile = "/var/log/dnscrypt-proxy/{$type}.log";
+$logclog = false;
+$logsplit = 2;
+
+$logpills = array();
+$logpills[] = array(gettext('General'), true, '/diag_logs_dnscrypt.php?type=dnscrypt-proxy');
+$logpills[] = array(gettext('Queries'), false, '/diag_logs_dnscrypt.php?type=query');
+$logpills[] = array(gettext('NX'), false, '/diag_logs_dnscrypt.php?type=nx');
+
+$service_hook = 'dnscrypt-proxy';
+
+require_once 'diag_logs_template.inc';