spam.m4: Refactor routers with macros.

Split the big router into two separate ones.  Arrange that routers don't
set a spam limit if there's already one set (so the first one wins!).

diff --git a/spam.m4 b/spam.m4
index f444346..ce9c8e3 100644 (file)
--- a/spam.m4
+++ b/spam.m4
@@ -34,6 +34,36 @@ DIVERT(null)
 ## split at unquoted spaces.  This unpleasant hack sorts out the mess.
 m4_define(<:SHQUOTE:>, <:"${rxquote:$1}":>)
 
+## Utilities for collecting spam limits.
+m4_define(<:SPAMLIMIT_CHECK:>,
+       <:${if match{$1}{\N^-?[0-9]+$\N} {spam_limit=$1} {}}:>)
+
+m4_define(<:SPAMLIMIT_ROUTER:>,
+<:$1:
+       driver = redirect
+       data = :unknown:
+       verify_only = true
+       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}{}} \
+               $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
 
@@ -43,42 +73,22 @@ SECTION(routers, allspam)m4_dnl
 ## 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:
-       driver = redirect
-       data = :unknown:
-       verify_only = true
+SPAMLIMIT_ROUTER(fetch_spam_limit_lookup)
+       check_local_user
        local_part_suffix = CONF_user_suffix_list
        local_part_suffix_optional = true
+       SPAMLIMIT_LOOKUP(CONF_userconf_dir/spam-limit,
+               $local_part_prefix, $local_part, $local_part_suffix, $domain,
+               $sender_address)
+
+SPAMLIMIT_ROUTER(fetch_spam_limit_userv)
        check_local_user
-       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} \
-                                 {}}} \
-                           {}}} \
-                    {}}
+       local_part_suffix = CONF_user_suffix_list
+       local_part_suffix_optional = true
+       condition = ${if exists{CONF_userconf_dir/spam-limit.userv}}
+       SPAMLIMIT_USERV(SHQUOTE($local_part),
+               $local_part_prefix, $local_part, $local_part_suffix, $domain,
+               $sender_address)
 
 SECTION(acl, rcpt-hooks)m4_dnl
        ## Do per-recipient spam-filter processing.