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 2021/04/06 14:17:00 UTC
svn commit: r1888440 - in /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin:
HashBL.pm URIDNSBL.pm
Author: hege
Date: Tue Apr 6 14:17:00 2021
New Revision: 1888440
URL: http://svn.apache.org/viewvc?rev=1888440&view=rev
Log:
Revert Revisions 1878575,1878574 while working with Bug 7897
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm?rev=1888440&r1=1888439&r2=1888440&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm Tue Apr 6 14:17:00 2021
@@ -453,7 +453,6 @@ sub check_hashbl_emails {
my $max = $opts =~ /\bmax=(\d+)\b/ ? $1 : 10;
$#filtered_emails = $max-1 if scalar @filtered_emails > $max;
- $pms->{hashbl_emails_count}{$rulename} = scalar @filtered_emails;
foreach my $email (@filtered_emails) {
$self->_submit_query($pms, $rulename, $email, $list, $opts, $subtest);
}
@@ -678,28 +677,9 @@ sub _finish_query {
if ($rr->address =~ $dnsmatch) {
dbg("$rulename: $ent->{zone} hit '$ent->{value}'");
$ent->{value} =~ s/\@/[at]/g;
- # Hit now if only one query exists, otherwise call hits at scan end
- if ((defined $pms->{hashbl_emails_count}{$rulename}) and ($pms->{hashbl_emails_count}{$rulename} == 1)) {
- $pms->test_log($ent->{value});
- $pms->got_hit($rulename, '', ruletype => 'eval');
- } else {
- push @{$pms->{hashbl_emails_hits}{$rulename}}, $ent->{value};
- }
- return;
- }
- }
-}
-
-sub check_cleanup {
- my ($self, $opts) = @_;
-
- my $pms = $opts->{permsgstatus};
-
- # Call any remaining hits
- if (exists $pms->{hashbl_emails_hits}) {
- foreach my $rulename (keys %{$pms->{hashbl_emails_hits}}) {
- $pms->test_log(join(', ', sort @{$pms->{hashbl_emails_hits}{$rulename}}));
+ $pms->test_log($ent->{value});
$pms->got_hit($rulename, '', ruletype => 'eval');
+ return;
}
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1888440&r1=1888439&r2=1888440&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue Apr 6 14:17:00 2021
@@ -1124,24 +1124,17 @@ sub got_dnsbl_hit {
$str =~ s/\s+/ /gs; # long whitespace => short
dbg("uridnsbl: domain \"$ent->{domain}\" listed ($rulename): $str");
- # Hits are saved and called in check_cleanup
+ $pms->{uridnsbl_hits}->{$rulename}->{$ent->{domain}} = 1;
+
+ # TODO: this needs to handle multiple domain hits per rule
+ $pms->clear_test_state();
+ #my $uris = join(' ', keys %{$pms->{uridnsbl_hits}->{$rulename}});
if (defined $ent->{orig_domain}) {
- $pms->{uridnsbl_hits}->{$rulename}->{"$ent->{orig_domain}/$ent->{domain}"} = 1;
+ $pms->test_log("URIs: $ent->{orig_domain}/$ent->{domain}");
} else {
- $pms->{uridnsbl_hits}->{$rulename}->{"$ent->{domain}"} = 1;
- }
-}
-
-sub check_cleanup {
- my ($self, $opts) = @_;
-
- my $pms = $opts->{permsgstatus};
-
- # Call any remaining hits
- foreach my $rulename (keys %{$pms->{uridnsbl_hits}}) {
- $pms->test_log("URIs: ".join(', ', sort keys %{$pms->{uridnsbl_hits}->{$rulename}}));
- $pms->got_hit($rulename, '', ruletype => 'eval');
+ $pms->test_log("URIs: $ent->{domain}");
}
+ $pms->got_hit($rulename, '', ruletype => 'eval');
}
# ---------------------------------------------------------------------------