From cd219a45dd64d7d6916656e5e1b3a4ead68974c2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 18 Dec 2015 05:42:05 -0500
Subject: [PATCH] Fix regression where some message attachments could be missing on edit/forward (#1490608)
---
program/steps/mail/func.inc | 220 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 178 insertions(+), 42 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 3f8277c..5436368 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -78,11 +78,12 @@
// set current mailbox and some other vars in client environment
$OUTPUT->set_env('mailbox', $mbox_name);
$OUTPUT->set_env('pagesize', $RCMAIL->storage->get_pagesize());
+ $OUTPUT->set_env('current_page', max(1, $_SESSION['page']));
$OUTPUT->set_env('delimiter', $delimiter);
$OUTPUT->set_env('threading', $threading);
$OUTPUT->set_env('threads', $threading || $RCMAIL->storage->get_capability('THREAD'));
$OUTPUT->set_env('reply_all_mode', (int) $RCMAIL->config->get('reply_all_mode'));
- $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));
+ $OUTPUT->set_env('preview_pane_mark_read', (int) $RCMAIL->config->get('preview_pane_mark_read'));
if ($RCMAIL->storage->get_capability('QUOTA')) {
$OUTPUT->set_env('quota', true);
@@ -125,6 +126,7 @@
'messagecontentframe' => 'rcmail_messagecontent_frame',
'messageimportform' => 'rcmail_message_import_form',
'searchfilter' => 'rcmail_search_filter',
+ 'searchinterval' => 'rcmail_search_interval',
'searchform' => array($OUTPUT, 'search_form'),
));
@@ -162,9 +164,11 @@
$mbox = strlen($_SESSION['mbox']) ? $_SESSION['mbox'] : 'INBOX';
}
- if ($RCMAIL->action == 'list') {
+ // we handle 'page' argument on 'list' and 'getunread' to prevent from
+ // race condition and unintentional page overwrite in session
+ if ($RCMAIL->action == 'list' || $RCMAIL->action == 'getunread') {
if (!($page = intval($_GET['_page']))) {
- $page = $_SESSION['page'] ? $_SESSION['page'] : 1;
+ $page = $_SESSION['page'] ?: 1;
}
$_SESSION['page'] = $page;
@@ -175,7 +179,7 @@
// set default sort col/order to session
if (!isset($_SESSION['sort_col'])) {
- $_SESSION['sort_col'] = $message_sort_col ? $message_sort_col : '';
+ $_SESSION['sort_col'] = $message_sort_col ?: '';
}
if (!isset($_SESSION['sort_order'])) {
$_SESSION['sort_order'] = strtoupper($message_sort_order) == 'ASC' ? 'ASC' : 'DESC';
@@ -453,6 +457,8 @@
}
}
+ $sort_col = $_SESSION['sort_col'];
+
// loop through message headers
foreach ($a_headers as $header) {
if (empty($header))
@@ -483,7 +489,7 @@
else if ($col == 'size')
$cont = $RCMAIL->show_bytes($header->$col);
else if ($col == 'date')
- $cont = $RCMAIL->format_date($header->date);
+ $cont = $RCMAIL->format_date($sort_col == 'arrival' ? $header->internaldate : $header->date);
else if ($col == 'folder') {
if ($last_folder !== $header->folder) {
$last_folder = $header->folder;
@@ -588,8 +594,9 @@
}
foreach ($a_show_cols as $col) {
- $label = '';
+ $label = '';
$sortable = false;
+ $rel_col = $col == 'date' && $sort_col == 'arrival' ? 'arrival' : $col;
// get column name
switch ($col) {
@@ -607,11 +614,11 @@
$col_name = $list_menu;
break;
case 'fromto':
- $label = $RCMAIL->gettext($smart_col);
+ $label = $RCMAIL->gettext($smart_col);
$col_name = rcube::Q($label);
break;
default:
- $label = $RCMAIL->gettext($col);
+ $label = $RCMAIL->gettext($col);
$col_name = rcube::Q($label);
}
@@ -621,7 +628,7 @@
$col_name = html::a(array(
'href' => "./#sort",
'class' => 'sortcol',
- 'rel' => $col,
+ 'rel' => $rel_col,
'title' => $RCMAIL->gettext('sortby')
), $col_name);
}
@@ -629,7 +636,7 @@
$col_name = '<span class="' . $col .'">' . $col_name . '</span>';
}
- $sort_class = $col == $sort_col && !$disabled_order ? " sorted$sort_order" : '';
+ $sort_class = $rel_col == $sort_col && !$disabled_order ? " sorted$sort_order" : '';
$class_name = $col.$sort_class;
// put it all together
@@ -770,7 +777,7 @@
// get default addressbook, like in addcontact.inc
$CONTACTS = $RCMAIL->get_address_book(-1, true);
- if ($CONTACTS) {
+ if ($CONTACTS && $message->sender['mailto']) {
$result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
if ($result->count) {
$message->set_safe(true);
@@ -947,6 +954,13 @@
break;
case 'style':
+ // Crazy big styles may freeze the browser (#1490539)
+ // remove content with more than 5k lines
+ if (substr_count($content, "\n") > 5000) {
+ $out = '';
+ break;
+ }
+
// decode all escaped entities and reduce to ascii strings
$stripped = preg_replace('/[^a-zA-Z\(:;]/', '', rcube_utils::xss_entity_decode($content));
@@ -1190,7 +1204,16 @@
// unsupported (e.g. encrypted)
if ($part->realtype) {
if ($part->realtype == 'multipart/encrypted' || $part->realtype == 'application/pkcs7-mime') {
- $out .= html::span('part-notice', $RCMAIL->gettext('encryptedmessage'));
+ if (!empty($_SESSION['browser_caps']['pgpmime']) && ($pgp_mime_part = $MESSAGE->get_multipart_encrypted_part())) {
+ $out .= html::span('part-notice', $RCMAIL->gettext('externalmessagedecryption'));
+ $OUTPUT->set_env('pgp_mime_part', $pgp_mime_part->mime_id);
+ $OUTPUT->set_env('pgp_mime_container', '#' . $attrib['id']);
+ $OUTPUT->add_label('loadingdata');
+ }
+
+ if (!$MESSAGE->encrypted_part) {
+ $out .= html::span('part-notice', $RCMAIL->gettext('encryptedmessage'));
+ }
}
continue;
}
@@ -1210,18 +1233,14 @@
// fetch part body
$body = $MESSAGE->get_part_body($part->mime_id, true);
- // extract headers from message/rfc822 parts
- if ($part->mimetype == 'message/rfc822') {
- $msgpart = rcube_mime::parse_message($body);
- if (!empty($msgpart->headers)) {
- $part = $msgpart;
- $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
- }
- }
-
// message is cached but not exists (#1485443), or other error
if ($body === false) {
rcmail_message_error($MESSAGE->uid);
+ }
+
+ // check if the message body is PGP encrypted
+ if (strpos($body, '-----BEGIN PGP MESSAGE-----') !== false) {
+ $OUTPUT->set_env('is_pgp_content', '#message-part' . ($part_no + 1));
}
$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix',
@@ -1244,8 +1263,11 @@
$out .= html::div($div_attr, $plugin['prefix'] . $body);
}
- else
- $out .= html::div('message-part', $plugin['prefix'] . $body);
+ else {
+ $container_id = 'message-part' . (++$part_no);
+ $div_attr = array('class' => 'message-part', 'id' => $container_id);
+ $out .= html::div($div_attr, $plugin['prefix'] . $body);
+ }
}
}
}
@@ -1603,7 +1625,7 @@
$content = rcube::Q($name ? sprintf('%s <%s>', $name, $mailto) : $mailto);
}
else {
- $content = rcube::Q($name ? $name : $mailto);
+ $content = rcube::Q($name ?: $mailto);
$attrs['title'] = $mailto;
}
@@ -1611,7 +1633,7 @@
}
else {
$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
- rcube::Q($name ? $name : $mailto));
+ rcube::Q($name ?: $mailto));
}
if ($addicon && $_SESSION['writeable_abook']) {
@@ -2008,8 +2030,9 @@
{
global $RCMAIL;
- if (!strlen($attrib['id']))
+ if (!strlen($attrib['id'])) {
$attrib['id'] = 'rcmlistfilter';
+ }
$attrib['onchange'] = rcmail_output::JS_OBJECT_NAME.'.filter_mailbox(this.value)';
@@ -2023,27 +2046,45 @@
$attachment .= ' HEADER Content-Type ' . rcube_imap_generic::escape($type);
}
- $select_filter = new html_select($attrib);
- $select_filter->add($RCMAIL->gettext('all'), 'ALL');
- $select_filter->add($RCMAIL->gettext('unread'), 'UNSEEN');
- $select_filter->add($RCMAIL->gettext('flagged'), 'FLAGGED');
- $select_filter->add($RCMAIL->gettext('unanswered'), 'UNANSWERED');
+ $select = new html_select($attrib);
+ $select->add($RCMAIL->gettext('all'), 'ALL');
+ $select->add($RCMAIL->gettext('unread'), 'UNSEEN');
+ $select->add($RCMAIL->gettext('flagged'), 'FLAGGED');
+ $select->add($RCMAIL->gettext('unanswered'), 'UNANSWERED');
if (!$RCMAIL->config->get('skip_deleted')) {
- $select_filter->add($RCMAIL->gettext('deleted'), 'DELETED');
- $select_filter->add($RCMAIL->gettext('undeleted'), 'UNDELETED');
+ $select->add($RCMAIL->gettext('deleted'), 'DELETED');
+ $select->add($RCMAIL->gettext('undeleted'), 'UNDELETED');
}
- $select_filter->add($RCMAIL->gettext('withattachment'), $attachment);
- $select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('highest'), 'HEADER X-PRIORITY 1');
- $select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('high'), 'HEADER X-PRIORITY 2');
- $select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5');
- $select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('low'), 'HEADER X-PRIORITY 4');
- $select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('lowest'), 'HEADER X-PRIORITY 5');
-
- $out = $select_filter->show($_REQUEST['_search'] ? $_SESSION['search_filter'] : 'ALL');
+ $select->add($RCMAIL->gettext('withattachment'), $attachment);
+ $select->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('highest'), 'HEADER X-PRIORITY 1');
+ $select->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('high'), 'HEADER X-PRIORITY 2');
+ $select->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5');
+ $select->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('low'), 'HEADER X-PRIORITY 4');
+ $select->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('lowest'), 'HEADER X-PRIORITY 5');
$RCMAIL->output->add_gui_object('search_filter', $attrib['id']);
- return $out;
+ return $select->show($_REQUEST['_search'] ? $_SESSION['search_filter'] : 'ALL');
+}
+
+function rcmail_search_interval($attrib)
+{
+ global $RCMAIL;
+
+ if (!strlen($attrib['id'])) {
+ $attrib['id'] = 'rcmsearchinterval';
+ }
+
+ $select = new html_select($attrib);
+ $select->add('', '');
+
+ foreach (array('1W', '1M', '1Y', '-1W', '-1M', '-1Y') as $value) {
+ $select->add($RCMAIL->gettext('searchinterval' . $value), $value);
+ }
+
+ $RCMAIL->output->add_gui_object('search_interval', $attrib['id']);
+
+ return $select->show($_REQUEST['_search'] ? $_SESSION['search_interval'] : '');
}
function rcmail_message_error()
@@ -2159,3 +2200,98 @@
return $jsresult;
}
+
+function rcmail_save_attachment($message, $pid, $compose_id, $params = array())
+{
+ global $COMPOSE;
+
+ $rcmail = rcmail::get_instance();
+ $storage = $rcmail->get_storage();
+
+ if ($pid) {
+ // attachment requested
+ $part = $message->mime_parts[$pid];
+ $size = $part->size;
+ $mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
+ $filename = $params['filename'] ?: rcmail_attachment_name($part);
+ }
+ else {
+ // the whole message requested
+ $size = $message->size;
+ $mimetype = 'message/rfc822';
+ $filename = $params['filename'] ?: 'message_rfc822.eml';
+ }
+
+ // don't load too big attachments into memory
+ if (!rcube_utils::mem_check($size)) {
+ $temp_dir = unslashify($rcmail->config->get('temp_dir'));
+ $path = tempnam($temp_dir, 'rcmAttmnt');
+
+ if ($fp = fopen($path, 'w')) {
+ if ($pid) {
+ // part body
+ $message->get_part_body($pid, false, 0, $fp);
+ }
+ else {
+ // complete message
+ $storage->get_raw_body($message->uid, $fp);
+ }
+
+ fclose($fp);
+ }
+ else {
+ return false;
+ }
+ }
+ else if ($pid) {
+ // part body
+ $data = $message->get_part_body($pid);
+ }
+ else {
+ // complete message
+ $data = $storage->get_raw_body($message->uid);
+ }
+
+ $attachment = array(
+ 'group' => $compose_id,
+ 'name' => $filename,
+ 'mimetype' => $mimetype,
+ 'content_id' => $part ? $part->content_id : null,
+ 'data' => $data,
+ 'path' => $path,
+ 'size' => $path ? filesize($path) : strlen($data),
+ 'charset' => $part ? $part->charset : null,
+ );
+
+ $attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment);
+
+ if ($attachment['status']) {
+ unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
+
+ $session_key = 'compose_data_' . $compose_id;
+
+ // rcube_session::append() replaces current session data with the old values
+ // (in rcube_session::reload()). This is a problem in 'compose' action, because before
+ // the first append() use we set some important data in the session.
+ // It also overwrites attachments list. Fixing reload() is not so simple if possible
+ // as we don't really know what has been added and what removed in meantime.
+ // So, for now we'll do not use append() on 'compose' action (#1490608).
+
+ if ($rcmail->action == 'compose') {
+ $_SESSION[$session_key]['attachments'][$attachment['id']] = $attachment;
+ }
+ else {
+ $rcmail->session->append($session_key . '.attachments', $attachment['id'], $attachment);
+ }
+
+ // Fix reference to compose session data after rcube_session::append()
+ $COMPOSE =& $_SESSION[$session_key];
+
+ return $attachment;
+ }
+ else if ($path) {
+ @unlink($path);
+ }
+
+ return false;
+}
--
Gitblit v1.9.1