From 0d7af23658762361038e676ac0ce7569c8a7625a Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Wed, 16 Nov 2016 16:28:25 +0100
Subject: [PATCH] Support de la whitelist pour le domaine local
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On peut activer la whitelist automatique pour le domaine local
ce qui fait ques les mails qui ont un "from" dans le domaine local
ne sont pas filtrés et sont automatiquement accpetés
---
 dicos/22_rspamd.xml       | 11 ++++++++++-
 tmpl/domain_whitelist.map |  4 ++++
 tmpl/multimap.conf        |  9 +++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tmpl/domain_whitelist.map
 create mode 100644 tmpl/multimap.conf

diff --git a/dicos/22_rspamd.xml b/dicos/22_rspamd.xml
index a950635..2f3a56d 100644
--- a/dicos/22_rspamd.xml
+++ b/dicos/22_rspamd.xml
@@ -7,6 +7,8 @@
         <container name='mail' id='13'>
             <package>eole-rspamd-pkg</package>
             <service servicelist='rspamd'>rspamd</service>
+			<file filelist='whitelist' name="/etc/rspamd/local.d/multimap.conf" rm='True'/>
+			<file filelist='whitelist' name="/etc/rspamd/map/domain_whitelist.map" rm='True'/>
         </container>
     </containers>
     <variables>
@@ -19,13 +21,20 @@
 			<variable name='rs_spam_box' type='string' description='Nom de la boite de réception des Pourriels'>
 				<value>Pourriel</value>
 			</variable>
+			<variable name='activer_whitelist_domaine' type='oui/non' description='Voulez-vous filtrer les mails qui proviennent des domaines locaux ?'>
+				<value>non</value>
+			</variable>
 		</family>
     </variables>
     <constraints>
 		<condition name='disabled_if_in' source='activer_rspamd'>
             <param>non</param>
             <target type='servicelist'>rspamd</target>
-			<target type='variable'>rs_spam_box</target>
+			<target type='family'>antispam</target>
+        </condition>
+		<condition name='disabled_if_in' source='activer_whitelist_domaine'>
+            <param>non</param>
+			<target type='filelist'>whitelist</target>
         </condition>
     </constraints>
     <help>
diff --git a/tmpl/domain_whitelist.map b/tmpl/domain_whitelist.map
new file mode 100644
index 0000000..9351acc
--- /dev/null
+++ b/tmpl/domain_whitelist.map
@@ -0,0 +1,4 @@
+%if %%activer_whitelist_domaine == 'oui'
+%%domaine_messagerie_etab
+i-%%domaine_messagerie_etab
+%end if
diff --git a/tmpl/multimap.conf b/tmpl/multimap.conf
new file mode 100644
index 0000000..9c253ee
--- /dev/null
+++ b/tmpl/multimap.conf
@@ -0,0 +1,9 @@
+%if %%activer_whitelist_domaine == 'oui'
+sender_from_domain_whitelist {
+            type = "from";
+            filter = "email:domain";
+            map = "file:///etc/rspamd/map/domain_whitelist.map";
+            symbol = "SENDER_FROM_DOMAIN_WHITELIST";
+            action = "accept"; # Prefilter mode
+}
+%end if