spam.m4: Rename X-SpamAssassin-* headers to X-Distorted-SpamAssassin-*.

[exim-config] / spam.m4

diff --git a/spam.m4 b/spam.m4
index f4443463d252246d415a0f29ff1cb9dad981a40b..5ce660b66191078147189b57771a30f7ee98c360 100644 (file)
--- a/spam.m4
+++ b/spam.m4
@@ -34,51 +34,38 @@ DIVERT(null)
 ## split at unquoted spaces.  This unpleasant hack sorts out the mess.
 m4_define(<:SHQUOTE:>, <:"${rxquote:$1}":>)
 
-SECTION(global, policy)m4_dnl
-spamd_address = CONF_spamd_address CONF_spamd_port
+## Utilities for collecting spam limits.
+m4_define(<:SPAMLIMIT_CHECK:>,
+       <:${if match{$1}{\N^-?[0-9]+$\N} {spam_limit=$1} {}}:>)
 
-SECTION(routers, allspam)m4_dnl
-## If we're verifying an address and the recipient has a `~/.mail/spam-limit'
-## file, then look up the recipient and sender addresses to find a plausible
-## limit and insert it into the `address_data' where the RCPT ACL can find
-## it.  This router always declines, so it doesn't affect the overall outcome
-## of the verification.
-fetch_spam_limit:
+m4_define(<:SPAMLIMIT_ROUTER:>,
+<:$1:
        driver = redirect
        data = :unknown:
        verify_only = true
-       local_part_suffix = CONF_user_suffix_list
-       local_part_suffix_optional = true
-       check_local_user
-       address_data = \
+       condition = ${if !eq{$acl_c_mode}{submission}}
+       condition = ${extract{spam_limit}{$address_data}{false}{true}}:>)
+
+m4_define(<:SPAMLIMIT_SET:>,
+       <:address_data = \
                ${if def:address_data {$address_data}{}} \
-               ${if and {{!eq{$acl_c_mode}{submission}} \
-                         {exists {CONF_userconf_dir/spam-limit}}} \
-                    {${lookup {$local_part_prefix\
-                                       $local_part\
-                                       $local_part_suffix\
-                                       @$domain/\
-                                       $sender_address} \
-                              nwildlsearch {CONF_userconf_dir/spam-limit} \
-                              {${if match{$value}{\N^-?[0-9]+$\N} \
-                                    {spam_limit=$value} \
-                                    {}}} \
-                              {}}} \
-                    {}} \
-               ${if and {{!eq{$acl_c_mode}{submission}} \
-                         {exists {CONF_userconf_dir/spam-limit.userv}}} \
-                    {${run {/usr/bin/timeout 5s -- \
-                               userv CONF_userv_opts SHQUOTE($local_part) exim-spam-limit \
-                                       SHQUOTE($sender_address) \
-                                       SHQUOTE($local_part_prefix) \
-                                       SHQUOTE($local_part) \
-                                       SHQUOTE($local_part_suffix) \
-                                       SHQUOTE(@$domain)} \
-                           {${if match{$value}{\N^-?[0-9]+$\N} \
-                                 {spam_limit=$value} \
-                                 {}}} \
-                           {}}} \
-                    {}}
+               $1:>)
+
+m4_define(<:SPAMLIMIT_LOOKUP:>,
+       <:condition = ${if exists{$1}}
+       SPAMLIMIT_SET(<:${lookup {$2$3$4@$5/$6} nwildlsearch {$1} \
+                              {SPAMLIMIT_CHECK($value)}}:>):>)
+
+m4_define(<:SPAMLIMIT_USERV:>,
+       <:SPAMLIMIT_SET(<:${run {/usr/bin/timeout 5s \
+                                       userv CONF_userv_opts \
+                                       SHQUOTE($1) exim-spam-limit \
+                                       SHQUOTE($6) SHQUOTE($2) SHQUOTE($3) \
+                                       SHQUOTE($4) SHQUOTE(@$5)} \
+                               {SPAMLIMIT_CHECK($value)}}:>):>)
+
+SECTION(global, policy)m4_dnl
+spamd_address = CONF_spamd_address CONF_spamd_port
 
 SECTION(acl, rcpt-hooks)m4_dnl
        ## Do per-recipient spam-filter processing.
@@ -93,11 +80,26 @@ skip_spam_check:
        accept   hosts = +trusted
        accept   condition = ${if eq{$acl_c_mode}{submission}}
 
+       ## If all domains have disabled spam checking then don't check.
+       accept  !condition = $acl_c_spam_check_domain
+
        ## Otherwise we should check.
        deny
 
 rcpt_spam:
 
+       ## If this is a virtual domain, and it says `spam-check=no', then we
+       ## shouldn't check spam.  But we can't check domains at DATA time, so
+       ## instead we must track whether all recipients have disabled
+       ## checking.
+       warn    !domains = ${if exists{CONF_sysconf_dir/domains.conf} \
+                        {partial0-lsearch; CONF_sysconf_dir/domains.conf} \
+                        {}}
+                set acl_c_spam_check_domain = true
+       warn    !condition = $acl_c_spam_check_domain
+                condition = DOMKV(spam-check, {${expand:$value}}{true})
+                set acl_c_spam_check_domain = true
+
        ## See if we should do this check.
        accept   acl = skip_spam_check
 
@@ -203,10 +205,10 @@ data_spam:
                 set acl_m_spam_tests = ${sg{$acl_m_spam_tests}{!(.)}{\$1}}
 
                 ## Insert the headers.
-                add_header = X-SpamAssassin-Score: \
+                add_header = X-Distorted-SpamAssassin-Score: \
                        $spam_score/$acl_m_spam_limit_presentation \
                        ($spam_bar)
-                add_header = X-SpamAssassin-Status: \
+                add_header = X-Distorted-SpamAssassin-Status: \
                        score=$spam_score, \
                        limit=$acl_m_spam_limit_presentation, \n\t\
                        tests=$acl_m_spam_tests