--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/ole2macro.cf	Thu Feb 09 20:54:30 2017 +0000
@@ -0,0 +1,6 @@
+# Run VBA Macro checks without ClamAV
+loadplugin OLE2Macro ole2macro.pm
+
+body MICROSOFT_OLE2MACRO eval:check_microsoft_ole2macro()
+describe MICROSOFT_OLE2MACRO Has an attachment that contains an OLE2 Macro
+score MICROSOFT_OLE2MACRO 4

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/spamassassin-vba-macro-master/LICENSE	Thu Feb 09 20:54:30 2017 +0000
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/spamassassin-vba-macro-master/README.md	Thu Feb 09 20:54:30 2017 +0000
@@ -0,0 +1,34 @@
+# SpamAssassin Plugin for detecting VBA/OLE2 Macros in Word/Excel Documents
+
+SpamAssassin plugin for detecting VBA macros in Microsoft Office Documents, including those contained within ZIP archives.
+
+## Motivation ##
+
+This plugin was built in response to increasing phishing/malware found in Microsoft Word and Excel Documents that seems to get past the majority of Virus Scanners when new waves first start.
+
+Most installations running SpamAssassin also run ClamAV and while ClamAV has a configuration option to block OLE2Macros (OLE2BlockMacros), this doesn't work well in practice because surprisingly, some people still send emails with legitimate VBA Macros.
+
+This plugin is designed to crudely (but so far, effectively) identify VBA/OLE2 Macros embedded in Microsoft Word and Excel Documents by looking at a signature in the file only present when VBA Macros are used and allows you to assign a configurable score to these documents such that other factors can contribute to an overall score before considering the email spam.
+
+## Dependencies ##
+
+This module requires the following Perl modules to be installed:
+* IO::Uncompress::Unzip
+* IO::Scalar
+
+In order to detect VBA/Macro-enabled formats (i.e. .docm) disguised as classic Microsoft Office formats by renaming the files, it's recommended you also install:
+* File::MimeInfo::Magic
+
+## Installation ##
+
+Simply place the following in your SpamAssassin configuration file along with the ole2macro.pm in a directory where SpamAssassin is able to find it (i.e. /etc/spamassassin). For instance ```/etc/spamassassin/conf.d/90_ole2macro.cf```
+
+```
+loadplugin OLE2Macro ole2macro.pm
+
+body MICROSOFT_OLE2MACRO eval:check_microsoft_ole2macro()
+describe MICROSOFT_OLE2MACRO Has an attachment that contains an OLE2 Macro
+score MICROSOFT_OLE2MACRO 4
+```
+
+In most cases, you will want to adjust the score accordingly, however, with a cut-off score of 5.5, 4.0 as described above has worked well in a production environment with diverse users.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/spamassassin-vba-macro-master/ole2macro.pm	Thu Feb 09 20:54:30 2017 +0000
@@ -0,0 +1,207 @@
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+=head1 NAME
+
+OLE2Macro - Look for Macro Embedded Microsoft Word and Excel Documents
+
+=head1 SYNOPSIS
+
+loadplugin     ole2macro.pm
+body MICROSOFT_OLE2MACRO eval:check_microsoft_ole2macro()
+score MICROSOFT_OLE2MACRO 4
+
+=head1 DESCRIPTION
+
+Detects embedded OLE2 Macros embedded in Word and Excel Documents. Based on:
+https://blog.rootshell.be/2015/01/08/searching-for-microsoft-office-files-containing-macro/
+
+10/12/2015 - Jonathan Thorpe - jthorpe@conexim.com.au
+
+=back
+
+=cut
+
+package OLE2Macro;
+
+use Mail::SpamAssassin::Plugin;
+use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Util;
+use IO::Uncompress::Unzip;
+use IO::Scalar;
+
+use strict;
+use warnings;
+use bytes;
+use re 'taint';
+
+use vars qw(@ISA);
+@ISA = qw(Mail::SpamAssassin::Plugin);
+
+#File types and markers
+my $match_types = qr/(?:xls|xlt|pot|ppt|pps|doc|dot)$/;
+
+#Microsoft OOXML-based formats with Macros
+my $match_types_xml = qr/(?:xlsm|xltm|xlsb|potm|pptm|ppsm|docm|dotm)$/;
+
+#Markers in the order in which they should be found.
+my @markers = ("\xd0\xcf\x11\xe0", "\x00\x41\x74\x74\x72\x69\x62\x75\x74\x00");
+
+# limiting the number of files within archive to process
+my $archived_files_process_limit = 3;
+# limiting the amount of bytes read from a file
+my $file_max_read_size = 102400;
+# limiting the amount of bytes read from an archive
+my $archive_max_read_size = 1024000;
+
+# limiting the amount of bytes read from a file to determine MIME type
+my $mime_max_read_size = 8;
+
+
+my $has_mimeinfo = 0;
+eval('use File::MimeInfo::Magic');
+if(!$@){
+    $has_mimeinfo = 1;
+}
+
+# constructor: register the eval rule
+sub new {
+    my $class = shift;
+    my $mailsaobject = shift;
+
+   # some boilerplate...
+    $class = ref($class) || $class;
+    my $self = $class->SUPER::new($mailsaobject);
+    bless ($self, $class);
+
+    $self->register_eval_rule("check_microsoft_ole2macro");
+
+    return $self;
+}
+
+sub check_microsoft_ole2macro {
+    my ($self, $pms) = @_;
+
+    _check_attachments(@_) unless exists $pms->{nomacro_microsoft_ole2macro};
+    return $pms->{nomacro_microsoft_ole2macro};
+}
+
+sub _match_markers {
+    my ($data) = @_;
+
+    my $matched=0;
+    foreach(@markers){
+        if(index($data, $_) > -1){
+            $matched++;
+        } else {
+            last;
+        }
+    }
+
+    return $matched == @markers;
+}
+
+sub _is_zip {
+    my ($name, $part) = @_;
+
+    if ($has_mimeinfo){
+        my $contents_scalar = new IO::Scalar \$part->decode($mime_max_read_size);
+        my $mime_type = File::MimeInfo::Magic::magic($contents_scalar);
+        return($mime_type eq "application/zip");
+    }else{
+        return($name =~ /(?:zip)$/);
+    }
+}
+
+sub _check_attachments {
+    my ($self, $pms) = @_;
+
+    my $processed_files_counter = 0;
+    $pms->{nomacro_microsoft_ole2macro} = 0;
+
+    foreach my $p ($pms->{msg}->find_parts(qr/./, 1)) {
+        my ($ctype, $boundary, $charset, $name) =
+        Mail::SpamAssassin::Util::parse_content_type($p->get_header('content-type'));
+
+
+        $name = lc($name || '');
+        if ($name =~ $match_types) {
+            my $contents = $p->decode($file_max_read_size);
+            if(_match_markers($contents)){
+                $pms->{nomacro_microsoft_ole2macro} = 1;
+                last;
+            }
+        }
+
+        if (_is_zip($name, $p)) {
+            my $contents = $p->decode($archive_max_read_size);
+            my $z = new IO::Uncompress::Unzip \$contents;
+
+            my $status;
+            my $buff;
+            my $zip_fn;
+
+            if (defined $z) {
+                for ($status = 1; $status > 0; $status = $z->nextStream()) {
+                    $zip_fn = lc $z->getHeaderInfo()->{Name};
+
+                    #Parse these first as they don't need handling of the contents.
+                    if ($zip_fn =~ $match_types_xml) {
+                        $pms->{nomacro_microsoft_ole2macro} = 1;
+                        last;
+                    } elsif ($zip_fn =~ $match_types or $zip_fn eq "[content_types].xml") {
+                        $processed_files_counter += 1;
+                        if ($processed_files_counter > $archived_files_process_limit) {
+                            dbg( "Stopping processing archive on file ".$z->getHeaderInfo()->{Name}.": processed files count limit reached\n" );
+                            last;
+                        }
+                        my $attachment_data = "";
+                        my $read_size = 0;
+                        while (($status = $z->read( $buff )) > 0) {
+                            $attachment_data .= $buff;
+                            $read_size += length( $buff );
+                            if ($read_size > $file_max_read_size) {
+                                dbg( "Stopping processing file ".$z->getHeaderInfo()->{Name}." in archive: processed file size overlimit\n" );
+                                last;
+                            }
+                        }
+
+                        #OOXML format
+                        if($zip_fn eq "[content_types].xml"){
+                            if($attachment_data =~ /ContentType=["']application\/vnd.ms-office.vbaProject["']/i){
+                                $pms->{nomacro_microsoft_ole2macro} = 1;
+                                last;
+                            }
+                        }else{
+                            if (_match_markers( $attachment_data )) {
+                                $pms->{nomacro_microsoft_ole2macro} = 1;
+                                last;
+                            }
+                        }
+                    }
+                }
+            }else{
+                dbg( "Unable to open ZIP file\n" );
+            }
+        } elsif ($name =~ $match_types_xml) {
+            $pms->{nomacro_microsoft_ole2macro} = 1;
+            last;
+        }
+    }
+}
+
+1;

--- a/manifests/templates.pp	Wed Jan 18 21:13:20 2017 +0000
+++ b/manifests/templates.pp	Thu Feb 09 20:54:30 2017 +0000
@@ -656,6 +656,16 @@
 		source => 'puppet:///private/postfix/amavisd.conf',
 		tag => 'av',
 	}
+	file { '/etc/mail/spamassassin/ole2macro.cf':
+		ensure => present,
+		source => 'puppet:///common/ole2macro.cf',
+		tag => 'av',
+	}
+	file { '/etc/mail/spamassassin/ole2macro.pm':
+		ensure => present,
+		source => 'puppet:///common/spamassassin-vba-macro-master/ole2macro.pm',
+		tag => 'av',
+	}
 	Package<| tag == 'av' |> -> File<| tag == 'av' |>
 	File<| tag == 'av' |> {
 		notify => Service['amavisd'],