svn commit: r1845004 - in /spamassassin/trunk: UPGRADE lib/Mail/SpamAssassin/Conf.pm

[he...@apache.org]

Author: hege
Date: Sun Oct 28 09:50:58 2018
New Revision: 1845004

URL: http://svn.apache.org/viewvc?rev=1845004&view=rev
Log:
Cleanup dns_block_rule

Modified:
    spamassassin/trunk/UPGRADE
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm

Modified: spamassassin/trunk/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/UPGRADE?rev=1845004&r1=1845003&r2=1845004&view=diff
==============================================================================
--- spamassassin/trunk/UPGRADE (original)
+++ spamassassin/trunk/UPGRADE Sun Oct 28 09:50:58 2018
@@ -28,7 +28,8 @@ Note for Users Upgrading to SpamAssassin
   that refer to check_rbl* or other network rules. They will never hit.
   (Bug 5930)
 
-- new plugin callback method check_dnsbl (to launch lookups at priority -100)
+- new plugin callback method check_dnsbl (to launch lookups at priority -100),
+  check_post_dnsbl (to harvest own network lookups)
 
 - freemail_import_whitelist_auth, freemail_import_def_whitelist_auth added (Bug 6451)
 
@@ -70,9 +71,11 @@ Note for Users Upgrading to SpamAssassin
   filter (pypolicyd-spf / spf-engine etc), from which generated Received-SPF
   header can be parsed by SpamAssassin.
 
-- ALL pseudo-header now returns decoded headers, so it's usage is consistent
+- "ALL" pseudo-header now returns decoded headers, so it's usage is consistent
   with single header matching (:raw returns undecoded and folded like before).
 
+- New dns_block_rule option handles blocked DNSBLs
+
 Note for Users Upgrading to SpamAssassin 3.4.2
 ----------------------------------------------
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1845004&r1=1845003&r2=1845004&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Sun Oct 28 09:50:58 2018
@@ -1985,6 +1985,7 @@ home_dir_for_helpers/.spamassassin, $HOM
     type => $CONF_TYPE_STRING,
     code => sub {
       my ($self, $key, $value, $line) = @_;
+      local($1,$2);
       defined $value && $value =~ /^(\S+)\s+(.+)$/
         or return $INVALID_VALUE;
       my $rule = $1;
@@ -1993,8 +1994,9 @@ home_dir_for_helpers/.spamassassin, $HOM
         if ($domain !~ /^[a-z0-9.-]+$/) {
           return $INVALID_VALUE;
         }
-        $domain = untaint_var($domain); # will be in filename!
-        # got_hit() uses this
+        # will end up in filename, do not allow / etc in above regex!
+        $domain = untaint_var($domain);
+        # Check.pm check_main() uses this
         $self->{dns_block_rule}{$rule}{$domain} = 1;
         # bgsend_and_start_lookup() uses this
         $self->{dns_block_rule_domains}{$domain} = $domain;
@@ -2011,7 +2013,7 @@ dns_block_rule query blockage will last
   push (@cmds, {
     setting => 'dns_block_time',
     is_admin => 1,
-    default => 60,
+    default => 300,
     type => $CONF_TYPE_NUMERIC,
   });