You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2010/04/17 21:46:28 UTC
svn commit: r935237 - in /spamassassin/branches/3.3:
lib/Mail/SpamAssassin/PerMsgStatus.pm t/uri_html.t t/uri_text.t
Author: sidney
Date: Sat Apr 17 19:46:27 2010
New Revision: 935237
URL: http://svn.apache.org/viewvc?rev=935237&view=rev
Log:
bug 6408 backported to branch 3.3
Modified:
spamassassin/branches/3.3/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/branches/3.3/t/uri_html.t
spamassassin/branches/3.3/t/uri_text.t
Modified: spamassassin/branches/3.3/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=935237&r1=935236&r2=935237&view=diff
==============================================================================
--- spamassassin/branches/3.3/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.3/lib/Mail/SpamAssassin/PerMsgStatus.pm Sat Apr 17 19:46:27 2010
@@ -1995,7 +1995,7 @@ sub _get_parsed_uri_list {
}
}
- if ($uri =~ /^mailto:/) {
+ if ($uri =~ /^mailto:/i) {
# skip a mail link that does not have a valid TLD or other than one @ after decoding any URLEncoded characters
$uri = Mail::SpamAssassin::Util::url_encode($uri) if ($uri =~ /\%(?:2[1-9a-fA-F]|[3-6][0-9a-fA-f]|7[0-9a-eA-E])/);
next if ($uri !~ /^[^@]+@[^@]+$/);
@@ -2005,7 +2005,7 @@ sub _get_parsed_uri_list {
push (@uris, $uri) unless ($rawuri eq $uri);
}
- next unless ($uri =~/^(?:https?|ftp):/); # at this point only valid if one or the other of these
+ next unless ($uri =~/^(?:https?|ftp):/i); # at this point only valid if one or the other of these
my @tmp = Mail::SpamAssassin::Util::uri_list_canonify($redirector_patterns, $uri);
my $goodurifound = 0;
@@ -2015,7 +2015,7 @@ sub _get_parsed_uri_list {
# bug 5780: Stop after domain to avoid FP, but do that after all deobfuscation of urlencoding and redirection
if ($rblonly) {
local $1;
- $cleanuri =~ s/^(https?:\/\/[^:\/]+).*$/$1/;
+ $cleanuri =~ s/^(https?:\/\/[^:\/]+).*$/$1/i;
}
push (@uris, $cleanuri);
$goodurifound = 1;
Modified: spamassassin/branches/3.3/t/uri_html.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/t/uri_html.t?rev=935237&r1=935236&r2=935237&view=diff
==============================================================================
--- spamassassin/branches/3.3/t/uri_html.t (original)
+++ spamassassin/branches/3.3/t/uri_html.t Sat Apr 17 19:46:27 2010
@@ -206,6 +206,12 @@ ftp://www.luzoop5k.com ftp://www.luzoop
mailto:www.luzoop5k.com mailto:www.luzoop5k.com
file://www.luzoop5k.com file://www.luzoop5k.com
+Http://www.auzoop5k.com Http://www.auzoop5k.com
+Https://www.auzoop5k.com Https://www.auzoop5k.com
+Ftp://www.auzoop5k.com Ftp://www.auzoop5k.com
+Mailto:www.auzoop5k.com Mailto:www.auzoop5k.com
+File://www.auzoop5k.com File://www.auzoop5k.com
+
# //<user>:<password>@<host>:<port>/<url-path>
http://user:pass@jiefeet4.com:80/x/y http://user:pass@jiefeet4.com:80/x/y
Modified: spamassassin/branches/3.3/t/uri_text.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/t/uri_text.t?rev=935237&r1=935236&r2=935237&view=diff
==============================================================================
--- spamassassin/branches/3.3/t/uri_text.t (original)
+++ spamassassin/branches/3.3/t/uri_text.t Sat Apr 17 19:46:27 2010
@@ -24,7 +24,7 @@ use Mail::SpamAssassin;
use vars qw(%patterns %anti_patterns);
# settings
-plan tests => 678;
+plan tests => 682;
# initialize SpamAssassin
my $sa = create_saobj({'dont_copy_prefs' => 1});
@@ -223,6 +223,12 @@ mailto:baeb1fai@quo6puyo.com mailto:baeb
http://www.luzoop5k.com http://www.luzoop5k.com
https://www.luzoop5k.com https://www.luzoop5k.com
ftp://www.luzoop5k.com ftp://www.luzoop5k.com
+
+Mailto:aaeb1fai@quo6puyo.com Mailto:aaeb1fai@quo6puyo.com
+Http://www.auzoop5k.com Http://www.auzoop5k.com
+Https://www.auzoop5k.com Https://www.auzoop5k.com
+Ftp://www.auzoop5k.com Ftp://www.auzoop5k.com
+
mailto:www.luzoop5k.com !mailto:www.luzoop5k.com
# no longer accept file: scheme
file://www.luzoop5k.com !file://www.luzoop5k.com