You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2018/11/19 18:40:05 UTC

svn commit: r1846935 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEMacro.pm

Author: gbechis
Date: Mon Nov 19 18:40:05 2018
New Revision: 1846935

URL: http://svn.apache.org/viewvc?rev=1846935&view=rev
Log:
check for macros in docx and xlsx documents as well by default

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEMacro.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEMacro.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEMacro.pm?rev=1846935&r1=1846934&r2=1846935&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEMacro.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEMacro.pm Mon Nov 19 18:40:05 2018
@@ -217,7 +217,7 @@ Configure the largest file that the plug
 
   push(@cmds, {
     setting => 'olemacro_exts',
-    default => '(?:doc|dot|pot|ppa|pps|ppt|rtf|sldm|xl|xla|xls|xlt|xslb)$',
+    default => '(?:doc|docx|dot|pot|ppa|pps|ppt|rtf|sldm|xl|xla|xls|xlsx|xlt|xslb)$',
     type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
     code => sub {
       my ($self, $key, $value, $line) = @_;
@@ -232,7 +232,7 @@ Configure the largest file that the plug
 
 =over 4
 
-=item olemacro_exts (default: (?:doc|dot|pot|ppa|pps|ppt|rtf|sldm|xl|xla|xls|xlt|xslb)$)
+=item olemacro_exts (default: (?:doc|docx|dot|pot|ppa|pps|ppt|rtf|sldm|xl|xla|xls|xlsx|xlt|xslb)$)
 
 Set the regexp used to configure the extensions the plugin targets for macro scanning
 
@@ -267,7 +267,7 @@ Set the regexp used to configure the ext
 
   push(@cmds, {
     setting => 'olemacro_skip_exts',
-    default => '(?:docx|dotx|potx|ppsx|pptx|sldx|xlsx|xltx)$',
+    default => '(?:dotx|potx|ppsx|pptx|sldx|xltx)$',
     type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
     code => sub {
       my ($self, $key, $value, $line) = @_;
@@ -282,7 +282,7 @@ Set the regexp used to configure the ext
 
 =over 4
 
-=item olemacro_skip_exts (default: (?:docx|dotx|potx|ppsx|pptx|sldx|xlsx|xltx)$)
+=item olemacro_skip_exts (default: (?:dotx|potx|ppsx|pptx|sldx|xltx)$)
 
 Set the regexp used to configure extensions for the plugin to skip entirely, these should only be guaranteed macro free files