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 2018/10/25 08:32:57 UTC
svn commit: r1844813 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/
trunk/lib/Mail/SpamAssassin/Plugin/
Author: hege
Date: Thu Oct 25 08:32:57 2018
New Revision: 1844813
URL: http://svn.apache.org/viewvc?rev=1844813&view=rev
Log:
Call test_log instead of got_hit description suffix hackery
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Phishing.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm?rev=1844813&r1=1844812&r2=1844813&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm Thu Oct 25 08:32:57 2018
@@ -419,11 +419,10 @@ sub _got_hit {
if ($pms->{main}->{conf}->{freemail_add_describe_email}) {
$email =~ s/\@/[at]/g;
- $pms->got_hit($rulename, "", description => $desc." ($email)", ruletype => 'eval');
- }
- else {
- $pms->got_hit($rulename, "", description => $desc, ruletype => 'eval');
+ $pms->test_log($email);
}
+
+ $pms->got_hit($rulename, "", description => $desc, ruletype => 'eval');
}
sub check_freemail_header {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm?rev=1844813&r1=1844812&r2=1844813&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm Thu Oct 25 08:32:57 2018
@@ -173,14 +173,11 @@ sub _parse_body {
}
sub _got_hit {
- my ($self, $pms, $rulename, $email, $desc) = @_;
-
- if (defined $pms->{conf}->{descriptions}->{$rulename}) {
- $desc = $pms->{conf}->{descriptions}->{$rulename};
- }
+ my ($self, $pms, $rulename, $email) = @_;
$email =~ s/\@/[at]/g;
- $pms->got_hit($rulename, "", description => $desc." ($email)", ruletype => 'eval');
+ $pms->test_log($email);
+ $pms->got_hit($rulename, "", ruletype => 'eval');
}
sub _submit_email_query {
@@ -262,7 +259,6 @@ sub check_hashbl_emails {
$#emails = 9 if (scalar @emails > 10);
foreach my $email (@emails) {
- #$self->_got_hit($pms, $email, "Email found in list $list");
dbg("BODY: $email");
$self->_submit_email_query($pms, $list, (($type) ? $type : 'SHA1'), $email);
}
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Phishing.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Phishing.pm?rev=1844813&r1=1844812&r2=1844813&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Phishing.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Phishing.pm Thu Oct 25 08:32:57 2018
@@ -170,15 +170,11 @@ sub _read_configfile {
sub check_phishing {
my ($self, $pms) = @_;
- my $desc;
my $feedname;
my $domain;
my $uris = $pms->get_uri_detail_list();
my $rulename = $pms->get_current_eval_rule_name();
- if (defined $pms->{conf}->{descriptions}->{$rulename}) {
- $desc = $pms->{conf}->{descriptions}->{$rulename};
- }
while (my($uri, $info) = each %{$uris}) {
# we want to skip mailto: uris
@@ -194,7 +190,8 @@ sub check_phishing {
$domain = $self->{main}->{registryboundaries}->uri_to_domain($cluri);
$feedname = $pms->{PHISHING}->{phishinfo}->{$domain}[0];
dbg("HIT! $domain [$cluri] found in $feedname feed");
- $pms->got_hit($rulename, "", description => $desc . " $feedname ($domain)", ruletype => 'eval');
+ $pms->test_log("$feedname ($domain)");
+ $pms->got_hit($rulename, "", ruletype => 'eval');
return 1;
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm?rev=1844813&r1=1844812&r2=1844813&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm Thu Oct 25 08:32:57 2018
@@ -419,11 +419,10 @@ sub _got_hit {
if ($pms->{main}->{conf}->{freemail_add_describe_email}) {
$email =~ s/\@/[at]/g;
- $pms->got_hit($rulename, "", description => $desc." ($email)", ruletype => 'eval');
- }
- else {
- $pms->got_hit($rulename, "", description => $desc, ruletype => 'eval');
+ $pms->test_log($email);
}
+
+ $pms->got_hit($rulename, "", description => $desc, ruletype => 'eval');
}
sub check_freemail_header {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm?rev=1844813&r1=1844812&r2=1844813&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm Thu Oct 25 08:32:57 2018
@@ -174,14 +174,11 @@ sub _parse_body {
}
sub _got_hit {
- my ($self, $pms, $rulename, $email, $desc) = @_;
-
- if (defined $pms->{conf}->{descriptions}->{$rulename}) {
- $desc = $pms->{conf}->{descriptions}->{$rulename};
- }
+ my ($self, $pms, $rulename, $email) = @_;
$email =~ s/\@/[at]/g;
- $pms->got_hit($rulename, "", description => $desc." ($email)", ruletype => 'eval');
+ $pms->test_log($email);
+ $pms->got_hit($rulename, "", ruletype => 'eval');
}
sub _submit_email_query {
@@ -262,7 +259,6 @@ sub check_hashbl_emails {
$#emails = 9 if (scalar @emails > 10);
foreach my $email (@emails) {
- #$self->_got_hit($pms, $email, "Email found in list $list");
dbg("BODY: $email");
$self->_submit_email_query($pms, $list, (($type) ? $type : 'SHA1'), $email);
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm?rev=1844813&r1=1844812&r2=1844813&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Phishing.pm Thu Oct 25 08:32:57 2018
@@ -170,15 +170,11 @@ sub _read_configfile {
sub check_phishing {
my ($self, $pms) = @_;
- my $desc;
my $feedname;
my $domain;
my $uris = $pms->get_uri_detail_list();
my $rulename = $pms->get_current_eval_rule_name();
- if (defined $pms->{conf}->{descriptions}->{$rulename}) {
- $desc = $pms->{conf}->{descriptions}->{$rulename};
- }
while (my($uri, $info) = each %{$uris}) {
# we want to skip mailto: uris
@@ -194,7 +190,8 @@ sub check_phishing {
$domain = $self->{main}->{registryboundaries}->uri_to_domain($cluri);
$feedname = $pms->{PHISHING}->{phishinfo}->{$domain}[0];
dbg("HIT! $domain [$cluri] found in $feedname feed");
- $pms->got_hit($rulename, "", description => $desc . " $feedname ($domain)", ruletype => 'eval');
+ $pms->test_log("$feedname ($domain)");
+ $pms->got_hit($rulename, "", ruletype => 'eval');
return 1;
}
}