paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[rspamd] fix redis multimaps in version 1.7.5 

The key's value was being used as symbol name instead of the symbol name defined in the config file
master
Michael Kuron 2018-05-25 18:58:37 +02:00 committed by GitHub
parent 7002599073
commit ea84004410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/conf/rspamd/local.d/multimap.conf
View File

@ -2,29 +2,34 @@ RCPT_MAILCOW_DOMAIN {
type = "rcpt"; type = "rcpt";
filter = "email:domain"; filter = "email:domain";
map = "redis://DOMAIN_MAP"; map = "redis://DOMAIN_MAP";
symbols_set = ["RCPT_MAILCOW_DOMAIN"];
} }
RCPT_WANTS_SUBJECT_TAG { RCPT_WANTS_SUBJECT_TAG {
type = "rcpt"; type = "rcpt";
filter = "email:addr"; filter = "email:addr";
map = "redis://RCPT_WANTS_SUBJECT_TAG"; map = "redis://RCPT_WANTS_SUBJECT_TAG";
symbols_set = ["RCPT_WANTS_SUBJECT_TAG"];
} }
RCPT_WANTS_SUBFOLDER_TAG { RCPT_WANTS_SUBFOLDER_TAG {
type = "rcpt"; type = "rcpt";
filter = "email:addr"; filter = "email:addr";
map = "redis://RCPT_WANTS_SUBFOLDER_TAG"; map = "redis://RCPT_WANTS_SUBFOLDER_TAG";
symbols_set = ["RCPT_WANTS_SUBFOLDER_TAG"];
} }
WHITELISTED_FWD_HOST { WHITELISTED_FWD_HOST {
type = "ip"; type = "ip";
map = "redis://WHITELISTED_FWD_HOST"; map = "redis://WHITELISTED_FWD_HOST";
symbols_set = ["WHITELISTED_FWD_HOST"];
} }
KEEP_SPAM { KEEP_SPAM {
type = "ip"; type = "ip";
map = "redis://KEEP_SPAM"; map = "redis://KEEP_SPAM";
action = "accept"; action = "accept";
symbols_set = ["KEEP_SPAM"];
} }
LOCAL_BL_ASN { LOCAL_BL_ASN {
@ -33,6 +38,7 @@ LOCAL_BL_ASN {
map = "$LOCAL_CONFDIR/custom/bad_asn.map"; map = "$LOCAL_CONFDIR/custom/bad_asn.map";
score = 5; score = 5;
description = "Sender's ASN is on the local blacklist"; description = "Sender's ASN is on the local blacklist";
symbols_set = ["LOCAL_BL_ASN"];
} }
#SPOOFED_SENDER { #SPOOFED_SENDER {
@ -40,4 +46,5 @@ LOCAL_BL_ASN {
# filter = "email:domain:tld"; # filter = "email:domain:tld";
# map = "redis://DOMAIN_MAP"; # map = "redis://DOMAIN_MAP";
# require_symbols = "AUTH_NA | !RCVD_VIA_SMTP_AUTH"; # require_symbols = "AUTH_NA | !RCVD_VIA_SMTP_AUTH";
# symbols_set = ["SPOOFED_SENDER"];
#} #}