From 89fe16b3f2d805a7083f14dad724acb1bc817065 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 12 Aug 2019 08:28:39 +0200
Subject: [PATCH] security/maltrail: add whitelist support (#1447)

---
 security/maltrail/pkg-descr                               | 1 +
 .../app/controllers/OPNsense/Maltrail/forms/general.xml   | 8 ++++++++
 .../opnsense/mvc/app/models/OPNsense/Maltrail/General.xml | 3 +++
 .../service/templates/OPNsense/Maltrail/maltrail.conf     | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/security/maltrail/pkg-descr b/security/maltrail/pkg-descr
index 2d478fa23..2c9162e54 100644
--- a/security/maltrail/pkg-descr
+++ b/security/maltrail/pkg-descr
@@ -14,6 +14,7 @@ Changelog
 1.1
 
 * Add a note in General tab
+* Add whitelisting support
 
 1.0
 
diff --git a/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml b/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml
index 01c848c11..93f644561 100644
--- a/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml
+++ b/security/maltrail/src/opnsense/mvc/app/controllers/OPNsense/Maltrail/forms/general.xml
@@ -23,4 +23,12 @@
         <type>select_multiple</type>
         <help>List of interface to listen on, none means listen on all interfaces.</help>
     </field>
+    <field>
+        <id>general.whitelist</id>
+        <label>Whitelist</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <help>Here you can whitelist IP addresses or domains.</help>
+    </field>
 </form>
diff --git a/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml b/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml
index d094d2500..4fbcc3cca 100644
--- a/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml
+++ b/security/maltrail/src/opnsense/mvc/app/models/OPNsense/Maltrail/General.xml
@@ -19,5 +19,8 @@
             <multiple>Y</multiple>
             <Required>N</Required>
         </monitorinterface>
+        <whitelist type="CSVListField">
+            <Required>N</Required>
+        </whitelist>
     </items>
 </model>
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 02e11b9f6..e4e7308e7 100644
--- a/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
+++ b/security/maltrail/src/opnsense/service/templates/OPNsense/Maltrail/maltrail.conf
@@ -38,6 +38,9 @@ USE_HEURISTICS true
 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 }}
+{% endif %}
 CHECK_HOST_DOMAINS false
 SHOW_DEBUG false
 LOG_DIR /var/log/maltrail