diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf index 3e5886c8c..337a2eb10 100644 --- a/data/conf/rspamd/local.d/composites.conf +++ b/data/conf/rspamd/local.d/composites.conf @@ -66,5 +66,5 @@ WL_FWD_HOST { expression = "-WHITELISTED_FWD_HOST & (^g+:rbl | ^g+:policies | ^g+:hfilter | ^g:neural)"; } ENCRYPTED_CHAT { - expression = "CHAT_VERSION_HEADER & ENCRYPTED_PGP & ^DYN_RL_CHECK & ^BCC"; + expression = "CHAT_VERSION_HEADER & ENCRYPTED_PGP"; } diff --git a/data/conf/rspamd/local.d/groups.conf b/data/conf/rspamd/local.d/groups.conf index b5be51660..9ca3409d7 100644 --- a/data/conf/rspamd/local.d/groups.conf +++ b/data/conf/rspamd/local.d/groups.conf @@ -15,6 +15,9 @@ symbols { "BULK_HEADER" { score = 4.0; } + "ENCRYPTED_CHAT" { + score = -20.0; + } } group "MX" { diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua index fb45c6eb9..b007f097e 100644 --- a/data/conf/rspamd/lua/rspamd.local.lua +++ b/data/conf/rspamd/lua/rspamd.local.lua @@ -331,6 +331,10 @@ rspamd_config:register_symbol({ local from_table = {} local rcpt_table = {} + if task:has_symbol('ENCRYPTED_CHAT') then + return -- stop + end + local send_mail = function(task, bcc_dest) local lua_smtp = require "lua_smtp" local function sendmail_cb(ret, err)