From 1a06985c08d2e8ef55d91851b6b75cc64b5b5eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Kellerer?= <juergen@k123.eu>
Date: Sat, 4 Apr 2020 21:44:53 +0200
Subject: [PATCH] Applied USER_WHITELIST config syntax change

Fixes the whitelist config feature in maltrail sensor.
USER_WHITELIST was changed from comma separated list to whitelist file in recent maltrail versions.
---
 .../opnsense/service/templates/OPNsense/Maltrail/+TARGETS | 1 +
 .../service/templates/OPNsense/Maltrail/maltrail.conf     | 2 +-
 .../templates/OPNsense/Maltrail/user_whitelist.txt        | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/user_whitelist.txt

diff --git a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/+TARGETS b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/+TARGETS
index 66a7ec29d..41dd65eb1 100644
--- a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/+TARGETS
+++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/+TARGETS
@@ -1,3 +1,4 @@
 maltrailsensor:/etc/rc.conf.d/opnsense-maltrailsensor
 maltrailserver:/etc/rc.conf.d/opnsense-maltrailserver
 maltrail.conf:/usr/local/share/maltrail/maltrail.conf
+user_whitelist.txt:/usr/local/share/maltrail/misc/user_whitelist.txt
diff --git a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
index 21f6c96b5..29cbe74f0 100644
--- a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
+++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
@@ -39,7 +39,7 @@ USE_HEURISTICS false
 {% endif %}
 CHECK_MISSING_HOST false
 {% if helpers.exists('OPNsense.maltrail.general.whitelist') and OPNsense.maltrail.general.whitelist != '' %}
-USER_WHITELIST {{ OPNsense.maltrail.general.whitelist }}
+USER_WHITELIST /usr/local/share/maltrail/misc/user_whitelist.txt
 {% endif %}
 CHECK_HOST_DOMAINS false
 SHOW_DEBUG false
diff --git a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/user_whitelist.txt b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/user_whitelist.txt
new file mode 100644
index 000000000..9e8200773
--- /dev/null
+++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/user_whitelist.txt
@@ -0,0 +1,8 @@
+#
+# Autogenerated user whitelist (find list-format in "misc/whitelist.txt")
+#
+{% if helpers.exists('OPNsense.maltrail.general.whitelist') and OPNsense.maltrail.general.whitelist != '' %}
+{%   for item in OPNsense.maltrail.general.whitelist.split(',') %}
+{{     item|trim }}
+{%   endfor %}
+{% endif %}