svn commit: r169677 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Conf.pm rules/20_uri_tests.cf

[do...@apache.org]

Author: dos
Date: Wed May 11 12:14:55 2005
New Revision: 169677

URL: http://svn.apache.org/viewcvs?rev=169677&view=rev
Log:
fix redirector_patterns

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/rules/20_uri_tests.cf

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=169677&r1=169676&r2=169677&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed May 11 12:14:55 2005
@@ -1589,7 +1589,7 @@
 
 Example: http://chkpt.zdnet.com/chkpt/whatever/spammer.domain/yo/dude
 
-  redirector_pattern	/^https?://(?:opt\.)?chkpt\.zdnet\.com/chkpt/\w+/(.*)$/
+  redirector_pattern	/^https?:\/\/(?:opt\.)?chkpt\.zdnet\.com\/chkpt\/\w+\/(.*)$/
 
 =cut
 
@@ -1599,11 +1599,10 @@
     code => sub {
       my ($self, $key, $value, $line) = @_;
 
-      # strip off the leading and trailing slashes
-      # we only ask for them to be like normal rules
-      $value =~ s/^\/(.*)\/$/$1/;
-
       if (Mail::SpamAssassin::Conf::Parser->is_regexp_valid("redirector_pattern", $value)) {
+	# strip off delimiters and modifiers  TODO: include modifiers in qr
+	$value =~ s/^m?(.)(.*)(?:\1|>|}|\)|\]).*?$/$2/;
+
 	# since the regexp will never change we might as well qr it
 	$value = qr/$value/i;
 

Modified: spamassassin/trunk/rules/20_uri_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_uri_tests.cf?rev=169677&r1=169676&r2=169677&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_uri_tests.cf (original)
+++ spamassassin/trunk/rules/20_uri_tests.cf Wed May 11 12:14:55 2005
@@ -25,9 +25,9 @@
 require_version @@VERSION@@
 
 # Redirector URI patterns
-#redirector_pattern	/^http://chkpt\.zdnet\.com/chkpt/\w+/(.*)$/
-#redirector_pattern	/^http://www(?:\d+)?\.nate\.com/r/\w+/(.*)$/
-#redirector_pattern	/^http://.+\.gov/.*/?externalLink\.jhtml\?.*url=(.*?)(?:&.*)?$/
+redirector_pattern	/^http:\/\/chkpt\.zdnet\.com\/chkpt\/\w+\/(.*)$/
+redirector_pattern	/^http:\/\/www(?:\d+)?\.nate\.com\/r\/\w+\/(.*)$/
+redirector_pattern	/^http:\/\/.+\.gov\/(?:.*\/)?externalLink\.jhtml\?.*url=(.*?)(?:&.*)?$/
 
 uri NUMERIC_HTTP_ADDR		/^https?\:\/\/\d{7}/is
 describe NUMERIC_HTTP_ADDR	Uses a numeric IP address in URL