X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=blobdiff_plain;f=index.php;h=1a7fcebf3fddabc8acbbcf4969ffadcd821eff87;hp=f40f701d83dcf3124a930e7bea364f118036dc9f;hb=9d358bb749203c1c4cb278a01e51f79754aa643a;hpb=5b5ddde1194997b1012f19da396f2861db3396a2

diff --git a/index.php b/index.php
index f40f701..1a7fceb 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
 <?php
 /*
  +-------------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client                                           |
- | Version 0.2-alpha                                                       |
+ | Roundcube Webmail IMAP Client                                           |
+ | Version 0.7                                                             |
  |                                                                         |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                   |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team                         |
  |                                                                         |
  | This program is free software; you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License version 2          |
@@ -23,36 +23,29 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                          |
  +-------------------------------------------------------------------------+
 
- $Id: index.php 1499 2008-06-09 20:57:53Z thomasb $
+ $Id: index.php 5582 2011-12-09 08:55:40Z thomasb $
 
 */
 
 // include environment
 require_once 'program/include/iniset.php';
 
-// define global vars
-$OUTPUT_TYPE = 'html';
-
-// 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();
-  }
-}
-
-
-// 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($_GET['_remote']) || !empty($_POST['_remote'])) ? $RCMAIL->init_json() : $RCMAIL->load_gui((!empty($_GET['_framed']) || !empty($_POST['_framed'])));
+// Make the whole PHP output non-cacheable (#1487797)
+send_nocacheing_headers();
+
+// turn on output buffering
+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);
+}
 
 // check DB connections and exit on failure
 if ($err_str = $DB->is_error()) {
@@ -62,233 +55,213 @@ if ($err_str = $DB->is_error()) {
     'message' => $err_str), FALSE, TRUE);
 }
 
-
 // error steps
 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') {
-  $host = $RCMAIL->autoselect_host();
-  
+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();
+
+  $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']) && 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();
+  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') && $RCMAIL->config->get('debug_level') & 1)
-      console(sprintf('Successful login for %s (id %d) from %s',
-                      trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
-                      $_SESSION['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
-    header("Location: {$RCMAIL->comm_path}");
-    exit;
+    $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;
   }
 }
 
-
-// log in to imap server
-if (!empty($RCMAIL->user->ID) && $RCMAIL->task == 'mail') {
-  if (!$RCMAIL->imap_connect()) {
-    $RCMAIL->kill_session();
+// 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;
   }
-}
 
-
-// not logged in -> set task to 'login
-if (empty($RCMAIL->user->ID)) {
   if ($OUTPUT->ajax_call)
-    $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);");
-  
-  $RCMAIL->set_task('login');
-}
-
-
-// check client X-header to verify request origin
-if ($OUTPUT->ajax_call) {
-  if (empty($CONFIG['devel_mode']) && !rc_request_header('X-RoundCube-Referer')) {
-    header('HTTP/1.1 404 Not Found');
-    die("Invalid Request");
-  }
-}
+    $OUTPUT->redirect(array('_err' => 'session'), 2000);
 
+  if (!empty($_REQUEST['_framed']))
+    $OUTPUT->command('redirect', $RCMAIL->url(array('_err' => 'session')));
 
-// not logged in -> show login page
-if (empty($RCMAIL->user->ID)) {
   // check if installer is still active
-  if ($CONFIG['enable_installer'] && is_readable('./installer/index.php')) {
+  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 .
+      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->task = 'login';
-  $OUTPUT->send('login');
-  exit;
-}
 
+  if ($session_error || $_REQUEST['_err'] == 'session')
+    $OUTPUT->show_message('sessionerror', 'error', null, true, -1);
 
-// handle keep-alive signal
-if ($RCMAIL->action=='keep-alive') {
-  $OUTPUT->reset();
-  $OUTPUT->send('');
-  exit;
+  $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);
+  }
 
-// include task specific files
-if ($RCMAIL->task=='mail') {
-  include_once('program/steps/mail/func.inc');
-  
-  if ($RCMAIL->action=='show' || $RCMAIL->action=='preview' || $RCMAIL->action=='print')
-    include('program/steps/mail/show.inc');
-
-  if ($RCMAIL->action=='get')
-    include('program/steps/mail/get.inc');
-
-  if ($RCMAIL->action=='moveto' || $RCMAIL->action=='delete')
-    include('program/steps/mail/move_del.inc');
-
-  if ($RCMAIL->action=='mark')
-    include('program/steps/mail/mark.inc');
-
-  if ($RCMAIL->action=='viewsource')
-    include('program/steps/mail/viewsource.inc');
-
-  if ($RCMAIL->action=='sendmdn')
-    include('program/steps/mail/sendmdn.inc');
-
-  if ($RCMAIL->action=='send')
-    include('program/steps/mail/sendmail.inc');
-
-  if ($RCMAIL->action=='upload')
-    include('program/steps/mail/upload.inc');
-
-  if ($RCMAIL->action=='compose' || $RCMAIL->action=='remove-attachment' || $RCMAIL->action=='display-attachment')
-    include('program/steps/mail/compose.inc');
-
-  if ($RCMAIL->action=='addcontact')
-    include('program/steps/mail/addcontact.inc');
-
-  if ($RCMAIL->action=='expunge' || $RCMAIL->action=='purge')
-    include('program/steps/mail/folders.inc');
-
-  if ($RCMAIL->action=='check-recent')
-    include('program/steps/mail/check_recent.inc');
-
-  if ($RCMAIL->action=='getunread')
-    include('program/steps/mail/getunread.inc');
-    
-  if ($RCMAIL->action=='list' && isset($_REQUEST['_remote']))
-    include('program/steps/mail/list.inc');
-
-   if ($RCMAIL->action=='search')
-     include('program/steps/mail/search.inc');
-     
-  if ($RCMAIL->action=='spell')
-    include('program/steps/mail/spell.inc');
-
-  if ($RCMAIL->action=='rss')
-    include('program/steps/mail/rss.inc');
-    
-  // make sure the message count is refreshed
-  $IMAP->messagecount($_SESSION['mbox'], 'ALL', true);
+  // 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);
+  }
 }
 
+// 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'];
 
-// include task specific files
-if ($RCMAIL->task=='addressbook') {
-  include_once('program/steps/addressbook/func.inc');
-
-  if ($RCMAIL->action=='save')
-    include('program/steps/addressbook/save.inc');
-  
-  if ($RCMAIL->action=='edit' || $RCMAIL->action=='add')
-    include('program/steps/addressbook/edit.inc');
-  
-  if ($RCMAIL->action=='delete')
-    include('program/steps/addressbook/delete.inc');
-
-  if ($RCMAIL->action=='show')
-    include('program/steps/addressbook/show.inc');  
-
-  if ($RCMAIL->action=='list' && $_REQUEST['_remote'])
-    include('program/steps/addressbook/list.inc');
 
-  if ($RCMAIL->action=='search')
-    include('program/steps/addressbook/search.inc');
-
-  if ($RCMAIL->action=='copy')
-    include('program/steps/addressbook/copy.inc');
-
-  if ($RCMAIL->action=='mailto')
-    include('program/steps/addressbook/mailto.inc');
+// handle special actions
+if ($RCMAIL->action == 'keep-alive') {
+  $OUTPUT->reset();
+  $RCMAIL->plugins->exec_hook('keep_alive', array());
+  $OUTPUT->send();
+}
+else if ($RCMAIL->action == 'save-pref') {
+  include INSTALL_PATH . 'program/steps/utils/save_pref.inc';
 }
 
 
-// include task specific files
-if ($RCMAIL->task=='settings') {
-  include_once('program/steps/settings/func.inc');
-
-  if ($RCMAIL->action=='save-identity')
-    include('program/steps/settings/save_identity.inc');
-
-  if ($RCMAIL->action=='add-identity' || $RCMAIL->action=='edit-identity')
-    include('program/steps/settings/edit_identity.inc');
-
-  if ($RCMAIL->action=='delete-identity')
-    include('program/steps/settings/delete_identity.inc');
-  
-  if ($RCMAIL->action=='identities')
-    include('program/steps/settings/identities.inc');  
-
-  if ($RCMAIL->action=='save-prefs')
-    include('program/steps/settings/save_prefs.inc');  
+// include task specific functions
+if (is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/func.inc'))
+  include_once $incfile;
 
-  if ($RCMAIL->action=='folders' || $RCMAIL->action=='subscribe' || $RCMAIL->action=='unsubscribe' ||
-      $RCMAIL->action=='create-folder' || $RCMAIL->action=='rename-folder' || $RCMAIL->action=='delete-folder')
-    include('program/steps/settings/manage_folders.inc');
+// allow 5 "redirects" to another action
+$redirects = 0; $incstep = null;
+while ($redirects < 5) {
+  // 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
+  else if (($stepfile = $RCMAIL->get_action_file())
+    && is_file($incfile = INSTALL_PATH . 'program/steps/'.$RCMAIL->task.'/'.$stepfile)
+  ) {
+    include $incfile;
+    $redirects++;
+  }
+  else {
+    break;
+  }
 }
 
 
-// parse main template
+// parse main template (default)
 $OUTPUT->send($RCMAIL->task);
 
 
@@ -299,5 +272,4 @@ raise_error(array(
   'line' => __LINE__,
   'file' => __FILE__,
   'message' => "Invalid request"), true, true);
-                      
-?>
+