X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=index.php;h=1a7fcebf3fddabc8acbbcf4969ffadcd821eff87;hb=48e244a464574aa732ef5ab3fe759f1e05665b3d;hp=fa9ac50236717f8267785b9ff0d678fa4cc0ee73;hpb=baa29d590c64f3f1bbc9e99cd7a5ee884b164f7b;p=roundcube.git
diff --git a/index.php b/index.php
index fa9ac50..1a7fceb 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
|
+-------------------------------------------------------------------------+
- $Id: index.php 2348 2009-03-10 08:13:26Z thomasb $
+ $Id: index.php 5582 2011-12-09 08:55:40Z thomasb $
*/
// include environment
require_once 'program/include/iniset.php';
-// init application and start session with requested task
+// init application, start session, init output class, etc.
$RCMAIL = rcmail::get_instance();
-// init output class
-$OUTPUT = !empty($_REQUEST['_remote']) ? $RCMAIL->init_json() : $RCMAIL->load_gui(!empty($_REQUEST['_framed']));
+// Make the whole PHP output non-cacheable (#1487797)
+send_nocacheing_headers();
-// set output buffering
-if ($RCMAIL->action != 'get' && $RCMAIL->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();
- }
-}
+// turn on output buffering
+ob_start();
// check if config files had errors
if ($err_str = $RCMAIL->config->get_error()) {
@@ -70,148 +60,199 @@ if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
}
+// 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 (!rcube_https_check($https_port)) {
+ $host = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
+ $host .= ($https_port != 443 ? ':' . $https_port : '');
+ header('Location: https://' . $host . $_SERVER['REQUEST_URI']);
+ exit;
+ }
+}
+
+// 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') {
+if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
+ $request_valid = $_SESSION['temp'] && $RCMAIL->check_request(RCUBE_INPUT_POST, 'login');
+
// purge the session in case of new login when a session already exists
- $RCMAIL->kill_session();
-
- // set IMAP host
- $host = $RCMAIL->autoselect_host();
-
+ $RCMAIL->kill_session();
+
+ $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
+ 'host' => $RCMAIL->autoselect_host(),
+ 'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
+ 'pass' => get_input_value('_pass', RCUBE_INPUT_POST, true,
+ $RCMAIL->config->get('password_charset', 'ISO-8859-1')),
+ 'cookiecheck' => true,
+ 'valid' => $request_valid,
+ ));
+
// check if client supports cookies
- if (empty($_COOKIE)) {
+ if ($auth['cookiecheck'] && empty($_COOKIE)) {
$OUTPUT->show_message("cookiesdisabled", 'warning');
}
- else if ($_SESSION['temp'] && !empty($_POST['_user']) && !empty($_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']);
- rcube_sess_regenerate_id();
+ else if ($auth['valid'] && !$auth['abort'] &&
+ !empty($auth['host']) && !empty($auth['user']) &&
+ $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])
+ ) {
+ // create new session ID, don't destroy the current session
+ // it was destroyed already by $RCMAIL->kill_session() above
+ $RCMAIL->session->remove('temp');
+ $RCMAIL->session->regenerate_id(false);
// send auth cookie if necessary
- $RCMAIL->authenticate_session();
+ $RCMAIL->session->set_auth_cookie();
// 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']));
+ rcmail_log_login();
+
+ // restore original request parameters
+ $query = array();
+ if ($url = get_input_value('_url', RCUBE_INPUT_POST)) {
+ parse_str($url, $query);
+
+ // prevent endless looping on login page
+ if ($query['_task'] == 'login')
+ unset($query['_task']);
}
+ // allow plugins to control the redirect url after login success
+ $redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('_task' => 'mail'));
+ unset($redir['abort'], $redir['_err']);
+
// send redirect
- $OUTPUT->redirect();
+ $OUTPUT->redirect($redir);
}
else {
- $OUTPUT->show_message($IMAP->error_code < -1 ? 'imaperror' : 'loginfailed', 'warning');
+ $error_code = is_object($IMAP) ? $IMAP->get_error_code() : -1;
+
+ $OUTPUT->show_message($error_code < -1 ? 'imaperror' : (!$auth['valid'] ? 'invalidrequest' : 'loginfailed'), 'warning');
+ $RCMAIL->plugins->exec_hook('login_failed', array(
+ 'code' => $error_code, 'host' => $auth['host'], 'user' => $auth['user']));
$RCMAIL->kill_session();
}
}
-// end session
-else if (($RCMAIL->task=='logout' || $RCMAIL->action=='logout') && isset($_SESSION['user_id'])) {
+// end session (after optional referer check)
+else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id']) && (!$RCMAIL->config->get('referer_check') || rcube_check_referer())) {
+ $userdata = array('user' => $_SESSION['username'], 'host' => $_SESSION['imap_host'], 'lang' => $RCMAIL->user->language);
$OUTPUT->show_message('loggedout');
$RCMAIL->logout_actions();
$RCMAIL->kill_session();
+ $RCMAIL->plugins->exec_hook('logout_after', $userdata);
}
// check session and auth cookie
-else if ($RCMAIL->action != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
- if (!$RCMAIL->authenticate_session()) {
- $OUTPUT->show_message('sessionerror', 'error');
+else if ($RCMAIL->task != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
+ if (!$RCMAIL->session->check_auth()) {
$RCMAIL->kill_session();
+ $session_error = true;
}
}
-
-// check client X-header to verify request origin
-if ($OUTPUT->ajax_call) {
- if (!$RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
- header('HTTP/1.1 404 Not Found');
- die("Invalid Request");
- }
-}
-
-
// not logged in -> show login page
if (empty($RCMAIL->user->ID)) {
-
+ // log session failures
+ if (($task = get_input_value('_task', RCUBE_INPUT_GPC)) && !in_array($task, array('login','logout')) && !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])) {
+ $RCMAIL->session->log("Aborted session " . $sess_id . "; no valid session data found");
+ $session_error = true;
+ }
+
if ($OUTPUT->ajax_call)
- $OUTPUT->redirect(array(), 2000);
-
+ $OUTPUT->redirect(array('_err' => 'session'), 2000);
+
+ if (!empty($_REQUEST['_framed']))
+ $OUTPUT->command('redirect', $RCMAIL->url(array('_err' => 'session')));
+
// 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 remove the whole installer folder from the RoundCube directory because .
+ html::p(null, "The install script of your Roundcube installation is still stored in its default location!") .
+ html::p(null, "Please remove the whole installer 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 installer script from your browser.")
)
);
}
-
- $OUTPUT->set_env('task', 'login');
+
+ if ($session_error || $_REQUEST['_err'] == 'session')
+ $OUTPUT->show_message('sessionerror', 'error', null, true, -1);
+
+ $RCMAIL->set_task('login');
$OUTPUT->send('login');
}
+// CSRF prevention
+else {
+ // 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 (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token() && !$RCMAIL->config->get('devel_mode')) {
+ header('HTTP/1.1 403 Forbidden');
+ die("Invalid Request");
+ }
+ }
+ // 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);
+ }
+
+ // check referer if configured
+ if (!$request_check_whitelist[$RCMAIL->action] && $RCMAIL->config->get('referer_check') && !rcube_check_referer()) {
+ raise_error(array(
+ 'code' => 403,
+ 'type' => 'php',
+ 'message' => "Referer check failed"), true, true);
+ }
+}
-// handle keep-alive signal
+// we're ready, user is authenticated and the request is safe
+$plugin = $RCMAIL->plugins->exec_hook('ready', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
+$RCMAIL->set_task($plugin['task']);
+$RCMAIL->action = $plugin['action'];
+
+
+// handle special actions
if ($RCMAIL->action == 'keep-alive') {
$OUTPUT->reset();
+ $RCMAIL->plugins->exec_hook('keep_alive', array());
$OUTPUT->send();
}
-// 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 INSTALL_PATH . 'program/steps/utils/save_pref.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',
- ),
-
- 'addressbook' => array(
- 'add' => 'edit.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',
- )
-);
-
// include task specific functions
-include_once 'program/steps/'.$RCMAIL->task.'/func.inc';
+if (is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/func.inc'))
+ include_once $incfile;
// 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';
-
+ // execute a plugin action
+ if ($RCMAIL->plugins->is_plugin_task($RCMAIL->task)) {
+ if (!$RCMAIL->action) $RCMAIL->action = 'index';
+ $RCMAIL->plugins->exec_action($RCMAIL->task.'.'.$RCMAIL->action);
+ break;
+ }
+ else if (preg_match('/^plugin\./', $RCMAIL->action)) {
+ $RCMAIL->plugins->exec_action($RCMAIL->action);
+ break;
+ }
// try to include the step file
- if (is_file(($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile))) {
- include($incfile);
+ else if (($stepfile = $RCMAIL->get_action_file())
+ && is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/'.$stepfile)
+ ) {
+ include $incfile;
$redirects++;
}
else {
@@ -231,5 +272,4 @@ raise_error(array(
'line' => __LINE__,
'file' => __FILE__,
'message' => "Invalid request"), true, true);
-
-?>
+