Generalise spam block
authorTom Hughes <tom@compton.nu>
Mon, 24 Apr 2017 09:30:37 +0000 (10:30 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 24 Apr 2017 09:30:37 +0000 (10:30 +0100)
cookbooks/exim/templates/default/exim4.conf.erb

index 4b60719205cb1482128a2dee84698c1dbb896c13..ca868683ac9cc9ccd79405e3b8d6b90c2a39181f 100644 (file)
@@ -498,11 +498,9 @@ acl_check_data:
 
 <% end -%>
   # Deny spammy messages with headers of the form:
 
 <% end -%>
   # Deny spammy messages with headers of the form:
-  #   X-PHP-Originating-Script: <digits>:SendMail.php
-  #   X-PHP-Originating-Script: <digits>:SendMail.class.php
-  #   X-PHP-Originating-Script: <digits>:ExtendedMail.php
-  #   X-PHP-Originating-Script: <digits>:ExtendedMail.class.php
-  deny    condition  = ${if match {$h_X-PHP-Originating-Script:}{^[0-9]+:(Send|Extended)[Mm]ail(\\.class)?\\.php\$}}
+  #   X-PHP-Originating-Script: <digits>:<name>.php
+  #   X-PHP-Originating-Script: <digits>:<name>.class.php
+  deny    condition  = ${if match {$h_X-PHP-Originating-Script:}{^[0-9]+:[A-Za-z]+(\\.class)?\\.php\$}}
           message    = This message failed local spam checks.
 
   # Accept the message.
           message    = This message failed local spam checks.
 
   # Accept the message.