fixed syntax

diff --git a/filter/extension_regexp b/filter/extension_regexp
index 2dcf41a73f84a12613051de4b0594bc7a51cf72e..d20f470cd382597dbc9b09a431020f0d36b411d5 100644 (file)
--- a/filter/extension_regexp
+++ b/filter/extension_regexp
@@ -1,4 +1,4 @@
-# $Id: extension_regexp,v 1.2 2001/08/15 10:01:01 nigel Exp $
+# $Id: extension_regexp,v 1.3 2001/09/19 10:19:42 nigel Exp $
 # matches the list of extensions
 # uses non-capturing brackets
        (?:ad[ep]                               # list of extns
@@ -19,7 +19,7 @@
        |md[be]
        |ms[cipt]
        |pcd
-       |pif)
+       |pif
        |reg
        |scr
        |sct

diff --git a/filter/sysfilter.tmpl b/filter/sysfilter.tmpl
index bff7074624d0dd757214798766924e849efccb73..8aacee80f14eb3601feeabf6f06c1b3f71587eac 100644 (file)
--- a/filter/sysfilter.tmpl
+++ b/filter/sysfilter.tmpl
@@ -1,6 +1,6 @@
 # Exim filter
-## Version: 0.16
-#      $Id: sysfilter.tmpl,v 1.3 2001/08/17 12:46:51 nigel Exp $
+## Version: 0.17
+#      $Id: sysfilter.tmpl,v 1.4 2001/09/19 10:19:42 nigel Exp $
 
 ## Exim system filter to refuse potentially harmful payloads in
 ## mail messages
@@ -176,6 +176,8 @@ endif
 #      Changed the . in filename detect to \S (stops it going mad)
 # 0.16 19 September, 2001
 #      Pile of new extensions including the eml in current use
+# 0.17 19 September, 2001
+#      Syntax fix
 #
 #### Install Notes
 #

diff --git a/filter/system_filter.exim b/filter/system_filter.exim
index 356ea86235731faaf71a09c299fbed8ba8d5b25d..e91a88020f5ba66ec17b67f3f2ba17c7ac1dd123 100644 (file)
--- a/filter/system_filter.exim
+++ b/filter/system_filter.exim
@@ -1,5 +1,5 @@
 # Exim filter
-## Version: 0.16
+## Version: 0.17
 #      $Id: sysfilter.tmpl,v 1.4 2001/09/19 10:19:42 nigel Exp $
 
 ## Exim system filter to refuse potentially harmful payloads in
@@ -80,7 +80,7 @@ endif
 ## -----------------------------------------------------------------------
 # Look for single part MIME messages with suspicious name extensions
 # Check Content-Type header using quoted filename [content_type_quoted_fn_match]
-if $header_content-type: matches "(?:file)?name=(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")"
+if $header_content-type: matches "(?:file)?name=(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")"
 then
   fail text "This message has been rejected because it has\n\
             potentially executable content $1\n\
@@ -91,7 +91,7 @@ then
   seen finish
 endif
 # same again using unquoted filename [content_type_unquoted_fn_match]
-if $header_content-type: matches "(?:file)?name=(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc]))"
+if $header_content-type: matches "(?:file)?name=(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc]))"
 then
   fail text "This message has been rejected because it has\n\
             potentially executable content $1\n\
@@ -108,7 +108,7 @@ endif
 # in emails.   These were used as the basis for 
 # the ILOVEYOU virus and its variants - many many varients
 # Quoted filename - [body_quoted_fn_match]
-if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")[\\\\s;]"
+if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")[\\\\s;]"
 then
   fail text "This message has been rejected because it has\n\
             a potentially executable attachment $1\n\
@@ -119,7 +119,7 @@ then
   seen finish
 endif
 # same again using unquoted filename [body_unquoted_fn_match]
-if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc]))[\\\\s;]"
+if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc]))[\\\\s;]"
 then
   fail text "This message has been rejected because it has\n\
             a potentially executable attachment $1\n\
@@ -176,6 +176,8 @@ endif
 #      Changed the . in filename detect to \S (stops it going mad)
 # 0.16 19 September, 2001
 #      Pile of new extensions including the eml in current use
+# 0.17 19 September, 2001
+#      Syntax fix
 #
 #### Install Notes
 #
@@ -247,7 +249,7 @@ endif
 #              |md[be]
 #              |ms[cipt]
 #              |pcd
-#              |pif)
+#              |pif
 #              |reg
 #              |scr
 #              |sct

diff --git a/system_filter.exim b/system_filter.exim
index 0f146605f09fb7043a3e367e142b8541241f6436..e91a88020f5ba66ec17b67f3f2ba17c7ac1dd123 100644 (file)
--- a/system_filter.exim
+++ b/system_filter.exim
@@ -1,6 +1,6 @@
 # Exim filter
-## Version: 0.16
-#      $Id: system_filter.exim,v 1.8 2001/09/19 10:20:22 nigel Exp $
+## Version: 0.17
+#      $Id: sysfilter.tmpl,v 1.4 2001/09/19 10:19:42 nigel Exp $
 
 ## Exim system filter to refuse potentially harmful payloads in
 ## mail messages
@@ -80,7 +80,7 @@ endif
 ## -----------------------------------------------------------------------
 # Look for single part MIME messages with suspicious name extensions
 # Check Content-Type header using quoted filename [content_type_quoted_fn_match]
-if $header_content-type: matches "(?:file)?name=(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")"
+if $header_content-type: matches "(?:file)?name=(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")"
 then
   fail text "This message has been rejected because it has\n\
             potentially executable content $1\n\
@@ -91,7 +91,7 @@ then
   seen finish
 endif
 # same again using unquoted filename [content_type_unquoted_fn_match]
-if $header_content-type: matches "(?:file)?name=(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc]))"
+if $header_content-type: matches "(?:file)?name=(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc]))"
 then
   fail text "This message has been rejected because it has\n\
             potentially executable content $1\n\
@@ -108,7 +108,7 @@ endif
 # in emails.   These were used as the basis for 
 # the ILOVEYOU virus and its variants - many many varients
 # Quoted filename - [body_quoted_fn_match]
-if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")[\\\\s;]"
+if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\"[^\"]+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc])\")[\\\\s;]"
 then
   fail text "This message has been rejected because it has\n\
             a potentially executable attachment $1\n\
@@ -119,7 +119,7 @@ then
   seen finish
 endif
 # same again using unquoted filename [body_unquoted_fn_match]
-if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif)|reg|scr|sct|shs|url|vb[se]|ws[fhc]))[\\\\s;]"
+if $message_body matches "(?:Content-(?:Type:(?>\\\\s*)[\\\\w-]+/[\\\\w-]+|Disposition:(?>\\\\s*)attachment);(?>\\\\s*)(?:file)?name=|begin(?>\\\\s+)[0-7]{3,4}(?>\\\\s+))(\\\\S+\\\\.(?:ad[ep]|ba[st]|chm|cmd|com|cpl|crt|eml|exe|hlp|hta|in[fs]|isp|jse?|lnk|md[be]|ms[cipt]|pcd|pif|reg|scr|sct|shs|url|vb[se]|ws[fhc]))[\\\\s;]"
 then
   fail text "This message has been rejected because it has\n\
             a potentially executable attachment $1\n\
@@ -176,6 +176,8 @@ endif
 #      Changed the . in filename detect to \S (stops it going mad)
 # 0.16 19 September, 2001
 #      Pile of new extensions including the eml in current use
+# 0.17 19 September, 2001
+#      Syntax fix
 #
 #### Install Notes
 #
@@ -247,7 +249,7 @@ endif
 #              |md[be]
 #              |ms[cipt]
 #              |pcd
-#              |pif)
+#              |pif
 #              |reg
 #              |scr
 #              |sct