From 45359bb6cf701fab61be9218aa1724f098db2479 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 18 May 2019 09:18:00 +0200 Subject: [PATCH] [Rspamd] Do not apply SPOOFED_UNAUTH on ARC_ALLOW [Dovecot] Set sieve_redirect_envelope_from to rcpt --- data/conf/dovecot/dovecot.conf | 1 + data/conf/rspamd/local.d/composites.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/conf/dovecot/dovecot.conf b/data/conf/dovecot/dovecot.conf index 1a940537..afb7ec56 100644 --- a/data/conf/dovecot/dovecot.conf +++ b/data/conf/dovecot/dovecot.conf @@ -314,6 +314,7 @@ plugin { sieve = /var/vmail/sieve/%u.sieve sieve_plugins = sieve_imapsieve sieve_extprograms sieve_vacation_send_from_recipient = yes + sieve_redirect_envelope_from = recipient # From elsewhere to Spam folder imapsieve_mailbox1_name = Junk imapsieve_mailbox1_causes = COPY diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf index 1139b490..31b4f13a 100644 --- a/data/conf/rspamd/local.d/composites.conf +++ b/data/conf/rspamd/local.d/composites.conf @@ -17,6 +17,6 @@ SOGO_CONTACT_SPOOFED { expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL | R_SPF_FAIL) & ~SOGO_CONTACT"; } SPOOFED_UNAUTH { - expression = "!MAILCOW_AUTH & !MAILCOW_WHITE & !R_SPF_ALLOW & !DMARC_POLICY_ALLOW"; + expression = "!MAILCOW_AUTH & !MAILCOW_WHITE & !R_SPF_ALLOW & !DMARC_POLICY_ALLOW & !ARC_ALLOW"; score = 5.0; }