From f5d61d845f8cfce4c7b559a900df846947e45b00 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 21 Oct 2009 04:47:40 -0400
Subject: [PATCH] Revert r3038 and allow to specify the port as value of force_https
---
index.php | 529 +++++++++++++++++++++-------------------------------------
1 files changed, 196 insertions(+), 333 deletions(-)
diff --git a/index.php b/index.php
index e9c1cee..e0956b4 100644
--- a/index.php
+++ b/index.php
@@ -1,400 +1,263 @@
<?php
/*
- +-----------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client |
- | Version 0.1-20080328 |
- | |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
- | |
- | Redistribution and use in source and binary forms, with or without |
- | modification, are permitted provided that the following conditions |
- | are met: |
- | |
- | o Redistributions of source code must retain the above copyright |
- | notice, this list of conditions and the following disclaimer. |
- | o Redistributions in binary form must reproduce the above copyright |
- | notice, this list of conditions and the following disclaimer in the |
- | documentation and/or other materials provided with the distribution.|
- | o The names of the authors may not be used to endorse or promote |
- | products derived from this software without specific prior written |
- | permission. |
- | |
- | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
- | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
- | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
- | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
- | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
- | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
- | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
- | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
- | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
- | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
- | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- | |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com> |
- +-----------------------------------------------------------------------+
+ +-------------------------------------------------------------------------+
+ | RoundCube Webmail IMAP Client |
+ | Version 0.3-20090814 |
+ | |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
+ | |
+ | This program is free software; you can redistribute it and/or modify |
+ | it under the terms of the GNU General Public License version 2 |
+ | as published by the Free Software Foundation. |
+ | |
+ | This program is distributed in the hope that it will be useful, |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+ | GNU General Public License for more details. |
+ | |
+ | You should have received a copy of the GNU General Public License along |
+ | with this program; if not, write to the Free Software Foundation, Inc., |
+ | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
+ | |
+ +-------------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com> |
+ +-------------------------------------------------------------------------+
$Id$
*/
-// application constants
-define('RCMAIL_VERSION', '0.1-trunk');
-define('RCMAIL_CHARSET', 'UTF-8');
-define('JS_OBJECT_NAME', 'rcmail');
+// include environment
+require_once 'program/include/iniset.php';
-// define global vars
-$OUTPUT_TYPE = 'html';
-$INSTALL_PATH = dirname(__FILE__);
-$MAIN_TASKS = array('mail','settings','addressbook','logout');
+// init application and start session with requested task
+$RCMAIL = rcmail::get_instance();
-if (empty($INSTALL_PATH))
- $INSTALL_PATH = './';
-else
- $INSTALL_PATH .= '/';
+// init output class
+$OUTPUT = !empty($_REQUEST['_remote']) ? $RCMAIL->init_json() : $RCMAIL->load_gui(!empty($_REQUEST['_framed']));
+// init plugin API
+$RCMAIL->plugins->init();
-// make sure path_separator is defined
-if (!defined('PATH_SEPARATOR'))
- define('PATH_SEPARATOR', (eregi('win', PHP_OS) ? ';' : ':'));
+// turn on output buffering
+ob_start();
-
-// RC include folders MUST be included FIRST to avoid other
-// possible not compatible libraries (i.e PEAR) to be included
-// instead the ones provided by RC
-ini_set('include_path', $INSTALL_PATH.PATH_SEPARATOR.$INSTALL_PATH.'program'.PATH_SEPARATOR.$INSTALL_PATH.'program/lib'.PATH_SEPARATOR.ini_get('include_path'));
-
-ini_set('session.name', 'roundcube_sessid');
-ini_set('session.use_cookies', 1);
-ini_set('session.gc_maxlifetime', 21600);
-ini_set('session.gc_divisor', 500);
-ini_set('error_reporting', E_ALL&~E_NOTICE);
-set_magic_quotes_runtime(0);
-
-// increase maximum execution time for php scripts
-// (does not work in safe mode)
-if (!ini_get('safe_mode')) @set_time_limit(120);
-
-// include base files
-require_once('include/rcube_shared.inc');
-require_once('include/rcube_imap.inc');
-require_once('include/bugs.inc');
-require_once('include/main.inc');
-require_once('PEAR.php');
-
-
-// set PEAR error handling
-// PEAR::setErrorHandling(PEAR_ERROR_TRIGGER, E_USER_NOTICE);
-
-
-// catch some url/post parameters
-$_task = strip_quotes(get_input_value('_task', RCUBE_INPUT_GPC));
-$_action = strip_quotes(get_input_value('_action', RCUBE_INPUT_GPC));
-$_framed = (!empty($_GET['_framed']) || !empty($_POST['_framed']));
-
-// use main task if empty or invalid value
-if (empty($_task) || !in_array($_task, $MAIN_TASKS))
- $_task = 'mail';
-
-
-// set output buffering
-if ($_action != 'get' && $_action != 'viewsource')
-{
- // use gzip compression if supported
- if (function_exists('ob_gzhandler')
- && !ini_get('zlib.output_compression')
- && ini_get('output_handler') != 'ob_gzhandler')
- {
- ob_start('ob_gzhandler');
- }
- else
- ob_start();
+// check if config files had errors
+if ($err_str = $RCMAIL->config->get_error()) {
+ raise_error(array(
+ 'code' => 601,
+ 'type' => 'php',
+ 'message' => $err_str), false, true);
}
-
-
-// start session with requested task
-rcmail_startup($_task);
-
-// set session related variables
-$COMM_PATH = sprintf('./?_task=%s', $_task);
-$SESS_HIDDEN_FIELD = '';
-
-
-// add framed parameter
-if ($_framed)
-{
- $COMM_PATH .= '&_framed=1';
- $SESS_HIDDEN_FIELD .= "\n".'<input type="hidden" name="_framed" value="1" />';
-}
-
-
-// init necessary objects for GUI
-rcmail_load_gui();
-
// check DB connections and exit on failure
-if ($err_str = $DB->is_error())
-{
+if ($err_str = $DB->is_error()) {
raise_error(array(
'code' => 603,
'type' => 'db',
'message' => $err_str), FALSE, TRUE);
}
-
// error steps
-if ($_action=='error' && !empty($_GET['_code']))
+if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
+}
-
-// try to log in
-if ($_action=='login' && $_task=='mail')
-{
- $host = rcmail_autoselect_host();
-
- // check if client supports cookies
- if (empty($_COOKIE))
- {
- $OUTPUT->show_message("cookiesdisabled", 'warning');
- }
- else if ($_SESSION['temp'] && !empty($_POST['_user']) && isset($_POST['_pass']) &&
- rcmail_login(trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
- get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $host))
- {
- // create new session ID
- unset($_SESSION['temp']);
- sess_regenerate_id();
-
- // send auth cookie if necessary
- rcmail_authenticate_session();
-
- // send redirect
- header("Location: $COMM_PATH");
+// check if https is required (for login) and redirect if necessary
+if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) {
+ $https_port = is_bool($force_https) ? 443 : $force_https;
+ if (!(isset($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == $use_https || $RCMAIL->config->get('use_https'))) {
+ header('Location: https://' . $_SERVER['HTTP_HOST'] . ($https_port != 443 ? ':' . $https_port : '') . $_SERVER['REQUEST_URI']);
exit;
}
- else
- {
- $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'loginfailed', 'warning');
- rcmail_kill_session();
+}
+
+// trigger startup plugin hook
+$startup = $RCMAIL->plugins->exec_hook('startup', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
+$RCMAIL->set_task($startup['task']);
+$RCMAIL->action = $startup['action'];
+
+// try to log in
+if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') {
+ // purge the session in case of new login when a session already exists
+ $RCMAIL->kill_session();
+
+ $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
+ 'host' => $RCMAIL->autoselect_host(),
+ 'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
+ 'cookiecheck' => true,
+ )) + array('pass' => get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'));
+
+ // check if client supports cookies
+ if ($auth['cookiecheck'] && empty($_COOKIE)) {
+ $OUTPUT->show_message("cookiesdisabled", 'warning');
+ }
+ else if ($_SESSION['temp'] && !$auth['abort'] && !empty($auth['host']) &&
+ !empty($auth['user']) && isset($auth['pass']) &&
+ $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
+ // create new session ID
+ rcube_sess_unset('temp');
+ rcube_sess_regenerate_id();
+
+ // send auth cookie if necessary
+ $RCMAIL->authenticate_session();
+
+ // log successful login
+ if ($RCMAIL->config->get('log_logins')) {
+ write_log('userlogins', sprintf('Successful login for %s (id %d) from %s',
+ $RCMAIL->user->get_username(),
+ $RCMAIL->user->ID,
+ $_SERVER['REMOTE_ADDR']));
+ }
+
+ // restore original request parameters
+ $query = array();
+ if ($url = get_input_value('_url', RCUBE_INPUT_POST))
+ parse_str($url, $query);
+
+ // allow plugins to control the redirect url after login success
+ $redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('task' => $RCMAIL->task));
+ unset($redir['abort']);
+
+ // send redirect
+ $OUTPUT->redirect($redir);
+ }
+ else {
+ $OUTPUT->show_message($IMAP->error_code < -1 ? 'imaperror' : 'loginfailed', 'warning');
+ $RCMAIL->plugins->exec_hook('login_failed', array('code' => $IMAP->error_code, 'host' => $auth['host'], 'user' => $auth['user']));
+ $RCMAIL->kill_session();
}
}
// end session
-else if (($_task=='logout' || $_action=='logout') && isset($_SESSION['user_id']))
-{
+else if ($RCMAIL->task=='logout' && isset($_SESSION['user_id'])) {
+ $userdata = array('user' => $_SESSION['username'], 'host' => $_SESSION['imap_host'], 'lang' => $RCMAIL->user->language);
$OUTPUT->show_message('loggedout');
- rcmail_logout_actions();
- rcmail_kill_session();
+ $RCMAIL->logout_actions();
+ $RCMAIL->kill_session();
+ $RCMAIL->plugins->exec_hook('logout_after', $userdata);
}
// check session and auth cookie
-else if ($_action != 'login' && $_SESSION['user_id'] && $_action != 'send')
-{
- if (!rcmail_authenticate_session())
- {
+else if ($RCMAIL->action != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
+ if (!$RCMAIL->authenticate_session()) {
$OUTPUT->show_message('sessionerror', 'error');
- rcmail_kill_session();
+ $RCMAIL->kill_session();
}
}
-
-// log in to imap server
-if (!empty($USER->ID) && $_task=='mail')
-{
- $conn = $IMAP->connect($_SESSION['imap_host'], $_SESSION['username'], decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']);
- if (!$conn)
- {
- $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'sessionerror', 'error');
- rcmail_kill_session();
- }
- else
- rcmail_set_imap_prop();
-}
-
-
-// not logged in -> set task to 'login
-if (empty($USER->ID))
-{
- if ($OUTPUT->ajax_call)
- $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);");
-
- $_task = 'login';
-}
-
+// don't check for valid request tokens in these actions
+$request_check_whitelist = array('login'=>1, 'spell'=>1);
// check client X-header to verify request origin
-if ($OUTPUT->ajax_call)
-{
- if (empty($CONFIG['devel_mode']) && !rc_request_header('X-RoundCube-Referer'))
- {
+if ($OUTPUT->ajax_call) {
+ if (!$RCMAIL->config->get('devel_mode') && rc_request_header('X-RoundCube-Request') != $RCMAIL->get_request_token() && !empty($RCMAIL->user->ID)) {
header('HTTP/1.1 404 Not Found');
die("Invalid Request");
}
}
-
-
-// set task and action to client
-$OUTPUT->set_env('task', $_task);
-if (!empty($_action))
- $OUTPUT->set_env('action', $_action);
-
-
+// check request token in POST form submissions
+else if (!empty($_POST) && !$request_check_whitelist[$RCMAIL->action] && !$RCMAIL->check_request()) {
+ $OUTPUT->show_message('invalidrequest', 'error');
+ $OUTPUT->send($RCMAIL->task);
+}
// not logged in -> show login page
-if (empty($USER->ID))
-{
- // check if installer is still active
- if ($CONFIG['enable_installer'] && is_readable('./installer/index.php'))
- $OUTPUT->add_footer('
- <div style="background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em">
- <h2 style="margin-top:0.2em">Installer script is still accessible</h2>
- <p>The install script of your RoundCube installation is still stored in its default location!</p>
- <p>Please <b>remove</b> the whole <tt>installer</tt> folder from the RoundCube directory because
- these files may expose sensitive configuration data like server passwords and encryption keys
- to the public. Make sure you cannot access the <a href="./installer/">installer script</a> from your browser.</p>
- </div>');
+if (empty($RCMAIL->user->ID)) {
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->redirect(array(), 2000);
- $OUTPUT->task = 'login';
+ if (!empty($_REQUEST['_framed']))
+ $OUTPUT->command('redirect', '?');
+
+ // check if installer is still active
+ if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
+ $OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"),
+ html::tag('h2', array('style' => "margin-top:0.2em"), "Installer script is still accessible") .
+ html::p(null, "The install script of your RoundCube installation is still stored in its default location!") .
+ html::p(null, "Please <b>remove</b> the whole <tt>installer</tt> folder from the RoundCube directory because .
+ these files may expose sensitive configuration data like server passwords and encryption keys
+ to the public. Make sure you cannot access the <a href=\"./installer/\">installer script</a> from your browser.")
+ )
+ );
+ }
+
+ $OUTPUT->set_env('task', 'login');
$OUTPUT->send('login');
- exit;
}
// handle keep-alive signal
-if ($_action=='keep-alive')
-{
+if ($RCMAIL->action == 'keep-alive') {
$OUTPUT->reset();
- $OUTPUT->send('');
- exit;
+ $OUTPUT->send();
}
-
-// include task specific files
-if ($_task=='mail')
-{
- include_once('program/steps/mail/func.inc');
-
- if ($_action=='show' || $_action=='preview' || $_action=='print')
- include('program/steps/mail/show.inc');
-
- if ($_action=='get')
- include('program/steps/mail/get.inc');
-
- if ($_action=='moveto' || $_action=='delete')
- include('program/steps/mail/move_del.inc');
-
- if ($_action=='mark')
- include('program/steps/mail/mark.inc');
-
- if ($_action=='viewsource')
- include('program/steps/mail/viewsource.inc');
-
- if ($_action=='sendmdn')
- include('program/steps/mail/sendmdn.inc');
-
- if ($_action=='send')
- include('program/steps/mail/sendmail.inc');
-
- if ($_action=='upload')
- include('program/steps/mail/upload.inc');
-
- if ($_action=='compose' || $_action=='remove-attachment' || $_action=='display-attachment')
- include('program/steps/mail/compose.inc');
-
- if ($_action=='addcontact')
- include('program/steps/mail/addcontact.inc');
-
- if ($_action=='expunge' || $_action=='purge')
- include('program/steps/mail/folders.inc');
-
- if ($_action=='check-recent')
- include('program/steps/mail/check_recent.inc');
-
- if ($_action=='getunread')
- include('program/steps/mail/getunread.inc');
-
- if ($_action=='list' && isset($_REQUEST['_remote']))
- include('program/steps/mail/list.inc');
-
- if ($_action=='search')
- include('program/steps/mail/search.inc');
-
- if ($_action=='spell')
- include('program/steps/mail/spell.inc');
-
- if ($_action=='rss')
- include('program/steps/mail/rss.inc');
-
- if ($_action=='quotadisplay')
- include('program/steps/mail/quotadisplay.inc');
-
-
- // make sure the message count is refreshed
- $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);
+// save preference value
+else if ($RCMAIL->action == 'save-pref') {
+ $RCMAIL->user->save_prefs(array(get_input_value('_name', RCUBE_INPUT_POST) => get_input_value('_value', RCUBE_INPUT_POST)));
+ $OUTPUT->reset();
+ $OUTPUT->send();
}
-// include task specific files
-if ($_task=='addressbook')
-{
- include_once('program/steps/addressbook/func.inc');
-
- if ($_action=='save')
- include('program/steps/addressbook/save.inc');
+// map task/action to a certain include file
+$action_map = array(
+ 'mail' => array(
+ 'preview' => 'show.inc',
+ 'print' => 'show.inc',
+ 'moveto' => 'move_del.inc',
+ 'delete' => 'move_del.inc',
+ 'send' => 'sendmail.inc',
+ 'expunge' => 'folders.inc',
+ 'purge' => 'folders.inc',
+ 'remove-attachment' => 'attachments.inc',
+ 'display-attachment' => 'attachments.inc',
+ 'upload' => 'attachments.inc',
+ ),
- if ($_action=='edit' || $_action=='add')
- include('program/steps/addressbook/edit.inc');
+ 'addressbook' => array(
+ 'add' => 'edit.inc',
+ ),
- if ($_action=='delete')
- include('program/steps/addressbook/delete.inc');
+ 'settings' => array(
+ 'folders' => 'manage_folders.inc',
+ 'create-folder' => 'manage_folders.inc',
+ 'rename-folder' => 'manage_folders.inc',
+ 'delete-folder' => 'manage_folders.inc',
+ 'subscribe' => 'manage_folders.inc',
+ 'unsubscribe' => 'manage_folders.inc',
+ 'add-identity' => 'edit_identity.inc',
+ )
+);
- if ($_action=='show')
- include('program/steps/addressbook/show.inc');
+// include task specific functions
+if (is_file($incfile = 'program/steps/'.$RCMAIL->task.'/func.inc'))
+ include_once($incfile);
- if ($_action=='list' && $_REQUEST['_remote'])
- include('program/steps/addressbook/list.inc');
+// allow 5 "redirects" to another action
+$redirects = 0; $incstep = null;
+while ($redirects < 5) {
+ $stepfile = !empty($action_map[$RCMAIL->task][$RCMAIL->action]) ?
+ $action_map[$RCMAIL->task][$RCMAIL->action] : strtr($RCMAIL->action, '-', '_') . '.inc';
- if ($_action=='search')
- include('program/steps/addressbook/search.inc');
-
- if ($_action=='copy')
- include('program/steps/addressbook/copy.inc');
-
- if ($_action=='mailto')
- include('program/steps/addressbook/mailto.inc');
+ // execute a plugin action
+ if (preg_match('/^plugin\./', $RCMAIL->action)) {
+ $RCMAIL->plugins->exec_action($RCMAIL->action);
+ break;
+ }
+ // try to include the step file
+ else if (is_file($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile)) {
+ include($incfile);
+ $redirects++;
+ }
+ else {
+ break;
+ }
}
-// include task specific files
-if ($_task=='settings')
-{
- include_once('program/steps/settings/func.inc');
-
- if ($_action=='save-identity')
- include('program/steps/settings/save_identity.inc');
-
- if ($_action=='add-identity' || $_action=='edit-identity')
- include('program/steps/settings/edit_identity.inc');
-
- if ($_action=='delete-identity')
- include('program/steps/settings/delete_identity.inc');
-
- if ($_action=='identities')
- include('program/steps/settings/identities.inc');
-
- if ($_action=='save-prefs')
- include('program/steps/settings/save_prefs.inc');
-
- if ($_action=='folders' || $_action=='subscribe' || $_action=='unsubscribe' ||
- $_action=='create-folder' || $_action=='rename-folder' || $_action=='delete-folder')
- include('program/steps/settings/manage_folders.inc');
-
-}
-
-
-// parse main template
-$OUTPUT->send($_task);
+// parse main template (default)
+$OUTPUT->send($RCMAIL->task);
// if we arrive here, something went wrong
@@ -403,6 +266,6 @@
'type' => 'php',
'line' => __LINE__,
'file' => __FILE__,
- 'message' => "Invalid request"), TRUE, TRUE);
+ 'message' => "Invalid request"), true, true);
?>
--
Gitblit v1.9.1