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 2006/07/25 23:55:55 UTC
svn commit: r425532 - in /spamassassin/branches/3.1:
lib/Mail/SpamAssassin/Util.pm t/uri.t
Author: felicity
Date: Tue Jul 25 14:55:54 2006
New Revision: 425532
URL: http://svn.apache.org/viewvc?rev=425532&view=rev
Log:
bug 5006: deal properly with redirection obfuscation and non-standard ports
Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm
spamassassin/branches/3.1/t/uri.t
Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm?rev=425532&r1=425531&r2=425532&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm Tue Jul 25 14:55:54 2006
@@ -1080,7 +1080,7 @@
}
# deal with wierd hostname parts, remove user/pass, etc.
- if ($nuri =~ m{^(https?://)([^/]+)(\/.*)?$}i) {
+ if ($nuri =~ m{^(https?://)([^/]+?)((?::\d*)?\/.*)?$}i) {
my($proto, $host, $rest) = ($1,$2,$3);
# not required
Modified: spamassassin/branches/3.1/t/uri.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/t/uri.t?rev=425532&r1=425531&r2=425532&view=diff
==============================================================================
--- spamassassin/branches/3.1/t/uri.t (original)
+++ spamassassin/branches/3.1/t/uri.t Tue Jul 25 14:55:54 2006
@@ -23,7 +23,7 @@
use Mail::SpamAssassin::HTML;
use Mail::SpamAssassin::Util;
-plan tests => 82;
+plan tests => 84;
##############################################
@@ -189,6 +189,22 @@
'http://www.nate.com/r/DM03/neverp4yretail.com/bam/?man=mic49',
'http://neverp4yretail.com/bam/?man=mic49',
'neverp4yretail.com/bam/?man=mic49',
+ ]));
+
+ok(try_canon([
+ 'http://www.google.com/pagead/iclk?sa=l&ai=Br3ycNQz5Q-fXBJGSiQLU0eDSAueHkArnhtWZAu-FmQWgjlkQAxgFKAg4AEDKEUiFOVD-4r2f-P____8BoAGyqor_A8gBAZUCCapCCqkCxU7NLQH0sz4&num=5&adurl=http://1092229727:9999/https-www.paypal.com/webscrr/index.php'
+ ], [
+ 'http://1092229727:9999/https-www.paypal.com/webscrr/index.php',
+ 'http://65.26.26.95:9999/https-www.paypal.com/webscrr/index.php',
+ 'http://www.google.com/pagead/iclk?sa=l&ai=Br3ycNQz5Q-fXBJGSiQLU0eDSAueHkArnhtWZAu-FmQWgjlkQAxgFKAg4AEDKEUiFOVD-4r2f-P____8BoAGyqor_A8gBAZUCCapCCqkCxU7NLQH0sz4&num=5&adurl=http://1092229727:9999/https-www.paypal.com/webscrr/index.php',
+ ]));
+
+ok(try_canon([
+ 'http://www.google.com/pagead/iclk?sa=l&ai=Br3ycNQz5Q-fXBJGSiQLU0eDSAueHkArnhtWZAu-FmQWgjlkQAxgFKAg4AEDKEUiFOVD-4r2f-P____8BoAGyqor_A8gBAZUCCapCCqkCxU7NLQH0sz4&num=5&adurl=http://1092229727:/https-www.paypal.com/webscrr/index.php'
+ ], [
+ 'http://1092229727:/https-www.paypal.com/webscrr/index.php',
+ 'http://65.26.26.95:/https-www.paypal.com/webscrr/index.php',
+ 'http://www.google.com/pagead/iclk?sa=l&ai=Br3ycNQz5Q-fXBJGSiQLU0eDSAueHkArnhtWZAu-FmQWgjlkQAxgFKAg4AEDKEUiFOVD-4r2f-P____8BoAGyqor_A8gBAZUCCapCCqkCxU7NLQH0sz4&num=5&adurl=http://1092229727:/https-www.paypal.com/webscrr/index.php',
]));
##############################################