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 23:46:28 UTC

svn commit: r155375 - spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Author: felicity
Date: Fri Feb 25 14:46:27 2005
New Revision: 155375

URL: http://svn.apache.org/viewcvs?view=rev&rev=155375
Log:
more obfu work, avoid FP in anti-phish test rule

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&r1=155374&r2=155375
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Fri Feb 25 14:46:27 2005
@@ -3291,10 +3291,11 @@
         'a' => '[a@]',
         'e' => '[e3]',
         'o' => '[o0]',
-        'i' => '[il1|]',
-        'l' => '[l1|]',
+        'i' => '[il1|!]',
+        'l' => '[l1|!]',
         'u' => '[uv]',
         'v' => '(?:v|\\\/)',
+	'x' => '(?:x|><)',
   );
 
   sub check_obfu_word {
@@ -3314,7 +3315,7 @@
 
         # turn "foo" into "f\W*o\W*o" to match interuptus
         if (@list) {
-          $new .= "$_\\W*";
+          $new .= $_.'{1,3}\W{0,3}';
         }
         else {
           # mad skillz yo
@@ -3364,9 +3365,11 @@
   my ($self) = @_;
 
   while (my($k,$v) = each %{$self->{html}->{uri_anchor_index}}) {
-    next unless ($k =~ m%^https?:/*(?:[^@]+@)?[0-9.]+%i);
+    next if ($k !~ m%^https?:/*(?:[^\@/]+\@)?\d+\.\d+\.\d+\.\d+%i);
     foreach (@{$v}) {
-      return 1 if ($self->{html}->{anchor}->[$_] =~ m%^https:/*(?:[^@]+@)?\D%i);
+      $_ = $self->{html}->{anchor}->[$_];
+      next if (m%^https:/*(?:[^\@/]+\@)?\d+\.\d+\.\d+\.\d+%i);
+      return 1 if (m%https:%i);
     }
   }