m4_define(<:SPAMLIMIT_SET:>,
<:address_data = \
${if def:address_data {$address_data}{}} \
- $1:>)
+ m4_ifelse(<:$2:>, <::>, <::>, <:$2 \
+ :>)$1:>)
m4_define(<:SPAMLIMIT_LOOKUP:>,
<:condition = ${if exists{$1}}
SPAMLIMIT_SET(<:${lookup {$2@$3/$4} nwildlsearch {$1} \
- {SPAMLIMIT_CHECK($value)}}:>):>)
+ {SPAMLIMIT_CHECK(<:$value:>)}}:>, <:$5:>):>)
m4_define(<:SPAMLIMIT_USERV:>,
<:SPAMLIMIT_SET(<:${run {/usr/bin/timeout 5s \
- userv CONF_userv_opts \
+ /usr/bin/userv CONF_userv_opts \
SHQUOTE($1) exim-spam-limit \
SHQUOTE($4) \
SHQUOTE($2) SHQUOTE(@$3)} \
- {SPAMLIMIT_CHECK($value)}}:>):>)
+ {SPAMLIMIT_CHECK(<:$value:>)}}:>, <:$5:>):>)
m4_define(<:GET_ADDRDATA:>,
<:extract{<:$1:>}{${if def:address_data{$address_data}{}}}:>)
${sg {${GET_ADDRDATA(spam_limit){$value}{nil}}} \
{^(|.*\\D.*)\$}{CONF_spam_max}}
+ warn condition = ${GET_ADDRDATA(user){true}{false}}
+ set acl_m_spam_users = \
+ ${if def:acl_m_spam_users {$acl_m_spam_users::}{}}\
+ ${GET_ADDRDATA(user) \
+ {$value=${sg{$local_part@$domain}\
+ {([!:])}{!\$1}}} \
+ fail}
+
## If there's a spam limit already established, and it's different
## from this user's limit, then the sender will have to try this user
## again later.
## All done.
accept
-SECTION(acl, data-spam)m4_dnl
+SECTION(acl, data-hooks)m4_dnl
## Do spam checking.
require acl = data_spam
require verify = header_syntax
## Check the message for spam, comparing to the configured limit.
- deny spam = exim:true
- message = Tinned meat product detected ($spam_score)
- condition = ${if >{$spam_score_int}{$acl_m_spam_limit} \
- {true}{false}}
+ warn spam = exim:true
- ## Insert headers from the spam check now that we've decided to
- ## accept the message.
+ ## Format some reporting stuff.
warn
## Convert the limit (currently 10x fixed point) into a
## Undo the escaping.
set acl_m_spam_tests = ${sg{$acl_m_spam_tests}{!(.)}{\$1}}
- ## Insert the headers.
+ ## If we've decided to reject, then leave a dropping in the log file
+ ## so that users can analyse rejections for incoming messages, and
+ ## tell the sender to get knotted.
+ deny message = Tinned meat product detected ($spam_score)
+ log_message = Spam rejection \
+ score=$spam_score \
+ limit=$acl_m_spam_limit_presentation \
+ tests=$acl_m_spam_tests \
+ users=$acl_m_spam_users
+ condition = ${if >{$spam_score_int}{$acl_m_spam_limit} \
+ {true}{false}}
+
+ ## Insert headers from the spam check now that we've decided to
+ ## accept the message.
+ warn
ADD_HEADER(<:X-CONF_header_token-SpamAssassin-Score: \
$spam_score/$acl_m_spam_limit_presentation \
($spam_bar):>)