Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

data/conf/rspamd/local.d/composites.conf

@@ -34,3 +34,6 @@ FORGED_W_BAD_POLICY {
   expression = "( ~g+:policies | ~R_SPF_NA) & ( ~FROM_NEQ_ENVFROM & ~FORGED_SENDER )"
   score = 3.0;
 }
+RBL_EXCLUDE_FWD_HOST {
+  expression = "-WHITELISTED_FWD_HOST & ^g:rbl"
+}

data/conf/rspamd/local.d/mime_types.conf

@@ -1,21 +1,21 @@
 # Extensions that are treated as 'bad'
 # Number is score multiply factor
 bad_extensions = {
-  scr = 4,
-  lnk = 4,
-  exe = 1,
+  scr = 20,
+  lnk = 20,
+  exe = 20,
   msi = 1,
   msp = 1,
   msu = 1,
   jar = 2,
-  com = 4,
+  com = 20,
   bat = 4,
   cmd = 4,
   ps1 = 4,
   ace = 4,
   arj = 4,
   cab = 3,
-  vbs = 4,
+  vbs = 20,
   hta = 4,
   shs = 4,
   wsc = 4,
@@ -30,7 +30,8 @@ bad_archive_extensions = {
   pdf = 1.0,
   jar = 3,
   js = 0.5,
-  vbs = 7,
+  vbs = 20,
+  exe = 20
 };
 
 # Used to detect another archive in archive

data/conf/rspamd/local.d/rbl_group.conf

@@ -45,4 +45,8 @@ symbols = {
     score = 2.0;  
     description = "List of networks hijacked from their original owners, some of which have already used for spamming.";  
   }
+  "RECEIVED_SPAMHAUS_XBL" {
+    weight = 0.0;
+    description = "Received address is listed in ZEN XBL";
+  }
 }

data/web/inc/presets/rspamd/preset_2.yml

@@ -2,4 +2,9 @@ headline: lang.rsettings_preset_2
 content: |
   priority = 10;
   rcpt = "/postmaster@.*/";
-  want_spam = yes;
+  apply {
+    symbols_enabled = ["DKIM_SIGNED", "HISTORY_SAVE", "MILTER_HEADERS", "ARC_SIGNED"];
+  actions {
+      greylist = null;
+    }
+  }