You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jq...@apache.org on 2014/11/19 15:54:00 UTC
svn commit: r1640567 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/PerMsgStatus.pm t/uri_text.t
Author: jquinn
Date: Wed Nov 19 14:53:59 2014
New Revision: 1640567
URL: http://svn.apache.org/r1640567
Log:
fixed uribl matching on email addresses with commas after them
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/t/uri_text.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1640567&r1=1640566&r2=1640567&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Nov 19 14:53:59 2014
@@ -2113,7 +2113,10 @@ my $iso2022shift = "\x1b" . '\(.'; # bu
my $tbirdenddelim = '><"`}\]{[|\s' . "\x1b"; # The \x1b as per bug 4522
my $oeignoreatend = '-~!@#^&*()_+=:;\'?,.';
my $nonASCII = '\x80-\xff';
-my $tbirdenddelimemail = $tbirdenddelim . '(\'' . $nonASCII; # tbird ignores non-ASCII mail addresses for now, until RFC changes
+
+# bug 7100: we allow a comma to delimit the end of an email address because it will never appear in a domain name, and
+# it's a common thing to find in text
+my $tbirdenddelimemail = $tbirdenddelim . ',(\'' . $nonASCII; # tbird ignores non-ASCII mail addresses for now, until RFC changes
my $tbirdenddelimplusat = $tbirdenddelimemail . '@';
# valid TLDs
Modified: spamassassin/trunk/t/uri_text.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/uri_text.t?rev=1640567&r1=1640566&r2=1640567&view=diff
==============================================================================
--- spamassassin/trunk/t/uri_text.t (original)
+++ spamassassin/trunk/t/uri_text.t Wed Nov 19 14:53:59 2014
@@ -24,7 +24,7 @@ use Mail::SpamAssassin;
use vars qw(%patterns %anti_patterns);
# settings
-plan tests => 682;
+plan tests => 683;
# initialize SpamAssassin
my $sa = create_saobj({'dont_copy_prefs' => 1});
@@ -285,6 +285,9 @@ donotignorethiswww.delimtest14.com donot
.....http://www.delimtest18.com.......... ^http://www.delimtest18.com$
-----http://www.delimtest19.com---------- ^http://www.delimtest19.com$
+# emails with a comma at the end
+test@delimtest20.com,stuff stuff delimtest20.com
+
# check all the TLDs (might as well be thorough)
# the inactive TLDs have negative checks