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 2004/11/16 02:50:39 UTC

svn commit: rev 75980 - in spamassassin/trunk: lib/Mail/SpamAssassin rules

Author: felicity
Date: Mon Nov 15 17:50:38 2004
New Revision: 75980

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
   spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
   spamassassin/trunk/rules/70_testing.cf
Log:
add in rules that look for large numbers of redirections in URIs

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	Mon Nov 15 17:50:38 2004
@@ -3315,4 +3315,12 @@
 
 ###########################################################################
 
+sub redirect_num {
+  my($self, undef, $min) = @_;
+  if (!defined $self->{redirect_num}) {
+    $self->get_uri_list();
+  }
+  return(defined $min ? $self->{redirect_num} >= $min : 0);
+}
+
 1;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Mon Nov 15 17:50:38 2004
@@ -1779,6 +1779,8 @@
   # the cache first. fyi.
   my $textary = $self->get_decoded_stripped_body_text_array();
 
+  $self->{redirect_num} = 0;
+
   my ($rulename, $pat, @uris);
   local ($_);
 
@@ -1832,6 +1834,10 @@
   # get domain list
   my %domains;
   for (@uris) {
+    # count redirection attempts and log it
+    if (my @http = m{\b(https?:/{0,2})}gi) {
+      $self->{redirect_num} = $#http if ($#http > $self->{redirect_num});
+    }
     my $domain = Mail::SpamAssassin::Util::uri_to_domain($_);
     $domains{$domain} = 1 if $domain;
   }

Modified: spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf	(original)
+++ spamassassin/trunk/rules/70_testing.cf	Mon Nov 15 17:50:38 2004
@@ -375,3 +375,13 @@
 
 # bug 3186
 uri T_BIZ_TLD		/^(?:https?:\/\/|mailto:)[^\/]+\.biz(?![-a-z0-9])/i
+
+# catch mails with redirector looking pieces associated with it.
+body T_REDIRS_2		eval:redirect_num('2')
+body T_REDIRS_3		eval:redirect_num('3')
+body T_REDIRS_4		eval:redirect_num('4')
+body T_REDIRS_5		eval:redirect_num('5')
+body T_REDIRS_8		eval:redirect_num('8')
+body T_REDIRS_10	eval:redirect_num('10')
+body T_REDIRS_15	eval:redirect_num('15')
+body T_REDIRS_20	eval:redirect_num('20')