You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/05/19 15:43:41 UTC
svn commit: r1901067 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf/Parser.pm Plugin/DNSEval.pm Plugin/HashBL.pm
Author: hege
Date: Thu May 19 15:43:41 2022
New Revision: 1901067
URL: http://svn.apache.org/viewvc?rev=1901067&view=rev
Log:
Automatically adjust priority -100 for tflags net rules
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1901067&r1=1901066&r2=1901067&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Thu May 19 15:43:41 2022
@@ -909,7 +909,10 @@ sub finish_parsing {
while (my ($name, $text) = each %{$conf->{tests}}) {
my $type = $conf->{test_types}->{$name};
- my $priority = $conf->{priority}->{$name} || 0;
+
+ # Adjust priority -100 for net rules instead of default 0
+ my $priority = $conf->{priority}->{$name} ? $conf->{priority}->{$name} :
+ ($conf->{tflags}->{$name}||'') =~ /\bnet\b/ ? -100 : 0;
$conf->{priorities}->{$priority}++;
# eval type handling
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm?rev=1901067&r1=1901066&r2=1901067&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm Thu May 19 15:43:41 2022
@@ -148,20 +148,6 @@ sub set_config {
$conf->{parser}->register_commands(\@cmds);
}
-sub finish_parsing_start {
- my ($self, $opts) = @_;
- my $conf = $opts->{conf};
-
- # Adjust priority -100 to launch early
- # Find rulenames from eval_to_rule mappings
- foreach my $evalfunc (@{$self->{'evalrules'}}) {
- foreach (@{$conf->{eval_to_rule}->{$evalfunc}||[]}) {
- dbg("dnseval: adjusting rule $_ priority to -100");
- $conf->{priority}->{$_} = -100;
- }
- }
-}
-
# this is necessary because PMS::run_rbl_eval_tests() calls these functions
# directly as part of PMS
sub check_start {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm?rev=1901067&r1=1901066&r2=1901067&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm Thu May 19 15:43:41 2022
@@ -382,20 +382,6 @@ sub parse_config {
return 0;
}
-sub finish_parsing_start {
- my ($self, $opts) = @_;
- my $conf = $opts->{conf};
-
- # Adjust priority -100 to launch early
- # Find rulenames from eval_to_rule mappings
- foreach my $evalfunc (%{$self->{evalfuncs}}) {
- foreach (@{$conf->{eval_to_rule}->{$evalfunc}||[]}) {
- dbg("adjusting rule $_ priority to -100");
- $conf->{priority}->{$_} = -100;
- }
- }
-}
-
sub finish_parsing_end {
my ($self, $opts) = @_;