From d248bb660c1285ac56e90f10dd0ae5e272e46f83 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 6 Mar 2020 07:14:06 +0100
Subject: [PATCH] [Rspamd] Reduce Sorbs recent score [Rspamd] Add annoying CSA
 to bulk symbols and score then with 3.2 [Rspamd] Update to 2.4

---
 data/Dockerfiles/rspamd/docker-entrypoint.sh | 3 ++-
 data/conf/rspamd/local.d/groups.conf         | 3 +++
 data/conf/rspamd/local.d/multimap.conf       | 8 ++++++++
 data/conf/rspamd/local.d/rbl_group.conf      | 2 +-
 docker-compose.yml                           | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/data/Dockerfiles/rspamd/docker-entrypoint.sh b/data/Dockerfiles/rspamd/docker-entrypoint.sh
index c0f0ee26..44a4504f 100755
--- a/data/Dockerfiles/rspamd/docker-entrypoint.sh
+++ b/data/Dockerfiles/rspamd/docker-entrypoint.sh
@@ -103,7 +103,8 @@ touch /etc/rspamd/custom/global_mime_from_blacklist.map \
   /etc/rspamd/custom/fishy_tlds.map \
   /etc/rspamd/custom/bad_words.map \
   /etc/rspamd/custom/bad_asn.map \
-  /etc/rspamd/custom/bad_words_de.map
+  /etc/rspamd/custom/bad_words_de.map \
+  /etc/rspamd/custom/bulk_headers.map
 
 # www-data (82) group needs to write to these files
 chown _rspamd:_rspamd /etc/rspamd/custom/
diff --git a/data/conf/rspamd/local.d/groups.conf b/data/conf/rspamd/local.d/groups.conf
index 5d2adbad..7b7e4f72 100644
--- a/data/conf/rspamd/local.d/groups.conf
+++ b/data/conf/rspamd/local.d/groups.conf
@@ -9,6 +9,9 @@ symbols {
   "BAD_REP_POLICIES" {
     score = 2.5;
   }
+  "BULK_HEADERS" {
+    score = 3.2;
+  }
 }
 
 group "MX" {
diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf
index edc6386e..a7df7304 100644
--- a/data/conf/rspamd/local.d/multimap.conf
+++ b/data/conf/rspamd/local.d/multimap.conf
@@ -25,6 +25,14 @@ WHITELISTED_FWD_HOST {
   symbols_set = ["WHITELISTED_FWD_HOST"];
 }
 
+BULK_HEADER {
+  type = "content";
+  map = "$LOCAL_CONFDIR/custom/bulk_header.map";
+  filter = "headers"
+  regexp = true;
+  symbols_set = ["BULK_HEADER"];
+}
+
 LOCAL_BL_ASN {
   require_symbols = "!MAILCOW_WHITE";
   type = "asn";
diff --git a/data/conf/rspamd/local.d/rbl_group.conf b/data/conf/rspamd/local.d/rbl_group.conf
index 21682dcd..b2ec7959 100644
--- a/data/conf/rspamd/local.d/rbl_group.conf
+++ b/data/conf/rspamd/local.d/rbl_group.conf
@@ -26,7 +26,7 @@ symbols = {
     description = "List of Open SMTP relay servers."; 
   } 
   "RBL_SORBS_RECENT" {  
-    score = 3.5;  
+    score = 2.0;  
     description = "List of hosts that have been noted as sending spam/UCE/UBE to the admins of SORBS within the last 28 days (includes new.spam.dnsbl.sorbs.net)."; 
   } 
   "RBL_SORBS_WEB" { 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c5fd33e..bbe7347d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,7 +69,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.61
+      image: mailcow/rspamd:1.62
       stop_grace_period: 30s
       depends_on:
         - nginx-mailcow