From 3ffa7e1f33d9744ddb46dcb82ff65a17b0a0f797 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 18 May 2019 22:44:06 +0200 Subject: [PATCH] [Rspamd] Add SIEVE_HOST map and skip spoof check for these IPs --- data/conf/rspamd/local.d/composites.conf | 2 +- data/conf/rspamd/local.d/multimap.conf | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf index 31b4f13a8..1eea109e5 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 & !ARC_ALLOW"; + expression = "!MAILCOW_AUTH & !MAILCOW_WHITE & !R_SPF_ALLOW & !DMARC_POLICY_ALLOW & !ARC_ALLOW & !SIEVE_HOST"; score = 5.0; } diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf index 7752b8135..c9b49ea40 100644 --- a/data/conf/rspamd/local.d/multimap.conf +++ b/data/conf/rspamd/local.d/multimap.conf @@ -83,3 +83,9 @@ GLOBAL_RCPT_BL { prefilter = true; action = "reject"; } + +SIEVE_HOST { + type = "ip"; + map = "$LOCAL_CONFDIR/custom/dovecot_trusted.map"; + symbols_set = ["SIEVE_HOST"]; +}