From 15f5528d57cc8c6ed567fc7d0da0a44f5321f2fa Mon Sep 17 00:00:00 2001 From: Alex Dehnert Date: Mon, 17 Jul 2023 05:24:52 +0000 Subject: [PATCH] New upstream (probably) config changes --- init.pre | 4 ---- local.cf | 33 +++++++++++++++++++++++++++++++-- v342.pre | 7 ++----- v343.pre | 25 +++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 v343.pre diff --git a/init.pre b/init.pre index a330bad..f9ee06a 100644 --- a/init.pre +++ b/init.pre @@ -26,10 +26,6 @@ # loadplugin Mail::SpamAssassin::Plugin::URIDNSBL -# Hashcash - perform hashcash verification. -# -loadplugin Mail::SpamAssassin::Plugin::Hashcash - # SPF - perform SPF verification. # loadplugin Mail::SpamAssassin::Plugin::SPF diff --git a/local.cf b/local.cf index cfe12b2..72605b2 100644 --- a/local.cf +++ b/local.cf @@ -7,6 +7,11 @@ # ########################################################################### +# A 'contact address' users should contact for more info. (replaces +# _CONTACTADDRESS_ in the report template) +# report_contact youremailaddress@domain.tld + + # Add *****SPAM***** to the Subject header of spam e-mails # # rewrite_header Subject *****SPAM***** @@ -15,7 +20,7 @@ # Save spam messages as a message/rfc822 MIME attachment instead of # modifying the original message (0: off, 2: use text/plain instead) # -report_safe 0 +# report_safe 1 # Set which networks or hosts are considered 'trusted' by your mail @@ -66,6 +71,27 @@ endif whitelist_from SpamQuarantine@mit.edu +# Whether to decode non- UTF-8 and non-ASCII textual parts and recode +# them to UTF-8 before the text is given over to rules processing. +# +# normalize_charset 1 + +# Textual body scan limit (default: 50000) +# +# Amount of data per email text/* mimepart, that will be run through body +# rules. This enables safer and faster scanning of large messages, +# perhaps having very large textual attachments. There should be no need +# to change this well tested default. +# +# body_part_scan_size 50000 + +# Textual rawbody data scan limit (default: 500000) +# +# Amount of data per email text/* mimepart, that will be run through +# rawbody rules. +# +# rawbody_part_scan_size 500000 + # Some shortcircuiting, if the plugin is enabled # ifplugin Mail::SpamAssassin::Plugin::Shortcircuit @@ -74,6 +100,10 @@ ifplugin Mail::SpamAssassin::Plugin::Shortcircuit # shortcircuiting plugin is active, causing early exit to save CPU load. # Uncomment to turn this on # +# SpamAssassin tries hard not to launch DNS queries before priority -100. +# If you want to shortcircuit without launching unneeded queries, make +# sure such rule priority is below -100. These examples are already: +# # shortcircuit USER_IN_WHITELIST on # shortcircuit USER_IN_DEF_WHITELIST on # shortcircuit USER_IN_ALL_SPAM_TO on @@ -96,4 +126,3 @@ ifplugin Mail::SpamAssassin::Plugin::Shortcircuit # shortcircuit BAYES_00 ham endif # Mail::SpamAssassin::Plugin::Shortcircuit - diff --git a/v342.pre b/v342.pre index 4ab7736..8e0fb07 100644 --- a/v342.pre +++ b/v342.pre @@ -3,7 +3,7 @@ # See 'perldoc Mail::SpamAssassin::Conf' for details of what can be # tweaked. # -# This file was installed during the installation of SpamAssassin 3.4.1, +# This file was installed during the installation of SpamAssassin 3.4.2, # and contains plugin loading commands for the new plugins added in that # release. It will not be overwritten during future SpamAssassin installs, # so you can modify it to enable some disabled-by-default plugins below, @@ -16,14 +16,13 @@ # added to new files, named according to the release they're added in. ########################################################################### -# HashBL - Use EBL email blocklist +# HashBL - Query hashed/unhashed strings, emails, uris etc from DNS lists # loadplugin Mail::SpamAssassin::Plugin::HashBL # ResourceLimits - assure your spamd child processes # do not exceed specified CPU or memory limit # loadplugin Mail::SpamAssassin::Plugin::ResourceLimits - # FromNameSpoof - help stop spam that tries to spoof other domains using # the from name # loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof @@ -32,5 +31,3 @@ # OpenPhish or PhishTank feeds. # loadplugin Mail::SpamAssassin::Plugin::Phishing -# allow URI rules to look at DKIM headers if they exist -parse_dkim_uris 1 diff --git a/v343.pre b/v343.pre new file mode 100644 index 0000000..e9bb767 --- /dev/null +++ b/v343.pre @@ -0,0 +1,25 @@ +# This is the right place to customize your installation of SpamAssassin. +# +# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be +# tweaked. +# +# This file was installed during the installation of SpamAssassin 3.4.3, +# and contains plugin loading commands for the new plugins added in that +# release. It will not be overwritten during future SpamAssassin installs, +# so you can modify it to enable some disabled-by-default plugins below, +# if you so wish. +# +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. +########################################################################### + +# OLEVBMacro - Detects both OLE macros and VB code inside Office documents +# +# It tries to discern between safe and malicious code but due to the threat +# macros present to security, many places block these type of documents outright. +# +# For this plugin to work, Archive::Zip and IO::String modules are required. +# loadplugin Mail::SpamAssassin::Plugin::OLEVBMacro -- 2.34.1