-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Prevent exception on addresses parsing; fixes #7643 - Correctly fetch additionnal headers that may be used in rules - Fix exclusion of mailer-daemon/postmaster - Prevent exception when "Content-Transfer-Encoding" is not set; fixes #7649
- Loading branch information
1 parent
03b0d48
commit 9b6c501
Showing
4 changed files
with
224 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
Delivered-To: REDACTED-EMAIL | ||
Received: by 2002:a50:cfc3:0:0:0:0:0 with SMTP id i3csp1241712edk; | ||
Thu, 9 Jul 2020 00:07:53 -0700 (PDT) | ||
Return-Path: <REDACTED-EMAIL> | ||
Received: from REDACTED-SERVER (REDACTED-SERVER [REDACTED-IP]) | ||
by mx.google.com with ESMTPS id ck17si1268608edb.508.2020.07.09.00.07.53 | ||
for <REDACTED-EMAIL> | ||
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); | ||
Thu, 09 Jul 2020 00:07:53 -0700 (PDT) | ||
Received: from mail-lf1-f69.google.com ([REDACTED-IP]) | ||
by REDACTED-SERVER with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2020 08:07:53 +0100 | ||
Received: by mail-lf1-f69.google.com with SMTP id f8so1572484lfh.22 | ||
for <REDACTED-EMAIL>; Thu, 09 Jul 2020 00:07:52 -0700 (PDT) | ||
MIME-Version: 1.0 | ||
From: Tech (alt address) <alternative.email@glpi-project.org> | ||
Reply-To: Tech Ni Cian <tech@glpi-project.org> | ||
Date: Thu, 9 Jul 2020 08:07:40 +0100 | ||
Message-ID: <CAJjtjRxMt1T5Zv1SR6sr+XKK9-U8C4M3cpPGP5fVwvWintxwdQ@mail.gmail.com> | ||
Subject: Re: [GLPI #0038927] Update - Issues with new Windows 10 machine | ||
To: GLPI debug <unittests@glpi-project.org> | ||
Content-Type: multipart/alternative; boundary="000000000000f50df905a9fce128" | ||
|
||
--000000000000f50df905a9fce128 | ||
Content-Type: text/plain; charset="UTF-8" | ||
This message have reply to header, requester should be get from this header. | ||
--000000000000f50df905a9fce128 | ||
Content-Type: text/html; charset="UTF-8" | ||
Content-Transfer-Encoding: quoted-printable | ||
|
||
This message have reply to header, requester should be get from this header. | ||
|
||
--000000000000f50df905a9fce128-- |
85 changes: 85 additions & 0 deletions
85
tests/emails-tests/10-missing-content-transfer-encoding.eml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
From: Normal User <normal@glpi-project.org> | ||
To: GLPI debug <unittests@glpi-project.org> | ||
Subject: Test Email from Outlook | ||
Thread-Topic: Test Email from Outlook | ||
Thread-Index: AdZW2I0jVbjPDha9QGyhAGwBB3ep4A== | ||
Date: Fri, 10 Jul 2020 16:47:41 +0000 | ||
Message-ID: | ||
<DM6PR05MB5865518283B3393AA31FAEDFBC650@DM6PR05MB5865.namprd05.prod.outlook.com> | ||
Content-Language: en-US | ||
X-MS-Has-Attach: | ||
X-MS-Exchange-Organization-SCL: -1 | ||
X-MS-TNEF-Correlator: | ||
X-MS-Exchange-Organization-RecordReviewCfmType: 0 | ||
Content-Type: multipart/alternative; | ||
boundary="_000_DM6PR05MB5865518283B3393AA31FAEDFBC650DM6PR05MB5865namp_" | ||
MIME-Version: 1.0 | ||
|
||
--_000_DM6PR05MB5865518283B3393AA31FAEDFBC650DM6PR05MB5865namp_ | ||
Content-Type: text/plain; charset="us-ascii" | ||
With only text in the body, the email will not be imported and the following error will appear when forcing the retrieval by clicking the 'Get email tickets now' button on the receiver. | ||
'Uncaught Exception UnexpectedValueException: is not known in /var/www/glpi/inc/mailcollector.class.php at line 2002' | ||
--_000_DM6PR05MB5865518283B3393AA31FAEDFBC650DM6PR05MB5865namp_ | ||
Content-Type: text/html; charset="us-ascii" | ||
|
||
<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> | ||
<head> | ||
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> | ||
<meta name="Generator" content="Microsoft Word 15 (filtered medium)"> | ||
<style><!-- | ||
/* Font Definitions */ | ||
@font-face | ||
{font-family:"Cambria Math"; | ||
panose-1:2 4 5 3 5 4 6 3 2 4;} | ||
@font-face | ||
{font-family:Calibri; | ||
panose-1:2 15 5 2 2 2 4 3 2 4;} | ||
@font-face | ||
{font-family:"Segoe UI"; | ||
panose-1:2 11 5 2 4 2 4 2 2 3;} | ||
/* Style Definitions */ | ||
p.MsoNormal, li.MsoNormal, div.MsoNormal | ||
{margin:0in; | ||
margin-bottom:.0001pt; | ||
font-size:11.0pt; | ||
font-family:"Calibri",sans-serif;} | ||
a:link, span.MsoHyperlink | ||
{mso-style-priority:99; | ||
color:#0563C1; | ||
text-decoration:underline;} | ||
a:visited, span.MsoHyperlinkFollowed | ||
{mso-style-priority:99; | ||
color:#954F72; | ||
text-decoration:underline;} | ||
span.EmailStyle17 | ||
{mso-style-type:personal-compose; | ||
font-family:"Calibri",sans-serif; | ||
color:windowtext;} | ||
.MsoChpDefault | ||
{mso-style-type:export-only; | ||
font-family:"Calibri",sans-serif;} | ||
@page WordSection1 | ||
{size:8.5in 11.0in; | ||
margin:1.0in 1.0in 1.0in 1.0in;} | ||
div.WordSection1 | ||
{page:WordSection1;} | ||
--></style><!--[if gte mso 9]><xml> | ||
<o:shapedefaults v:ext="edit" spidmax="1026" /> | ||
</xml><![endif]--><!--[if gte mso 9]><xml> | ||
<o:shapelayout v:ext="edit"> | ||
<o:idmap v:ext="edit" data="1" /> | ||
</o:shapelayout></xml><![endif]--> | ||
</head> | ||
<body lang="EN-US" link="#0563C1" vlink="#954F72"> | ||
<div class="WordSection1"> | ||
<p class="MsoNormal">With only text in the body, the email will not be imported and the following error will appear when forcing the retrieval by clicking the ‘Get email tickets now’ button on the receiver.<o:p></o:p></p> | ||
<p class="MsoNormal"><o:p> </o:p></p> | ||
<p class="MsoNormal"><span style="font-size:10.5pt;font-family:"Segoe UI",sans-serif;color:#24292E;background:white">'Uncaught Exception UnexpectedValueException: is not known in /var/www/glpi/inc/mailcollector.class.php at line 2002'</span><o:p></o:p></p> | ||
</div> | ||
</body> | ||
</html> | ||
--_000_DM6PR05MB5865518283B3393AA31FAEDFBC650DM6PR05MB5865namp_-- |
Oops, something went wrong.