Ajout de la possibilité de créer des rêgles de filtrage

En mode expert il est maintenant possible de créer des rêgles
de filtarge supplémentaires pour rspamd. Les rêgles sont de
type "regexp" et suivent la documentation de rspamd.

https://rspamd.com/doc/tutorials/writing_rules.html

Creole génère un fichier de configuration supplémentaire :
/etc/rspamd/rspamd.local.lua

Makefile

@@ -5,7 +5,7 @@
 SOURCE=eole-rspamd
 VERSION=0.1
 EOLE_VERSION=2.6
-EOLE_RELEASE=2.6.0
+EOLE_RELEASE=2.6.1
 PKGAPPS=non
 
 ################################

README.md

@@ -1,6 +1,7 @@
 # Installation :
 
 
+
 ## Ajouter les dépôts rspamd:
 
 ``` bash

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,28 +0,0 @@
-Source: eole-rspamd
-Section: admin
-Priority: optional
-Maintainer: Cadoles <contact@cadoles.com>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.3
-Homepage: https://forge.cadoles.com/Cadoles/eole-rspamd
-Vcs-Git: https://forge.cadoles.com/Cadoles/eole-rspamd.git
-Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-rspamd
-
-Package: eole-rspamd
-Architecture: all
-Depends: ${misc:Depends}, eole-dovecot
-Description: Templates et dictionnaires pour rspamd
- Configuration rspamd pour EOLE.
- .
- Pour toute information complémentaire, veuillez vous rendre sur le
- site du projet EOLE.
-
-Package: eole-rspamd-pkg
-Section: metapackages
-Architecture: all
-Depends: ${misc:Depends}, rspamd
-Description: Meta paquet pour rspamd
- dependency package for eole-rspamd.
- .
- Pour toute information complémentaire, veuillez vous rendre sur le
- site du projet EOLE.

debian/copyright

@@ -1,37 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: eole-dovecot
-Source: http://dev-eole.ac-dijon.fr/projects/eole-dovecot
-
-Files: *
-Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
-License: CeCILL-2
-
-License: CeCILL-2
- This software is governed by the CeCILL-2 license under French law and
- abiding by the rules of distribution of free software.  You can  use,
- modify and or redistribute the software under the terms of the CeCILL-2
- license as circulated by CEA, CNRS and INRIA at the following URL
- "http://www.cecill.info";.
- .
- As a counterpart to the access to the source code and  rights to copy,
- modify and redistribute granted by the license, users are provided only
- with a limited warranty  and the software's author,  the holder of the
- economic rights,  and the successive licensors  have only  limited
- liability.
- .
- In this respect, the user's attention is drawn to the risks associated
- with loading,  using,  modifying and/or developing or reproducing the
- software by the user in light of its specific status of free software,
- that may mean  that it is complicated to manipulate,  and  that  also
- therefore means  that it is reserved for developers  and  experienced
- professionals having in-depth computer knowledge. Users are therefore
- encouraged to load and test the software's suitability as regards their
- requirements in conditions enabling the security of their systems and/or
- data to be ensured and,  more generally, to use and operate it in the
- same conditions as regards security.
- .
- The fact that you are presently reading this means that you have had
- knowledge of the CeCILL-2 license and that you accept its terms.
- .
- On Eole systems, the complete text of the CeCILL-2 License can be found
- in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-rspamd.install

@@ -1 +0,0 @@
-usr/share/eole

debian/gbp.conf

@@ -1,3 +0,0 @@
-# Set per distribution debian tag
-[DEFAULT]
-debian-tag = debian/eole/2.4/%(version)s

debian/rules

@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-%:
-	dh $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

dicos/22_rspamd.xml

@@ -24,6 +24,14 @@
 			<variable name='activer_whitelist_domaine' type='oui/non' description='Voulez-vous filtrer les mails qui proviennent des domaines locaux ?'>
 				<value>non</value>
 			</variable>
+			<variable name='enable_rules' type='oui/non' description='Voulez-vous ajouter des rêgles de filtrage supplémentaires (regexp) ?' mode='expert'>
+				<value>non</value>
+			</variable>
+			<variable name='rspamd_regexp_rule' type='string' description='Nom de la règle de filtrage' mode='expert' multi='True'/>
+			<variable name='rs_rule_desc' type='string' description='Déscription de la rêgle' mode='expert'/>
+			<variable name='rs_rule_regexp' type='string' description='Expression régulière de recherche' mode='expert'/>
+			<variable name='rs_rule_symbol' type='string' description='Marqeur à ajouter aux entêtes' mode='expert'/>
+			<variable name='rs_rule_score' type='string' description='Score à ajouter aux X-SPAM-SCORE' mode='expert'/>
 		</family>
     </variables>
     <constraints>
@@ -36,6 +44,20 @@
             <param>non</param>
 			<target type='filelist'>whitelist</target>
         </condition>
+		<condition name='disabled_if_in' source='enable_rules'>
+            <param>non</param>
+			<target type='variable'>rspamd_regexp_rule</target>
+			<target type='variable'>rs_rule_desc</target>
+			<target type='variable'>rs_rule_regexp</target>
+			<target type='variable'>rs_rule_symbol</target>
+			<target type='variable'>rs_rule_score</target>
+        </condition>
+		<group master='rspamd_regexp_rule'>
+			<slave>rs_rule_desc</slave>
+			<slave>rs_rule_regexp</slave>
+			<slave>rs_rule_symbol</slave>
+			<slave>rs_rule_score</slave>
+		</group>
     </constraints>
     <help>
         <variable name='activer_rspamd'>rspamd est un filtre antispam rapide qui supporte l'apprentissage par déclaration des utilisateurs via le déplacement dans la boite 'spam'</variable>

tmpl/rspamd.local.lua

@@ -0,0 +1,11 @@
+%if %%getVar('enable_rules','non') == 'oui'
+   %for %%rule in %%rspamd_regexp_rule
+config['regexp']['%%rule.rs_rule_symbol'] = {
+	re = '%%rule.rs_rule_regexp',
+	score = %%rule.rs_rule_score,
+	description = '%%rule.rs_rule_desc',
+	group = 'Eole Rules'
+
+}
+   %end for
+%end if