[Feature] Remove upstream `X-Spam: Yes` header by default

diff --git a/conf/modules.d/milter_headers.conf b/conf/modules.d/milter_headers.conf
index e01d6e0f42ddb9a302a418c351a07769a0a67ab6..99892f8affefcdf138d17dabcac589a20204ea03 100644 (file)
--- a/conf/modules.d/milter_headers.conf
+++ b/conf/modules.d/milter_headers.conf
@@ -18,6 +18,7 @@ milter_headers {
   # Refer to https://rspamd.com/doc/modules/milter_headers.html for information on configuration
 
   use = [];
+  remove_upstream_spam_flag = true;
 
   # Compatibility
   .include(try=true,priority=5) "${DBDIR}/dynamic/rmilter_headers.conf"

diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index f5f8fe6043c66e5be32008cef249dda19ad087ad..6f8638f58f420a4be3ffd69c7f934eba64f33dea 100644 (file)
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -57,6 +57,9 @@ local settings = {
       header = 'X-Rspamd-Queue-Id',
       remove = 1,
     },
+    ['remove-spam-flag'] = {
+      header = 'X-Spam',
+    },
     ['spam-header'] = {
       header = 'Deliver-To',
       value = 'Junk',
@@ -295,6 +298,10 @@ local function milter_headers(task)
     spam_header('spam-header', settings.routines['spam-header'].header, settings.routines['spam-header'].value, settings.routines['spam-header'].remove)
   end
 
+  routines['remove-spam-flag'] = function()
+    remove[settings.routines['remove-spam-flag'].header] = 1
+  end
+
   routines['x-virus'] = function()
     if skip_wanted('x-virus') then return end
     if not common.symbols_hash then
@@ -442,6 +449,7 @@ local function activate_routine(s)
     logger.errx(rspamd_config, 'routine "%s" does not exist', s)
   end
 end
+if opts['remove_upstream_spam_flag'] then activate_routine('remove-spam-flag') end
 if opts['extended_spam_headers'] then
   activate_routine('x-spamd-result')
   activate_routine('x-rspamd-server')