holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: Fix contents of emails with long header fields get disturbed while importing them into mail app

Browse Source
This commit is contained in:
Hadi Nategh 2017-06-07 11:04:02 +02:00
parent bd8dd18b12
commit 6aed0bd0bf
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
api/src/Mail.php
View File

@ -6994,6 +6994,54 @@ class Mail
fclose($message);
}
/**
* Check and fix headers of raw message for headers with line width
* more than 998 chars per line, as none folding long headers might
* break the mail content. RFC 2822 (2.2.3 Long Header fields)
* https://www.ietf.org/rfc/rfc2822.txt
*
* @param string|resource $message
* @return string
*/
static private function _checkAndfixLongHeaderFields($message)
{
$eol = Horde_Mime_Part::RFC_EOL.Horde_Mime_Part::RFC_EOL;
$needsFix = false;
if (is_resource($message))
{
fseek($message, 0, SEEK_SET);
$m = '';
while (!feof($message)) {
$m .= fread($message, 8192);
}
$message = $m;
}
if (is_string($message))
{
$start = substr($message,0, strpos($message, $eol));
$body = substr($message, strlen($start));
$hlength = strpos($start, $eol) ? strpos($start, $eol) : strlen($start);
$headers = Horde_Mime_Headers::parseHeaders(substr($start, 0,$hlength));
foreach($headers->toArray() as $header => $value)
{
$needsReplacement = false;
foreach((array)$value as &$val)
{
if (strlen($val) > 998)
{
$needsReplacement = $needsFix = true;
}
}
if ($needsReplacement) {
$headers->removeHeader($header);
$headers->addHeader($header, $value);
}
}
}
return $needsFix ? ($headers->toString(array('canonical'=>true)).$body) : $message;
}
/**
* Parses a message/rfc mail from file to the mailobject
*
@ -7006,6 +7054,9 @@ class Mail
{
if (is_string($message) || is_resource($message))
{
// Check and fix long header fields
$message = self::_checkAndfixLongHeaderFields($message);
$structure = Horde_Mime_Part::parseMessage($message);
//error_log(__METHOD__.__LINE__.'#'.$structure->getPrimaryType().'#');
if ($force8bitOnPrimaryPart&&$structure->getPrimaryType()=='text')