Untaint mailman lookup domains

diff --git a/master b/master
index 3b541585b384e5720346a2028adb1ef51ae6a1cd..97af95e0a71b01c535f79a1d6a466d766a5f568f 100644 (file)
--- a/master
+++ b/master
@@ -6,10 +6,12 @@
 
 # For doing VERP on outgoing list traffic. Only if we actually do mailman on this host. 
 .ifdef MAILMAN_HOME
+MAILMAN_UNTAINT_DOMAIN = ${lookup{$domain}dsearch{CLUSTER/mailman}{$value}fail}
+MAILMAN_UNTAINT_SENDER_DOMAIN = ${lookup{$sender_address_domain}dsearch{CLUSTER/mailman}{$value}fail}
 REMOTE_OR_VERP_SMTP = ${if and { {match_domain{$sender_address_domain}{+raw_mailman_domains}} \
                                 {match{$sender_address_local_part}{^(.*)-bounces\$}} \
                               } \
-                               {${lookup{$1}lsearch{CLUSTER/mailman/$sender_address_domain}{verp_smtp}{remote_smtp}}} \
+                               {${lookup{$1}lsearch{CLUSTER/mailman/MAILMAN_UNTAINT_SENDER_DOMAIN}{verp_smtp}{remote_smtp}}} \
                                {remote_smtp} \
                        }
 .else
@@ -252,7 +254,7 @@ mailman_bogus_bounces:
   driver = redirect
   senders = :
   domains = +mailman_mx_domains
-  local_parts = lsearch;CLUSTER/mailman/$domain
+  local_parts = lsearch;CLUSTER/mailman/MAILMAN_UNTAINT_DOMAIN
   allow_fail
   data = :fail: Lists do not send messages and should not receive bounces
 
@@ -264,12 +266,12 @@ mailman_bogus_bounces:
 mailman_redirect:
   driver = redirect
   domains = +mailman_mx_domains
-  local_parts = lsearch;CLUSTER/mailman/$domain
+  local_parts = lsearch;CLUSTER/mailman/MAILMAN_UNTAINT_DOMAIN
   local_part_suffix_optional
   local_part_suffix = -bounces : -bounces+* : \
                       -confirm+* : -join : -leave : \
                       -owner : -request : -admin
-  data = ${quote_local_part:$local_part$local_part_suffix}@${lookup{$local_part}lsearch{CLUSTER/mailman/$domain}}
+  data = ${quote_local_part:$local_part$local_part_suffix}@${lookup{$local_part}lsearch{CLUSTER/mailman/MAILMAN_UNTAINT_DOMAIN}}
 
 .ifdef DNS_VIRTUAL
 .include CONFDIR/include/routers-dns-virtual