From aa16b4af8f67d91b1bfd2c584a665a53c403f47c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 23 Dec 2009 03:01:39 -0500
Subject: [PATCH] - Improved handling of message parts of type message/rfc822 (fixed e.g. inline images in multipart/alternative messages attached as message/rfc822)
---
CHANGELOG | 1
program/include/rcube_imap.php | 58 ++++++++++++++-----
program/lib/imap.inc | 9 +-
program/include/rcube_message.php | 84 +++++++++++++++------------
4 files changed, 94 insertions(+), 58 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d5e045d..426711b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Improved handling of message parts of type message/rfc822
- Updated TinyMCE to 3.2.7
- Plugin API: added 'quota' hook
- Fix parsing conditional comments in HTML messages (#1486350)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 5e5a6e0..2408fa2 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1258,7 +1258,7 @@
*
* @access private
*/
- function &_structure_part($part, $count=0, $parent='', $raw_headers=null)
+ function &_structure_part($part, $count=0, $parent='', $mime_headers=null, $raw_headers=null)
{
$struct = new rcube_message_part;
$struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";
@@ -1280,24 +1280,37 @@
// build parts list for headers pre-fetching
for ($i=0, $count=0; $i<count($part); $i++)
- if (is_array($part[$i]) && count($part[$i]) > 3)
+ if (is_array($part[$i]) && count($part[$i]) > 3) {
// fetch message headers if message/rfc822 or named part (could contain Content-Location header)
- if (!is_array($part[$i][0]) && (strtolower($part[$i][0]) == 'message' ||
- (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) || $part[$i][3]=='NIL')))) {
- $part_headers[] = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
- }
-
+ if (!is_array($part[$i][0])) {
+ $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
+ if (strtolower($part[$i][0]) == 'message' && strtolower($part[$i][1]) == 'rfc822') {
+ $raw_part_headers[] = $tmp_part_id;
+ $mime_part_headers[] = $tmp_part_id;
+ }
+ else if (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) || $part[$i][3]=='NIL')) {
+ $mime_part_headers[] = $tmp_part_id;
+ }
+ }
+ }
+
// pre-fetch headers of all parts (in one command for better performance)
// @TODO: we could do this before _structure_part() call, to fetch
// headers for parts on all levels
- if ($part_headers)
- $part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox, $this->_msg_id, $part_headers);
+ if ($mime_part_headers)
+ $mime_part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox,
+ $this->_msg_id, $mime_part_headers);
+ // we'll need a real content-type of message/rfc822 part
+ if ($raw_part_headers)
+ $raw_part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox,
+ $this->_msg_id, $raw_part_headers, false);
$struct->parts = array();
for ($i=0, $count=0; $i<count($part); $i++)
if (is_array($part[$i]) && count($part[$i]) > 3) {
+ $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id,
- $part_headers[$struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1]);
+ $mime_part_headers[$tmp_part_id], $raw_part_headers[$tmp_part_id]);
}
return $struct;
@@ -1364,18 +1377,30 @@
// fetch message headers if message/rfc822 or named part (could contain Content-Location header)
if ($struct->ctype_primary == 'message' || ($struct->ctype_parameters['name'] && !$struct->content_id)) {
- if (empty($raw_headers))
- $raw_headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $struct->mime_id);
- $struct->headers = $this->_parse_headers($raw_headers) + $struct->headers;
- }
+ if (empty($mime_headers))
+ $mime_headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $struct->mime_id);
+ $struct->headers = $this->_parse_headers($mime_headers) + $struct->headers;
+
+ // get real headers for message of type 'message/rfc822'
+ if ($struct->mimetype == 'message/rfc822') {
+ if (empty($raw_headers))
+ $raw_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox, $this->_msg_id, (array)$struct->mime_id, false);
+ $struct->real_headers = $this->_parse_headers($raw_headers);
+
+ // get real content-type of message/rfc822
+ if (preg_match('/^([a-z0-9_\/-]+)/i', $struct->real_headers['content-type'], $matches)) {
+ $struct->real_mimetype = strtolower($matches[1]);
+ }
+ }
+ }
if ($struct->ctype_primary=='message') {
if (is_array($part[8]) && $di != 8 && empty($struct->parts))
$struct->parts[] = $this->_structure_part($part[8], ++$count, $struct->mime_id);
- }
+ }
// normalize filename property
- $this->_set_part_filename($struct, $raw_headers);
+ $this->_set_part_filename($struct, $mime_headers);
return $struct;
}
@@ -3083,6 +3108,7 @@
private function _parse_headers($headers)
{
$a_headers = array();
+ $headers = preg_replace('/\r?\n(\t| )+/', ' ', $headers);
$lines = explode("\n", $headers);
$c = count($lines);
for ($i=0; $i<$c; $i++)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 4d01348..1095a2a 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -224,12 +224,20 @@
*
* @param object rcube_message_part Message structure node
* @param bool True when called recursively
- * @param bool True when message should be parsed as message/alternative
*/
- private function parse_structure($structure, $recursive = false, $force_alternative = false)
+ private function parse_structure($structure, $recursive = false)
{
- $message_ctype_primary = strtolower($structure->ctype_primary);
- $message_ctype_secondary = strtolower($structure->ctype_secondary);
+ $message_ctype_primary = $structure->ctype_primary;
+ $message_ctype_secondary = $structure->ctype_secondary;
+ $mimetype = $structure->mimetype;
+
+ // real content-type of message/rfc822 part
+ if ($mimetype == 'message/rfc822') {
+ if ($structure->real_mimetype) {
+ $mimetype = $structure->real_mimetype;
+ list($message_ctype_primary, $message_ctype_secondary) = explode('/', $mimetype);
+ }
+ }
// show message headers
if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) {
@@ -245,28 +253,26 @@
$this->parts[] = &$structure;
}
// the same for pgp signed messages
- else if ($message_ctype_primary == 'application' && $message_ctype_secondary == 'pgp' && !$recursive) {
+ else if ($mimetype == 'application/pgp' && !$recursive) {
$structure->type = 'content';
$this->parts[] = &$structure;
}
// message contains alternative parts
- else if ($message_ctype_primary == 'multipart' && ($message_ctype_secondary == 'alternative') && is_array($structure->parts)) {
+ else if ($mimetype == 'multipart/alternative' && is_array($structure->parts)) {
// get html/plaintext parts
$plain_part = $html_part = $print_part = $related_part = null;
foreach ($structure->parts as $p => $sub_part) {
- $rel_parts = $attachmnts = null;
- $sub_ctype_primary = strtolower($sub_part->ctype_primary);
- $sub_ctype_secondary = strtolower($sub_part->ctype_secondary);
+ $sub_mimetype = $sub_part->mimetype;
- // check if sub part is
- if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='plain')
+ // check if sub part is
+ if ($sub_mimetype == 'text/plain')
$plain_part = $p;
- else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='html')
+ else if ($sub_mimetype == 'text/html')
$html_part = $p;
- else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched')
+ else if ($sub_mimetype == 'text/enriched')
$enriched_part = $p;
- else if ($sub_ctype_primary=='multipart' && in_array($sub_ctype_secondary, array('related', 'mixed', 'alternative')))
+ else if (in_array($sub_mimetype, array('multipart/related', 'multipart/mixed', 'multipart/alternative')))
$related_part = $p;
}
@@ -318,7 +324,7 @@
}
}
// this is an ecrypted message -> create a plaintext body with the according message
- else if ($message_ctype_primary == 'multipart' && $message_ctype_secondary == 'encrypted') {
+ else if ($mimetype == 'multipart/encrypted') {
$p = new stdClass;
$p->type = 'content';
$p->ctype_primary = 'text';
@@ -340,19 +346,32 @@
// iterate over parts
for ($i=0; $i < count($structure->parts); $i++) {
$mail_part = &$structure->parts[$i];
- $primary_type = strtolower($mail_part->ctype_primary);
- $secondary_type = strtolower($mail_part->ctype_secondary);
+ $primary_type = $mail_part->ctype_primary;
+ $secondary_type = $mail_part->ctype_secondary;
+
+ // real content-type of message/rfc822
+ if ($mail_part->real_mimetype) {
+ $part_orig_mimetype = $mail_part->mimetype;
+ $part_mimetype = $mail_part->real_mimetype;
+ list($primary_type, $secondary_type) = explode('/', $part_mimetype);
+ }
+ else
+ $part_mimetype = $mail_part->mimetype;
// multipart/alternative
if ($primary_type=='multipart') {
$this->parse_structure($mail_part, true);
+
+ // list message/rfc822 as attachment as well (mostly .eml)
+ if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
+ $this->attachments[] = $mail_part;
}
// part text/[plain|html] OR message/delivery-status
- else if (($primary_type == 'text' && ($secondary_type == 'plain' || $secondary_type == 'html') && $mail_part->disposition != 'attachment') ||
- ($primary_type == 'message' && ($secondary_type == 'delivery-status' || $secondary_type == 'disposition-notification'))) {
+ else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
+ $part_mimetype == 'message/delivery-status' || $part_mimetype == 'message/disposition-notification') {
// add text part if it matches the prefs
- if ((!$this->parse_alternative && !$force_alternative) ||
+ if (!$this->parse_alternative ||
($secondary_type == 'html' && $this->opt['prefer_html']) ||
($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
$mail_part->type = 'content';
@@ -365,18 +384,7 @@
}
// part message/*
else if ($primary_type=='message') {
- // let's try to find out if message/rfc822 is a multipart/alternative
- if ($secondary_type == 'rfc822' && is_array($mail_part->parts) && count($mail_part->parts) > 1) {
- $types = array();
- // iterate over parts to find its types and count them by type
- for ($j=0; $j < count($mail_part->parts); $j++) {
- $_type = strtolower($mail_part->parts[$j]->ctype_primary).'/'.strtolower($mail_part->parts[$j]->ctype_secondary);
- $types[$_type] = $types[$_type] ? $types[$_type]+1 : 1;
- }
- if ($types['text/plain'] == 1 && $types['text/html'] == 1)
- $_alternative = true;
- }
- $this->parse_structure($mail_part, true, $_alternative);
+ $this->parse_structure($mail_part, true);
// list as attachment as well (mostly .eml)
if (!empty($mail_part->filename))
@@ -387,7 +395,7 @@
continue;
// part is Microsoft Outlook TNEF (winmail.dat)
- else if ($primary_type == 'application' && $secondary_type == 'ms-tnef') {
+ else if ($part_mimetype == 'application/ms-tnef') {
foreach ((array)$this->imap->tnef_decode($mail_part, $structure->headers['uid']) as $tnef_part) {
$this->mime_parts[$tnef_part->mime_id] = $tnef_part;
$this->attachments[] = $tnef_part;
@@ -403,8 +411,8 @@
continue;
// part belongs to a related message and is linked
- if ($message_ctype_secondary == 'related'
- && preg_match('!^image/!', $mail_part->mimetype)
+ if ($mimetype == 'multipart/related'
+ && preg_match('!^image/!', $part_mimetype)
&& ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])) {
if ($mail_part->headers['content-id'])
$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
@@ -414,7 +422,7 @@
$this->inline_parts[] = $mail_part;
}
// is a regular attachment
- else if (preg_match('!^[a-z]+/[a-z0-9-.+]+$!i', $mail_part->mimetype)) {
+ else if (preg_match('!^[a-z]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
if (!$mail_part->filename)
$mail_part->filename = 'Part '.$mail_part->mime_id;
$this->attachments[] = $mail_part;
@@ -423,7 +431,7 @@
}
// if this was a related part try to resolve references
- if ($message_ctype_secondary == 'related' && sizeof($this->inline_parts)) {
+ if ($mimetype == 'multipart/related' && sizeof($this->inline_parts)) {
$a_replaces = array();
foreach ($this->inline_parts as $inline_object) {
@@ -443,7 +451,7 @@
}
}
- // message is single part non-text
+ // message is a single part non-text
else if ($structure->filename) {
$this->attachments[] = $structure;
}
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 409c262..17225c1 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -2136,7 +2136,7 @@
return (iil_ParseResult($line) == 0);
}
-function iil_C_FetchMIMEHeaders(&$conn, $mailbox, $id, $parts) {
+function iil_C_FetchMIMEHeaders(&$conn, $mailbox, $id, $parts, $mime=true) {
$fp = $conn->fp;
@@ -2149,10 +2149,11 @@
$key = 'fmh0';
$peeks = '';
$idx = 0;
+ $type = $mime ? 'MIME' : 'HEADER';
// format request
foreach($parts as $part)
- $peeks[] = "BODY.PEEK[$part.MIME]";
+ $peeks[] = "BODY.PEEK[$part.$type]";
$request = "$key FETCH $id (" . implode(' ', $peeks) . ')';
@@ -2165,9 +2166,9 @@
$line = iil_ReadLine($fp, 1000);
$line = iil_MultLine($fp, $line);
- if (preg_match('/BODY\[([0-9\.]+)\.MIME\]/', $line, $matches)) {
+ if (preg_match('/BODY\[([0-9\.]+)\.'.$type.'\]/', $line, $matches)) {
$idx = $matches[1];
- $result[$idx] = preg_replace('/^(\* '.$id.' FETCH \()?\s*BODY\['.$idx.'\.MIME\]\s+/', '', $line);
+ $result[$idx] = preg_replace('/^(\* '.$id.' FETCH \()?\s*BODY\['.$idx.'\.'.$type.'\]\s+/', '', $line);
$result[$idx] = trim($result[$idx], '"');
$result[$idx] = rtrim($result[$idx], "\t\r\n\0\x0B");
}
--
Gitblit v1.9.1