From 1c0ce63da125f28c52ca670f151fbd9ceffe2db3 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Tue, 3 Apr 2018 11:30:15 +0200
Subject: [PATCH] mail/rspamd: add map's tp phishing and helptext (#637)

* Update settings.xml

* Update RSpamd.xml

* Update settings.xml

* Update RSpamd.xml

* Update phishing.conf

* Update phishing.conf

* Update settings.xml

* Update RSpamd.xml

* Update phishing.conf

* Update phishing.conf
---
 .../OPNsense/Rspamd/forms/settings.xml            | 15 +++++++++++++++
 .../mvc/app/models/OPNsense/Rspamd/RSpamd.xml     |  8 ++++++++
 .../templates/OPNsense/Rspamd/phishing.conf       |  4 ++++
 3 files changed, 27 insertions(+)

diff --git a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
index eb692e877..44744714d 100644
--- a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
@@ -147,16 +147,31 @@
                 <id>rspamd.phishing.openphish_enabled</id>
                 <label>Enable Openphish</label>
                 <type>checkbox</type>
+                <help>Openphish is a service where phishing URLs get collected and asked by rspamd.</help>
+            </field>
+            <field>
+                <id>rspamd.phishing.openphish_map</id>
+                <label>Openphish Map</label>
+                <type>text</type>
+                <help>Set the URL of the Openphish map file.</help>
             </field>
             <field>
                 <id>rspamd.phishing.openphish_premium_enabled</id>
                 <label>Enable Openphish Premium</label>
                 <type>checkbox</type>
+                <help>Openphish Premium offers more services, please only activate if you have a current license.</help>
             </field>
             <field>
                 <id>rspamd.phishing.phishtank_enabled</id>
                 <label>Enable Phishtank</label>
                 <type>checkbox</type>
+                <help>Enable Phishtank collaborative clearing house for data and information about phishing on the Internet.</help>
+            </field>
+            <field>
+                <id>rspamd.phishing.phishtank_map</id>
+                <label>Phishtank Map URL</label>
+                <type>text</type>
+                <help>Give a URL where to retrieve the Phishtank feed.</help>
             </field>
         </subtab>
         <subtab id="rspamd-anti-spam-rate-limit" description="Rate Limit">
diff --git a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
index 88ef6d225..f26b91dcd 100644
--- a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
@@ -126,6 +126,10 @@
         <default>0</default>
         <Required>Y</Required>
       </openphish_enabled>
+      <openphish_map type="TextField">
+        <default></default>
+        <Required>N</Required>
+      </openphish_map>
       <openphish_premium_enabled type="BooleanField">
         <default>0</default>
         <Required>Y</Required>
@@ -134,6 +138,10 @@
         <default>0</default>
         <Required>Y</Required>
       </phishtank_enabled>
+      <phishtank_map type="TextField">
+        <default></default>
+        <Required>N</Required>
+      </phishtank_map>
     </phishing>
 
     <rate_limit>
diff --git a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf
index e40fe63fa..f7be9383f 100644
--- a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf
+++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf
@@ -3,7 +3,11 @@
 #
 {% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.phishing') %}
     openphish_enabled = {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_enabled') and OPNsense.Rspamd.phishing.openphish_enabled == '1' %}true{% else %}false{% endif %};
+    {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_map') and OPNsense.Rspamd.phishing.openphish_map != '' %}openphish_map = "{{ OPNsense.Rspamd.phishing.openphish_map }}";{% endif %}
+    
     openphish_premium = {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_premium_enabled') and OPNsense.Rspamd.phishing.openphish_premium_enabled == '1' %}true{% else %}false{% endif %};
     # Disabled by default
     phishtank_enabled = {% if helpers.exists('OPNsense.Rspamd.phishing.phishtank_enabled') and OPNsense.Rspamd.phishing.phishtank_enabled == '1' %}true{% else %}false{% endif %};
+    {% if helpers.exists('OPNsense.Rspamd.phishing.phishtank_map') and OPNsense.Rspamd.phishing.phishtank_map != '' %}phishtank_map = "{{ OPNsense.Rspamd.phishing.phishtank_map }}";{% endif %}
+    
 {% endif %}