githubFork/roundcubemail.git

			@@ -5,8 +5,11 @@
			\| program/steps/mail/get.inc \|
			\| \|
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
			\| Licensed under the GNU GPL \|
			\| Copyright (C) 2005-2011, The Roundcube Dev Team \|
			\| \|
			\| Licensed under the GNU General Public License version 3 or \|
			\| any later version with exceptions for skins & plugins. \|
			\| See the README file for a full license statement. \|
			\| \|
			\| PURPOSE: \|
			\| Delivering a specific part of a mail message \|
			@@ -35,39 +38,26 @@

			ob_end_clean();

			// Now we need IMAP connection
			if (!$RCMAIL->imap_connect()) {
			// Get action is often executed simultanously.
			// Some servers have MAXPERIP or other limits.
			// To workaround this we'll wait for some time
			// and try again (once).
			// Note: Random sleep interval is used to minimize concurency
			// in getting message parts
			if (!isset($_GET['_redirected'])) {
			usleep(rand(10,30)*100000); // 1-3 sec.
			header('Location: ' . $_SERVER['REQUEST_URI'] . '&_redirected=1');
			}
			else {
			raise_error(array(
			'code' => 500, 'type' => 'php',
			'file' => __FILE__, 'line' => __LINE__,
			'message' => 'Unable to get/display message part. IMAP connection error'),
			true, true);
			}
			// Don't kill session, just quit (#1486995)
			exit;
			}

			// similar code as in program/steps/mail/show.inc
			if (!empty($_GET['_uid'])) {
			$RCMAIL->config->set('prefer_html', true);
			$MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
			}

			// check connection status
			check_storage_status();

			// show part page
			if (!empty($_GET['_frame'])) {
			if (($part_id = get_input_value('_part', RCUBE_INPUT_GPC)) && ($part = $MESSAGE->mime_parts[$part_id]) && $part->filename)
			$OUTPUT->set_pagetitle($part->filename);
			if (($part_id = get_input_value('_part', RCUBE_INPUT_GPC)) && ($part = $MESSAGE->mime_parts[$part_id])) {
			$filename = $part->filename;
			if (empty($filename) && $part->mimetype == 'text/html') {
			$filename = rcube_label('htmlmessage');
			}
			if (!empty($filename)) {
			$OUTPUT->set_pagetitle($filename);
			}
			}

			$OUTPUT->send('messagepart');
			exit;
			@@ -82,7 +72,7 @@

			// allow post-processing of the message body
			$plugin = $RCMAIL->plugins->exec_hook('message_part_get',
			array('id' => $part->mime_id, 'mimetype' => $mimetype, 'part' => $part, 'download' => !empty($_GET['_download'])));
			array('uid' => $MESSAGE->uid, 'id' => $part->mime_id, 'mimetype' => $mimetype, 'part' => $part, 'download' => !empty($_GET['_download'])));

			if ($plugin['abort'])
			exit;
			@@ -117,7 +107,7 @@
			if (!rcmail_mem_check($part->size * 10)) {
			$out = '<body>' . rcube_label('messagetoobig'). ' '
			. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id
			.'&_mbox='. urlencode($RCMAIL->imap->get_mailbox_name()), rcube_label('download')) . '</body></html>';
			.'&_mbox='. urlencode($RCMAIL->storage->get_folder()), rcube_label('download')) . '</body></html>';
			}
			else {
			// get part body if not available
			@@ -127,15 +117,29 @@
			$out = rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false));
			}

			$OUTPUT = new rcube_html_page();
			// check connection status
			if ($part->size && empty($part->body)) {
			check_storage_status();
			}

			$OUTPUT = new rcube_output_html();
			$OUTPUT->write($out);
			}
			else {
			// don't kill the connection if download takes more than 30 sec.
			@set_time_limit(0);

			$ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
			$filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . $ext;
			if ($part->filename) {
			$filename = $part->filename;
			}
			else if ($part->mimetype == 'text/html') {
			$filename = rcube_label('htmlmessage');
			}
			else {
			$ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
			$filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . $ext;
			}

			$filename = preg_replace('[\r\n]', '', $filename);

			if ($browser->ie && $browser->ver < 7)
			@@ -151,21 +155,31 @@

			// do content filtering to avoid XSS through fake images
			if (!empty($_REQUEST['_embed']) && $browser->ie && $browser->ver <= 8) {
			if ($part->body)
			if ($part->body) {
			echo preg_match('/<(script\|iframe\|object)/i', $part->body) ? '' : $part->body;
			$sent = true;
			}
			else if ($part->size) {
			$stdout = fopen('php://output', 'w');
			stream_filter_register('rcube_content', 'rcube_content_filter') or die('Failed to register content filter');
			stream_filter_append($stdout, 'rcube_content');
			$RCMAIL->imap->get_message_part($MESSAGE->uid, $part->mime_id, $part, false, $stdout);
			$sent = $RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, false, $stdout);
			}
			}
			else {
			// turn off output buffering and print part content
			if ($part->body)
			if ($part->body) {
			echo $part->body;
			else if ($part->size)
			$RCMAIL->imap->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
			$sent = true;
			}
			else if ($part->size) {
			$sent = $RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
			}
			}

			// check connection status
			if ($part->size && !$sent) {
			check_storage_status();
			}
			}

			@@ -194,39 +208,34 @@
			exit;



			/**
			* PHP stream filter to detect html/javascript code in attachments
			*/
			class rcube_content_filter extends php_user_filter
			function check_storage_status()
			{
			private $buffer = '';
			private $cutoff = 2048;
			$error = rcmail::get_instance()->storage->get_error_code();

			function onCreate()
			{
			$this->cutoff = rand(2048, 3027);
			return true;
			}
			// Check if we have a connection error
			if ($error == rcube_imap_generic::ERROR_BAD) {
			ob_end_clean();

			function filter($in, $out, &$consumed, $closing)
			{
			while ($bucket = stream_bucket_make_writeable($in)) {
			$this->buffer .= $bucket->data;
			// Get action is often executed simultanously.
			// Some servers have MAXPERIP or other limits.
			// To workaround this we'll wait for some time
			// and try again (once).
			// Note: Random sleep interval is used to minimize concurency
			// in getting message parts

			// check for evil content and abort
			if (preg_match('/<(script\|iframe\|object)/i', $this->buffer))
			return PSFS_ERR_FATAL;
			if (!isset($_GET['_redirected'])) {
			usleep(rand(10,30)*100000); // 1-3 sec.
			header('Location: ' . $_SERVER['REQUEST_URI'] . '&_redirected=1');
			}
			else {
			raise_error(array(
			'code' => 500, 'type' => 'php',
			'file' => __FILE__, 'line' => __LINE__,
			'message' => 'Unable to get/display message part. IMAP connection error'),
			true, true);
			}

			// keep buffer small enough
			if (strlen($this->buffer) > 4096)
			$this->buffer = substr($this->buffer, $this->cutoff);

			$consumed += $bucket->datalen;
			stream_bucket_append($out, $bucket);
			// Don't kill session, just quit (#1486995)
			exit;
			}

			return PSFS_PASS_ON;
			}
			}