require acl = rcpt_spam
SECTION(acl, misc)m4_dnl
-rcpt_spam:
+skip_spam_check:
- ## If the client is trusted, don't bother with any of this.
+ ## If the client is trusted, or this is a new submission, don't
+ ## bother with any of this. We will have verified the sender
+ ## fairly aggressively before granting this level of trust.
accept hosts = +trusted
+ accept condition = ${if eq{$acl_c_mode}{submission}}
+
+ ## Otherwise we should check.
+ deny
+
+rcpt_spam:
+
+ ## See if we should do this check.
+ accept acl = skip_spam_check
+
+ ## Always accept mail to `postmaster'. Currently this is not
+ ## negotiable; maybe a tweak can be added to `domains.conf' if
+ ## necessary.
+ accept local_parts = postmaster
## Collect the user's spam threshold from the `address_data'
## variable, where it was left by the `fetch_spam_limit' router
SECTION(acl, misc)m4_dnl
data_spam:
- ## If the client is trusted, don't bother with any of this.
- accept hosts = +trusted
+ ## See if we should do this check.
+ accept acl = skip_spam_check
+
+ ## Check header validity.
+ require verify = header_syntax
## Check the message for spam, comparing to the configured limit.
deny spam = exim:true
## Insert headers from the spam check now that we've decided to
## accept the message.
warn
+
## Convert the limit (currently 10x fixed point) into a
## decimal for presentation.
set acl_m_spam_limit_presentation = \
## their scores. Leave `<<...>>' around everything else.
set acl_m_spam_tests = \
${sg{$acl_m_spam_tests} \
- {\N(?s)\n\s*([\d.]+)\s+([-\w]+)\s\N} \
+ {\N(?s)\n\s*(-?[\d.]+)\s+([-\w]+)\s\N} \
{>>\$2:\$1,<<}}
## Strip everything still in `<<...>>' pairs, including any
limit=$acl_m_spam_limit_presentation, \n\t\
tests=$acl_m_spam_tests
-
## We're good.
accept