From 1157b9b249792dd46bc2617a4f25c7f5e183e07a Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Mon, 8 Feb 2021 16:59:08 -0700
Subject: [PATCH] rpsamd: use x-spam-status
---
install/tpl/rspamd_milter_headers.conf.master | 12 ++++++++++--
server/conf/autoresponder.master | 2 +-
server/conf/sieve_filter.master | 6 +++---
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/install/tpl/rspamd_milter_headers.conf.master b/install/tpl/rspamd_milter_headers.conf.master
index d399bbf4ec..bd90acd634 100644
--- a/install/tpl/rspamd_milter_headers.conf.master
+++ b/install/tpl/rspamd_milter_headers.conf.master
@@ -1,2 +1,10 @@
-use = ["x-spamd-bar", "x-spam-level", "authentication-results"];
-authenticated_headers = ["authentication-results"];
\ No newline at end of file
+use = ["x-spamd-bar", "x-spam-level", "x-spam-status", "authentication-results"];
+authenticated_headers = ["authentication-results"];
+routines {
+ remove-headers {
+ "X-Spam" = 0;
+ "X-Spamd-Bar" = 0;
+ "X-Spam-Level" = 0;
+ "X-Spam-Status" = 0;
+ }
+}
diff --git a/server/conf/autoresponder.master b/server/conf/autoresponder.master
index fc5519a0ac..8a908f8492 100644
--- a/server/conf/autoresponder.master
+++ b/server/conf/autoresponder.master
@@ -4,7 +4,7 @@ if ($RETURNCODE==1)
{
if (!/^List-Unsubscribe:.*/:h )
{
- if (!/^(X-Spam-Flag: YES|X-Spam: Yes)/:h )
+ if (!/^(X-Spam-Flag: YES|X-Spam: Yes|X-Spam-Status: Yes)/:h )
{
NOW=time
if ({start_date} lt $NOW && {end_date} gt $NOW)
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 538e8cf328..16a39ec180 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -7,7 +7,7 @@ require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap
<tmpl_if name="move_junk" op="==" value="y">
# Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
fileinto :create "Junk";
# Stop here so that we do not reply on spams
stop;
@@ -33,7 +33,7 @@ require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap
<tmpl_if name="move_junk" op="==" value="a">
# Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
fileinto :create "Junk";
# Stop here so that we do not reply on spams
stop;
@@ -46,7 +46,7 @@ if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes")
#################################################################
# Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
# Stop here so that we do not reply on spams
stop;
}
--
GitLab