Mailing List Archive

Author: felicity
Date: Tue Apr 26 14:36:34 2005
New Revision: 164890

URL: http://svn.apache.org/viewcvs?rev=164890&view=rev
Log:
bug 4201: uri_to_domain() should not skip mailto URIs. the intended fix was to skip mailto in URIBL checks, but just do that in the URIDNSBL plugin instead.

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/t/uri.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=164890&r1=164889&r2=164890&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue Apr 26 14:36:34 2005
@@ -285,6 +285,7 @@
sub usable_uri_domain {
my($self, $skip_domains, $uri) = @_;

+ return if ($uri =~ /^mailto:/i);
my $dom = Mail::SpamAssassin::Util::uri_to_domain($uri);
if ($dom) {
if (exists $skip_domains->{$dom}) {

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=164890&r1=164889&r2=164890&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Tue Apr 26 14:36:34 2005
@@ -875,9 +875,6 @@
sub uri_to_domain {
my ($uri) = @_;

- return if ($uri =~ /^mailto:/i); # not mailto's, please (TODO?
- # this was commented out -- re-enabled for bug 4201
-
# Javascript is not going to help us, so return.
return if ($uri =~ /^javascript:/i);


Modified: spamassassin/trunk/t/uri.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/uri.t?rev=164890&r1=164889&r2=164890&view=diff
==============================================================================
--- spamassassin/trunk/t/uri.t (original)
+++ spamassassin/trunk/t/uri.t Tue Apr 26 14:36:34 2005
@@ -73,8 +73,7 @@
}

ok(try_domains('javascript:{some crap}', undef));
-# mailtos are now ignored by uri_to_domain (bug 4201)
-ok(try_domains('mailto:nobody@example.com', undef));
+ok(try_domains('mailto:nobody@example.com', 'example.com'));
ok(try_domains('http://66.92.69.221/', '66.92.69.221'));
ok(try_domains('http://www.spamassassin.org:8080/lists.html', 'spamassassin.org'));
ok(try_domains('http://www.spamassassin.org/lists.html#some_tag', 'spamassassin.org'));