From 967b342039261ab294fe85d806fe49ce16391ada Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 28 Mar 2008 15:42:35 -0400
Subject: [PATCH] Disable installer by default; add config option to enable it again
---
index.php | 230 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 124 insertions(+), 106 deletions(-)
diff --git a/index.php b/index.php
index eaecfdf..0687763 100644
--- a/index.php
+++ b/index.php
@@ -2,9 +2,9 @@
/*
+-----------------------------------------------------------------------+
| RoundCube Webmail IMAP Client |
- | Version 0.1-20070301 |
+ | Version 0.1-20080328 |
| |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| Redistribution and use in source and binary forms, with or without |
@@ -40,12 +40,13 @@
*/
-define('RCMAIL_VERSION', '0.1-20070301');
+// application constants
+define('RCMAIL_VERSION', '0.1-trunk');
+define('RCMAIL_CHARSET', 'UTF-8');
+define('JS_OBJECT_NAME', 'rcmail');
// define global vars
-$CHARSET = 'UTF-8';
$OUTPUT_TYPE = 'html';
-$JS_OBJECT_NAME = 'rcmail';
$INSTALL_PATH = dirname(__FILE__);
$MAIN_TASKS = array('mail','settings','addressbook','logout');
@@ -65,11 +66,12 @@
// 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', 'sessid');
+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)
@@ -80,8 +82,6 @@
require_once('include/rcube_imap.inc');
require_once('include/bugs.inc');
require_once('include/main.inc');
-require_once('include/cache.inc');
-require_once('lib/html2text.inc');
require_once('PEAR.php');
@@ -98,19 +98,20 @@
if (empty($_task) || !in_array($_task, $MAIN_TASKS))
$_task = 'mail';
-if (!empty($_GET['_remote']))
- $REMOTE_REQUEST = TRUE;
-
// set output buffering
if ($_action != 'get' && $_action != 'viewsource')
- {
+{
// use gzip compression if supported
- if (function_exists('ob_gzhandler') && ini_get('zlib.output_compression'))
+ if (function_exists('ob_gzhandler')
+ && !ini_get('zlib.output_compression')
+ && ini_get('output_handler') != 'ob_gzhandler')
+ {
ob_start('ob_gzhandler');
+ }
else
ob_start();
- }
+}
// start session with requested task
@@ -123,144 +124,154 @@
// add framed parameter
if ($_framed)
- {
- $COMM_PATH .= '&_framed=1';
+{
+ $COMM_PATH .= '&_framed=1';
$SESS_HIDDEN_FIELD .= "\n".'<input type="hidden" name="_framed" value="1" />';
- }
+}
// init necessary objects for GUI
-load_gui();
+rcmail_load_gui();
// check DB connections and exit on failure
if ($err_str = $DB->is_error())
- {
- raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__,
- 'message' => $err_str), FALSE, TRUE);
- }
+{
+ raise_error(array(
+ 'code' => 603,
+ 'type' => 'db',
+ 'message' => $err_str), FALSE, TRUE);
+}
// error steps
if ($_action=='error' && !empty($_GET['_code']))
- {
raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
- }
-
-// handle HTML->text conversion
-if ($_action=='html2text')
- {
- $htmlText = $HTTP_RAW_POST_DATA;
- $converter = new html2text($htmlText);
-
- // TODO possibly replace with rcube_remote_response()
- header('Content-Type: text/plain');
- $plaintext = $converter->get_text();
- print $plaintext;
-
- exit;
- }
// try to log in
if ($_action=='login' && $_task=='mail')
- {
+{
$host = rcmail_autoselect_host();
// check if client supports cookies
if (empty($_COOKIE))
- {
- show_message("cookiesdisabled", 'warning');
- }
- else if (isset($_POST['_user']) && isset($_POST['_pass']) &&
- rcmail_login(get_input_value('_user', RCUBE_INPUT_POST),
+ {
+ $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");
exit;
- }
- else
- {
- show_message("loginfailed", 'warning');
- $_SESSION['user_id'] = '';
- }
}
+ else
+ {
+ $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'loginfailed', 'warning');
+ rcmail_kill_session();
+ }
+}
// end session
-else if ($_action=='logout' && isset($_SESSION['user_id']))
- {
- show_message('loggedout');
+else if (($_task=='logout' || $_action=='logout') && isset($_SESSION['user_id']))
+{
+ $OUTPUT->show_message('loggedout');
rcmail_kill_session();
- }
+}
// check session and auth cookie
else if ($_action != 'login' && $_SESSION['user_id'] && $_action != 'send')
+{
+ if (!rcmail_authenticate_session())
{
- if (!rcmail_authenticate_session() ||
- (!empty($CONFIG['session_lifetime']) && isset($SESS_CHANGED) && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime()))
- {
- $message = show_message('sessionerror', 'error');
+ $OUTPUT->show_message('sessionerror', 'error');
rcmail_kill_session();
- }
}
+}
// log in to imap server
-if (!empty($_SESSION['user_id']) && $_task=='mail')
- {
+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)
- {
- show_message('imaperror', 'error');
- $_SESSION['user_id'] = '';
- }
+ {
+ $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($_SESSION['user_id']))
- {
- if ($REMOTE_REQUEST)
- {
- $message .= "setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);";
- rcube_remote_response($message);
- }
+if (empty($USER->ID))
+{
+ if ($OUTPUT->ajax_call)
+ $OUTPUT->remote_response("setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);");
$_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");
+ }
+}
// set task and action to client
-$script = sprintf("%s.set_env('task', '%s');", $JS_OBJECT_NAME, $_task);
+$OUTPUT->set_env('task', $_task);
if (!empty($_action))
- $script .= sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action);
-
-$OUTPUT->add_script($script);
+ $OUTPUT->set_env('action', $_action);
// not logged in -> show login page
-if (!$_SESSION['user_id'])
- {
- parse_template('login');
+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>');
+
+ $OUTPUT->task = 'login';
+ $OUTPUT->send('login');
exit;
- }
+}
// handle keep-alive signal
if ($_action=='keep-alive')
- {
- rcube_remote_response('');
+{
+ $OUTPUT->reset();
+ $OUTPUT->send('');
exit;
- }
+}
// include task specific files
if ($_task=='mail')
- {
+{
include_once('program/steps/mail/func.inc');
if ($_action=='show' || $_action=='preview' || $_action=='print')
@@ -278,13 +289,16 @@
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')
+ if ($_action=='compose' || $_action=='remove-attachment' || $_action=='display-attachment')
include('program/steps/mail/compose.inc');
if ($_action=='addcontact')
@@ -299,7 +313,7 @@
if ($_action=='getunread')
include('program/steps/mail/getunread.inc');
- if ($_action=='list' && isset($_GET['_remote']))
+ if ($_action=='list' && isset($_REQUEST['_remote']))
include('program/steps/mail/list.inc');
if ($_action=='search')
@@ -311,21 +325,18 @@
if ($_action=='rss')
include('program/steps/mail/rss.inc');
- if ($_action=='quotaimg')
- include('program/steps/mail/quotaimg.inc');
-
if ($_action=='quotadisplay')
include('program/steps/mail/quotadisplay.inc');
// make sure the message count is refreshed
$IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE);
- }
+}
// include task specific files
if ($_task=='addressbook')
- {
+{
include_once('program/steps/addressbook/func.inc');
if ($_action=='save')
@@ -340,17 +351,23 @@
if ($_action=='show')
include('program/steps/addressbook/show.inc');
- if ($_action=='list' && $_GET['_remote'])
+ if ($_action=='list' && $_REQUEST['_remote'])
include('program/steps/addressbook/list.inc');
- if ($_action=='ldappublicsearch')
- include('program/steps/addressbook/ldapsearchform.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');
+}
// include task specific files
if ($_task=='settings')
- {
+{
include_once('program/steps/settings/func.inc');
if ($_action=='save-identity')
@@ -372,18 +389,19 @@
$_action=='create-folder' || $_action=='rename-folder' || $_action=='delete-folder')
include('program/steps/settings/manage_folders.inc');
- }
+}
// parse main template
-parse_template($_task);
+$OUTPUT->send($_task);
// if we arrive here, something went wrong
-raise_error(array('code' => 404,
- 'type' => 'php',
- 'line' => __LINE__,
- 'file' => __FILE__,
- 'message' => "Invalid request"), TRUE, TRUE);
+raise_error(array(
+ 'code' => 404,
+ 'type' => 'php',
+ 'line' => __LINE__,
+ 'file' => __FILE__,
+ 'message' => "Invalid request"), TRUE, TRUE);
?>
--
Gitblit v1.9.1