eximconf: add a couple of text matches

[mirror/dsa-puppet.git] / modules / exim / templates / eximconf.erb

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index da1b73f..7b19e32 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -107,7 +107,7 @@ allow_domain_literals = true
 # local_domains. It will be referenced
 # later on by the syntax "+local_domains".
 # Other domain and host lists may follow.
-# @ is the local FQDN, @[] matches the IP adress of any local interface.
+# @ is the local FQDN, @[] matches the IP address of any local interface.
 
 domainlist local_domains = @ : \
     @[] : \
@@ -901,45 +901,45 @@ check_recipient:
 
 <%- unless @use_smarthost -%>
   deny    message  = host $sender_host_address is listed in $dnslist_domain ($dnslist_value)${if >{${strlen:${dnslist_text}}}{0}{; see $dnslist_text}}
+          domains  = +handled_domains
+          !hosts   = +debianhosts : WHITELIST
           dnslists = ${if match_domain{$domain}{+virtual_domains}\
                     {${if exists {${extract{directory}{VDOMAINDATA}{${value}/rbllist}}}\
                     {${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/rbllist}}}{$value}{}}}{}}}\
                     {${lookup{$local_part}lsearch{/etc/exim4/rbllist}{$value}{}}}} : \
                     ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-rbl}{$value}{}}
-         domains       = +handled_domains
-         !hosts        = +debianhosts : WHITELIST
 
   deny    message  = host $sender_host_address is listed in $dnslist_domain ($dnslist_value)${if >{${strlen:${dnslist_text}}}{0}{; see $dnslist_text}}
-          dnslists = noserver.dnsbl.sorbs.net
           domains  = +handled_domains
           !hosts   = +debianhosts : WHITELIST
+          dnslists = noserver.dnsbl.sorbs.net
 
   deny    message   = host $sender_host_address is listed in $dnslist_domain ($dnslist_value)${if >{${strlen:${dnslist_text}}}{0}{; see $dnslist_text}}
           condition = ${if bool_lax{$acl_m_defopt}}
-          dnslists  = relays.dnsbl.sorbs.net : xbl.spamhaus.org
           domains   = +handled_domains
           !hosts    = +debianhosts : WHITELIST
+          dnslists  = relays.dnsbl.sorbs.net : xbl.spamhaus.org
 
 <%- end -%>
   deny    message  = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value)${if >{${strlen:${dnslist_text}}}{0}{; see $dnslist_text}}
+          domains  = +handled_domains
+          !hosts   = +debianhosts : WHITELIST
           dnslists = ${if match_domain{$domain}{+virtual_domains}\
                     {${if exists {${extract{directory}{VDOMAINDATA}{${value}/rhsbllist}}}\
                     {${expand:${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/rhsbllist}}}{$value}{}}}}{}}}\
                     {${expand:${lookup{$local_part}lsearch{/etc/exim4/rhsbllist}{$value}{}}}}} : \
                     ${expand:${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-rhsbl}{$value}{}}}
-         domains       = +handled_domains
-         !hosts        = +debianhosts : WHITELIST
 
   deny    message  = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value)${if >{${strlen:${dnslist_text}}}{0}{; see $dnslist_text}}
-          dnslists = nomail.rhsbl.sorbs.net/$sender_address_domain
           domains  = +handled_domains
           !hosts   = +debianhosts : WHITELIST
+          dnslists = nomail.rhsbl.sorbs.net/$sender_address_domain
 
   deny    message   = domain $sender_address_domain is listed in $dnslist_domain ($dnslist_value)${if >{${strlen:${dnslist_text}}}{0}{; see $dnslist_text}}
           condition = ${if bool_lax{$acl_m_defopt}}
-          dnslists  = dbl.spamhaus.org/$sender_address_domain
           domains   = +handled_domains
           !hosts    = +debianhosts : WHITELIST
+          dnslists  = dbl.spamhaus.org/$sender_address_domain
 
 <%- unless @use_smarthost -%>
   deny    domains  = +handled_domains
@@ -1072,28 +1072,26 @@ check_message:
           condition       = ${if !eq {$acl_m_prf}{PopconMail}}
          message         = Your mailer is not RFC 2047 compliant: message rejected
 
-  discard condition      = ${if eq {$acl_m_prf}{blackhole}}
-          condition      = ${if bool_lax{$acl_m_defopt}}
+  warn    condition      = ${if bool_lax{$acl_m_defopt}}
           condition      = ${if or {\
                                     {match {$message_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
+                                    {match {$message_body}{\N(?i)Dear Beneficiary.*You have been selected.*Thousand United States Dollars\N}} \
+                                    {match {$message_body}{\N(?i)receiving sum of money into your account for safe keeping\N}} \
+                                    {match {$message_body}{\N(?i)I got your e-mail address through an internet marketing firm\N}} \
                                    }\
                             }
+          set acl_m_content = 1
+
+  discard condition      = ${if eq {$acl_m_prf}{blackhole}}
+          condition      = ${if eq {$acl_m_content}{1}}
           log_message    = Discarded suspicious content for $recipients
 
   deny    condition      = ${if !eq {$acl_m_prf}{markup}}
-          condition      = ${if bool_lax{$acl_m_defopt}}
-          condition      = ${if or {\
-                                    {match {$message_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
-                                   }\
-                            }
+          condition      = ${if eq {$acl_m_content}{1}}
           message        = Rejected due to suspicious content
 
   warn    condition      = ${if eq {$acl_m_prf}{markup}}
-          condition      = ${if bool_lax{$acl_m_defopt}}
-          condition      = ${if or {\
-                                    {match {$message_body}{Wenn Sie zuk&uuml;nftig keine weiteren Informationen erhalten m&ouml;chten, <br />unwissentlich oder unbeabsichtigt in den Verteiler aufgenommen wurden,}} \
-                                   }\
-                            }
+          condition      = ${if eq {$acl_m_content}{1}}
           add_header     = X-debian-content-warning: yes
 
 <%- if has_variable?("clamd") && @clamd -%>