You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2005/02/25 05:02:39 UTC

svn commit: r155298 - in spamassassin/trunk: lib/Mail/SpamAssassin/EvalTests.pm rules/70_testing.cf

Author: felicity
Date: Thu Feb 24 20:02:37 2005
New Revision: 155298

URL: http://svn.apache.org/viewcvs?view=rev&rev=155298
Log:
new ratware test rule

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
    spamassassin/trunk/rules/70_testing.cf

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&r1=155297&r2=155298
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Thu Feb 24 20:02:37 2005
@@ -3373,4 +3373,20 @@
   return 0;
 }
 
+sub check_ratware_envelope_from {
+  my ($self) = @_;
+
+  my $to = $self->get('To:addr');
+  my $from = $self->get('EnvelopeFrom');
+
+  return 0 unless ($to && $from);
+
+  if ($to =~ /^([^@]+)@(.+)$/) {
+    my($user,$dom) = ($1,$2);
+    return 1 if ($from =~ /\b$dom.$user@/i);
+  }
+
+  return 0;
+}
+
 1;

Modified: spamassassin/trunk/rules/70_testing.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&r1=155297&r2=155298
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf (original)
+++ spamassassin/trunk/rules/70_testing.cf Thu Feb 24 20:02:37 2005
@@ -477,3 +477,6 @@
 
 # 0.112   0.1282   0.0000    1.000   1.00    0.01  T_PHISH_MISMATCH
 body T_PHISH_MISMATCH	eval:check_phish_mismatch()
+
+# 1.886   2.1553   0.0000    1.000   1.00    0.01  T_RATWARE_EFROM3
+header T_RATWARE_EFROM	eval:check_ratware_envelope_from()