You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/08/13 08:31:18 UTC
svn commit: r1865015 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Author: hege
Date: Tue Aug 13 08:31:18 2019
New Revision: 1865015
URL: http://svn.apache.org/viewvc?rev=1865015&view=rev
Log:
Skip invalid cid: "emails" in schemeless parser
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1865015&r1=1865014&r2=1865015&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm Tue Aug 13 08:31:18 2019
@@ -2406,6 +2406,11 @@ sub _get_parsed_uri_list {
$rawuri =~ s/[-~!@#^&*()_+=:;\'?,.]*$//; # remove trailing string of punctuations that TBird ignores
dbg("uri: found rawuri ($rawtype): $rawuri");
+ # Ignore cid: mid: as they can be mistaken for emails,
+ # these should not be parsed from stripped body in any case.
+ # Example: [cid:image001.png@01D4986E.E3459640]
+ next if $rawuri =~ /^[cm]id:/i;
+
# skip if there is '..' in the hostname portion of the URI, something we can't catch in the general URI regexp
next if $rawuri =~ m{^(?:(?:https?|ftp|mailto):(?://)?)?(?:[^\@/?#]*\@)?[^/?#:]*\.\.}i;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1865015&r1=1865014&r2=1865015&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Tue Aug 13 08:31:18 2019
@@ -2435,6 +2435,11 @@ sub _process_text_uri_list {
$seen{$rawuri} = 1;
dbg("uri: found rawuri from text ($rawtype): $rawuri");
+ # Ignore cid: mid: as they can be mistaken for emails,
+ # these should not be parsed from stripped body in any case.
+ # Example: [cid:image001.png@01D4986E.E3459640]
+ next if $rawuri =~ /^[cm]id:/i;
+
my $types = {parsed => 1};
# If it's a hostname that was just sitting out in the