瀏覽代碼

[Rspamd] Add SIEVE_HOST map and skip spoof check for these IPs

andryyy 6 年之前
父節點
當前提交
3ffa7e1f33
共有 2 個文件被更改,包括 7 次插入1 次删除
  1. 1 1
      data/conf/rspamd/local.d/composites.conf
  2. 6 0
      data/conf/rspamd/local.d/multimap.conf

+ 1 - 1
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";
   expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL | R_SPF_FAIL) & ~SOGO_CONTACT";
 }
 }
 SPOOFED_UNAUTH {
 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;
   score = 5.0;
 }
 }

+ 6 - 0
data/conf/rspamd/local.d/multimap.conf

@@ -83,3 +83,9 @@ GLOBAL_RCPT_BL {
   prefilter = true;
   prefilter = true;
   action = "reject";
   action = "reject";
 }
 }
+
+SIEVE_HOST {
+  type = "ip";
+  map = "$LOCAL_CONFDIR/custom/dovecot_trusted.map";
+  symbols_set = ["SIEVE_HOST"];
+}