From 3ea30ef7ebb7aa6180a47db29575055dd97cff62 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Wed, 04 Nov 2009 02:22:17 -0500 Subject: [PATCH] - fix HTTPS checking (#1486273) --- program/include/rcmail.php | 387 ++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 294 insertions(+), 93 deletions(-) diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 8a061be..2c002b1 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -5,7 +5,7 @@ | program/include/rcmail.php | | | | This file is part of the RoundCube Webmail client | - | Copyright (C) 2008, RoundCube Dev. - Switzerland | + | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -15,7 +15,7 @@ | Author: Thomas Bruederli <roundcube@gmail.com> | +-----------------------------------------------------------------------+ - $Id: rcube_browser.php 328 2006-08-30 17:41:21Z thomasb $ + $Id: rcmail.php 328 2006-08-30 17:41:21Z thomasb $ */ @@ -28,15 +28,17 @@ */ class rcmail { - static public $main_tasks = array('mail','settings','addressbook','login','logout'); + static public $main_tasks = array('mail','settings','addressbook','login','logout','dummy'); static private $instance; public $config; public $user; public $db; + public $smtp; public $imap; public $output; + public $plugins; public $task = 'mail'; public $action = ''; public $comm_path = './'; @@ -47,7 +49,7 @@ /** * This implements the 'singleton' design pattern * - * @return object qvert The one and only instance + * @return object rcmail The one and only instance */ static function get_instance() { @@ -82,8 +84,15 @@ { $config_all = $this->config->all(); + // initialize syslog + if ($this->config->get('log_driver') == 'syslog') { + $syslog_id = $this->config->get('syslog_id', 'roundcube'); + $syslog_facility = $this->config->get('syslog_facility', LOG_USER); + openlog($syslog_id, LOG_ODELAY, $syslog_facility); + } + // set task and action properties - $this->set_task(strip_quotes(get_input_value('_task', RCUBE_INPUT_GPC))); + $this->set_task(get_input_value('_task', RCUBE_INPUT_GPC)); $this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC)); // connect to database @@ -111,13 +120,12 @@ $_SESSION['temp'] = true; } - // create user object $this->set_user(new rcube_user($_SESSION['user_id'])); // reset some session parameters when changing task if ($_SESSION['task'] != $this->task) - unset($_SESSION['page']); + rcube_sess_unset('page'); // set current task to session $_SESSION['task'] = $this->task; @@ -125,6 +133,9 @@ // create IMAP object if ($this->task == 'mail') $this->imap_init(); + + // create plugin API and load plugins + $this->plugins = rcube_plugin_api::get_instance(); } @@ -135,14 +146,12 @@ */ public function set_task($task) { - if (!in_array($task, self::$main_tasks)) - $task = 'mail'; - - $this->task = $task; - $this->comm_path = $this->url(array('task' => $task)); + $task = asciiwords($task); + $this->task = $task ? $task : 'mail'; + $this->comm_path = $this->url(array('task' => $this->task)); if ($this->output) - $this->output->set_env('task', $task); + $this->output->set_env('task', $this->task); } @@ -161,10 +170,14 @@ $this->config->merge((array)$this->user->get_prefs()); } - $_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language')); + $_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language', $_SESSION['language'])); // set localization - setlocale(LC_ALL, $_SESSION['language'] . '.utf8'); + setlocale(LC_ALL, $_SESSION['language'] . '.utf8', 'en_US.utf8'); + + // workaround for http://bugs.php.net/bug.php?id=18556 + if (in_array($_SESSION['language'], array('tr_TR', 'ku', 'az_AZ'))) + setlocale(LC_CTYPE, 'en_US' . '.utf8'); } @@ -177,7 +190,13 @@ private function language_prop($lang) { static $rcube_languages, $rcube_language_aliases; - + + // user HTTP_ACCEPT_LANGUAGE if no language is specified + if (empty($lang) || $lang == 'auto') { + $accept_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); + $lang = str_replace('-', '_', $accept_langs[0]); + } + if (empty($rcube_languages)) { @include(INSTALL_PATH . 'program/localization/index.inc'); } @@ -211,7 +230,7 @@ /** * Get the current database connection * - * @return object rcube_db Database connection object + * @return object rcube_mdb2 Database connection object */ public function get_dbh() { @@ -229,6 +248,47 @@ /** + * Return instance of the internal address book class + * + * @param boolean True if the address book needs to be writeable + * @return object rcube_contacts Address book object + */ + public function get_address_book($id, $writeable = false) + { + $contacts = null; + $ldap_config = (array)$this->config->get('ldap_public'); + $abook_type = strtolower($this->config->get('address_book_type')); + + $plugin = $this->plugins->exec_hook('get_address_book', array('id' => $id, 'writeable' => $writeable)); + + // plugin returned instance of a rcube_addressbook + if ($plugin['instance'] instanceof rcube_addressbook) { + $contacts = $plugin['instance']; + } + else if ($id && $ldap_config[$id]) { + $contacts = new rcube_ldap($ldap_config[$id], $this->config->get('ldap_debug'), $this->config->mail_domain($_SESSION['imap_host'])); + } + else if ($id === '0') { + $contacts = new rcube_contacts($this->db, $this->user->ID); + } + else if ($abook_type == 'ldap') { + // Use the first writable LDAP address book. + foreach ($ldap_config as $id => $prop) { + if (!$writeable || $prop['writable']) { + $contacts = new rcube_ldap($prop, $this->config->get('ldap_debug'), $this->config->mail_domain($_SESSION['imap_host'])); + break; + } + } + } + else { + $contacts = new rcube_contacts($this->db, $this->user->ID); + } + + return $contacts; + } + + + /** * Init output object for GUI and add common scripts. * This will instantiate a rcmail_template object and set * environment vars according to the current session and configuration @@ -242,8 +302,12 @@ if (!($this->output instanceof rcube_template)) $this->output = new rcube_template($this->task, $framed); - foreach (array('flag_for_deletion','read_when_deleted') as $js_config_var) { - $this->output->set_env($js_config_var, $this->config->get($js_config_var)); + // set keep-alive/check-recent interval + if ($keep_alive = $this->config->get('keep_alive')) { + // be sure that it's less than session lifetime + if ($session_lifetime = $this->config->get('session_lifetime')) + $keep_alive = min($keep_alive, $session_lifetime * 60 - 30); + $this->output->set_env('keep_alive', max(60, $keep_alive)); } if ($framed) { @@ -254,10 +318,10 @@ $this->output->set_env('task', $this->task); $this->output->set_env('action', $this->action); $this->output->set_env('comm_path', $this->comm_path); - $this->output->set_charset($this->config->get('charset', RCMAIL_CHARSET)); + $this->output->set_charset(RCMAIL_CHARSET); // add some basic label to client - $this->output->add_label('loading'); + $this->output->add_label('loading', 'servererror'); return $this->output; } @@ -275,6 +339,20 @@ return $this->output; } + + + /** + * Create SMTP object and connect to server + * + * @param boolean True if connection should be established + */ + public function smtp_init($connect = false) + { + $this->smtp = new rcube_smtp(); + + if ($connect) + $this->smtp->connect(); + } /** @@ -288,6 +366,7 @@ $this->imap = new rcube_imap($this->db); $this->imap->debug_level = $this->config->get('debug_level'); $this->imap->skip_deleted = $this->config->get('skip_deleted'); + $this->imap->index_sort = $this->config->get('index_sort', true); // enable caching of imap data if ($this->config->get('enable_caching')) { @@ -296,6 +375,17 @@ // set pagesize from config $this->imap->set_pagesize($this->config->get('pagesize', 50)); + + // Setting root and delimiter before iil_Connect can save time detecting them + // using NAMESPACE and LIST + $options = array( + 'auth_method' => $this->config->get('imap_auth_type', 'check'), + 'delimiter' => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'), + 'rootdir' => isset($_SESSION['imap_root']) ? $_SESSION['imap_root'] : $this->config->get('imap_root'), + 'debug_mode' => (bool) $this->config->get('imap_debug', 0), + ); + + $this->imap->set_options($options); // set global object for backward compatibility $GLOBALS['IMAP'] = $this->imap; @@ -315,7 +405,7 @@ $conn = false; if ($_SESSION['imap_host'] && !$this->imap->conn) { - if (!($conn = $this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl'], rcmail::get_instance()->config->get('imap_auth_type', 'check')))) { + if (!($conn = $this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']))) { if ($this->output) $this->output->show_message($this->imap->error_code == -1 ? 'imaperror' : 'sessionerror', 'error'); } @@ -366,11 +456,13 @@ if ($a_host['host']) { $host = $a_host['host']; $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null; - $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $config['default_port']); + if(!empty($a_host['port'])) + $imap_port = $a_host['port']; + else if ($imap_ssl && $imap_ssl != 'tls') + $imap_port = 993; } - else - $imap_port = $config['default_port']; - + + $imap_port = $imap_port ? $imap_port : $config['default_port']; /* Modify username with domain if required Inspired by Marco <P0L0_notspam_binware.org> @@ -383,20 +475,21 @@ $username .= '@'.$config['username_domain']; } - // try to resolve email address from virtuser table - if (!empty($config['virtuser_file']) && strpos($username, '@')) - $username = rcube_user::email2user($username); + // try to resolve email address from virtuser table + if (strpos($username, '@')) + if ($virtuser = rcube_user::email2user($username)) + $username = $virtuser; // lowercase username if it's an e-mail address (#1484473) if (strpos($username, '@')) - $username = strtolower($username); + $username = mb_strtolower($username); // user already registered -> overwrite username if ($user = rcube_user::query($username, $host)) $username = $user->data['username']; // exit if IMAP login failed - if (!($imap_login = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl, $config['imap_auth_type']))) + if (!($imap_login = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl))) return false; // user already registered -> update user's record @@ -411,12 +504,19 @@ // get existing mailboxes (but why?) // $a_mailboxes = $this->imap->list_mailboxes(); } + else { + raise_error(array( + 'code' => 600, + 'type' => 'php', + 'message' => "Failed to create a user record. Maybe aborted by a plugin?" + ), true, false); + } } else { raise_error(array( 'code' => 600, 'type' => 'php', - 'file' => "config/main.inc.php", + 'file' => RCMAIL_CONFIG_DIR."/main.inc.php", 'message' => "Acces denied for new user $username. 'auto_create_user' is disabled" ), true, false); } @@ -431,8 +531,11 @@ $_SESSION['imap_host'] = $host; $_SESSION['imap_port'] = $imap_port; $_SESSION['imap_ssl'] = $imap_ssl; - $_SESSION['password'] = $this->encrypt_passwd($pass); + $_SESSION['password'] = $this->encrypt($pass); $_SESSION['login_time'] = mktime(); + + if ($_REQUEST['_timezone'] != '_default_') + $_SESSION['timezone'] = floatval($_REQUEST['_timezone']); // force reloading complete list of subscribed mailboxes $this->set_imap_prop(); @@ -456,10 +559,6 @@ { $this->imap->set_charset($this->config->get('default_charset', RCMAIL_CHARSET)); - // set root dir from config - if ($imap_root = $this->config->get('imap_root')) { - $this->imap->set_rootdir($imap_root); - } if ($default_folders = $this->config->get('default_imap_folders')) { $this->imap->set_default_mailboxes($default_folders); } @@ -469,6 +568,10 @@ if (isset($_SESSION['page'])) { $this->imap->set_page($_SESSION['page']); } + + // cache IMAP root and delimiter in session for performance reasons + $_SESSION['imap_root'] = $this->imap->root_dir; + $_SESSION['imap_delimiter'] = $this->imap->delimiter; } @@ -522,7 +625,7 @@ * @param mixed Named parameters array or label name * @return string Localized text */ - public function gettext($attrib) + public function gettext($attrib, $domain=null) { // load localization files if not done yet if (empty($this->texts)) @@ -537,9 +640,12 @@ $command_name = !empty($attrib['command']) ? $attrib['command'] : NULL; $alias = $attrib['name'] ? $attrib['name'] : ($command_name && $command_label_map[$command_name] ? $command_label_map[$command_name] : ''); - + + // check for text with domain + if ($domain && ($text_item = $this->texts[$domain.'.'.$alias])) + ; // text does not exist - if (!($text_item = $this->texts[$alias])) { + else if (!($text_item = $this->texts[$alias])) { /* raise_error(array( 'code' => 500, @@ -601,9 +707,9 @@ * * @param string Language ID */ - public function load_language($lang = null) + public function load_language($lang = null, $add = array()) { - $lang = $lang ? $this->language_prop($lang) : $_SESSION['language']; + $lang = $this->language_prop(($lang ? $lang : $_SESSION['language'])); // load localized texts if (empty($this->texts) || $lang != $_SESSION['language']) { @@ -631,6 +737,10 @@ $_SESSION['language'] = $lang; } + + // append additional texts (from plugin) + if (is_array($add) && !empty($add)) + $this->texts += $add; } @@ -652,7 +762,7 @@ continue; if ($label = $rcube_languages[$name]) - $sa_languages[$name] = $label ? $label : $name; + $sa_languages[$name] = $label; } closedir($dh); } @@ -681,7 +791,7 @@ if (!$valid || ($_SERVER['REQUEST_METHOD']!='POST' && $now - $_SESSION['auth_time'] > 300)) { $_SESSION['last_auth'] = $_SESSION['auth_time']; $_SESSION['auth_time'] = $now; - setcookie('sessauth', $this->get_auth_hash(session_id(), $now)); + rcmail::setcookie('sessauth', $this->get_auth_hash(session_id(), $now), 0); } } else { @@ -703,15 +813,11 @@ */ public function kill_session() { - $user_prefs = $this->user->get_prefs(); + $this->plugins->exec_hook('kill_session'); - if ((isset($_SESSION['sort_col']) && $_SESSION['sort_col'] != $user_prefs['message_sort_col']) || - (isset($_SESSION['sort_order']) && $_SESSION['sort_order'] != $user_prefs['message_sort_order'])) { - $this->user->save_prefs(array('message_sort_col' => $_SESSION['sort_col'], 'message_sort_order' => $_SESSION['sort_order'])); - } - - $_SESSION = array('language' => $USER->language, 'auth_time' => time(), 'temp' => true); - setcookie('sessauth', '-del-', time() - 60); + rcube_sess_unset(); + $_SESSION = array('language' => $this->user->language, 'auth_time' => time(), 'temp' => true); + rcmail::setcookie('sessauth', '-del-', time() - 60); $this->user->reset(); } @@ -752,12 +858,44 @@ $this->imap->write_cache(); } + if (is_object($this->smtp)) + $this->smtp->disconnect(); + if (is_object($this->contacts)) $this->contacts->close(); // before closing the database connection, write session data if ($_SERVER['REMOTE_ADDR']) session_write_close(); + } + + + /** + * Generate a unique token to be used in a form request + * + * @return string The request token + */ + public function get_request_token() + { + $key = $this->task; + + if (!$_SESSION['request_tokens'][$key]) + $_SESSION['request_tokens'][$key] = md5(uniqid($key . mt_rand(), true)); + + return $_SESSION['request_tokens'][$key]; + } + + + /** + * Check if the current request contains a valid token + * + * @param int Request method + * @return boolean True if request token is valid false if not + */ + public function check_request($mode = RCUBE_INPUT_POST) + { + $token = get_input_value('_token', $mode); + return !empty($token) && $_SESSION['request_tokens'][$this->task] == $token; } @@ -782,64 +920,108 @@ return md5($auth_string); } + /** - * Encrypt IMAP password using DES encryption + * Encrypt using 3DES * - * @param string Password to encrypt - * @return string Encryprted string + * @param string $clear clear text input + * @param string $key encryption key to retrieve from the configuration, defaults to 'des_key' + * @param boolean $base64 whether or not to base64_encode() the result before returning + * + * @return string encrypted text */ - public function encrypt_passwd($pass) + public function encrypt($clear, $key = 'des_key', $base64 = true) { - if (function_exists('mcrypt_module_open') && ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, ""))) { + if (!$clear) + return ''; + /*- + * Add a single canary byte to the end of the clear text, which + * will help find out how much of padding will need to be removed + * upon decryption; see http://php.net/mcrypt_generic#68082 + */ + $clear = pack("a*H2", $clear, "80"); + + if (function_exists('mcrypt_module_open') && + ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))) + { $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); - mcrypt_generic_init($td, $this->config->get_des_key(), $iv); - $cypher = mcrypt_generic($td, $pass); + mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv); + $cipher = $iv . mcrypt_generic($td, $clear); mcrypt_generic_deinit($td); mcrypt_module_close($td); } - else if (function_exists('des')) { - $cypher = des($this->config->get_des_key(), $pass, 1, 0, NULL); + else if (function_exists('des')) + { + define('DES_IV_SIZE', 8); + $iv = ''; + for ($i = 0; $i < constant('DES_IV_SIZE'); $i++) + $iv .= sprintf("%c", mt_rand(0, 255)); + $cipher = $iv . des($this->config->get_crypto_key($key), $clear, 1, 1, $iv); } - else { - $cypher = $pass; - + else + { raise_error(array( 'code' => 500, 'type' => 'php', 'file' => __FILE__, - 'message' => "Could not convert encrypt password. Make sure Mcrypt is installed or lib/des.inc is available" - ), true, false); + 'message' => "Could not perform encryption; make sure Mcrypt is installed or lib/des.inc is available" + ), true, true); } - - return base64_encode($cypher); + + return $base64 ? base64_encode($cipher) : $cipher; } - /** - * Decrypt IMAP password using DES encryption + * Decrypt 3DES-encrypted string * - * @param string Encrypted password - * @return string Plain password + * @param string $cipher encrypted text + * @param string $key encryption key to retrieve from the configuration, defaults to 'des_key' + * @param boolean $base64 whether or not input is base64-encoded + * + * @return string decrypted text */ - public function decrypt_passwd($cypher) + public function decrypt($cipher, $key = 'des_key', $base64 = true) { - if (function_exists('mcrypt_module_open') && ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, ""))) { - $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); - mcrypt_generic_init($td, $this->config->get_des_key(), $iv); - $pass = mdecrypt_generic($td, base64_decode($cypher)); + if (!$cipher) + return ''; + + $cipher = $base64 ? base64_decode($cipher) : $cipher; + + if (function_exists('mcrypt_module_open') && + ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, ""))) + { + $iv = substr($cipher, 0, mcrypt_enc_get_iv_size($td)); + $cipher = substr($cipher, mcrypt_enc_get_iv_size($td)); + mcrypt_generic_init($td, $this->config->get_crypto_key($key), $iv); + $clear = mdecrypt_generic($td, $cipher); mcrypt_generic_deinit($td); mcrypt_module_close($td); } - else if (function_exists('des')) { - $pass = des($this->config->get_des_key(), base64_decode($cypher), 0, 0, NULL); + else if (function_exists('des')) + { + define('DES_IV_SIZE', 8); + $iv = substr($cipher, 0, constant('DES_IV_SIZE')); + $cipher = substr($cipher, constant('DES_IV_SIZE')); + $clear = des($this->config->get_crypto_key($key), $cipher, 0, 1, $iv); } - else { - $pass = base64_decode($cypher); + else + { + raise_error(array( + 'code' => 500, + 'type' => 'php', + 'file' => __FILE__, + 'message' => "Could not perform decryption; make sure Mcrypt is installed or lib/des.inc is available" + ), true, true); } - - return preg_replace('/\x00/', '', $pass); + + /*- + * Trim PHP's padding and the canary byte; see note in + * rcmail::encrypt() and http://php.net/mcrypt_generic#68082 + */ + $clear = substr(rtrim($clear, "\0"), 0, -1); + + return $clear; } - /** * Build a valid URL to this instance of RoundCube @@ -852,18 +1034,37 @@ if (!is_array($p)) $p = array('_action' => @func_get_arg(0)); - if ($p['task'] && in_array($p['task'], rcmail::$main_tasks)) - $url = './?_task='.$p['task']; - else - $url = $this->comm_path; - + $task = $p['_task'] ? $p['_task'] : ($p['task'] ? $p['task'] : $this->task); + $p['_task'] = $task; unset($p['task']); - foreach ($p as $par => $val) - if (isset($val)) - $url .= '&'.urlencode($par).'='.urlencode($val); - + + $url = './'; + $delm = '?'; + foreach (array_reverse($p) as $key => $val) + { + if (!empty($val)) { + $par = $key[0] == '_' ? $key : '_'.$key; + $url .= $delm.urlencode($par).'='.urlencode($val); + $delm = '&'; + } + } return $url; } + + + /** + * Helper method to set a cookie with the current path and host settings + * + * @param string Cookie name + * @param string Cookie value + * @param string Expiration time + */ + public static function setcookie($name, $value, $exp = 0) + { + $cookie = session_get_cookie_params(); + setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'], + rcube_https_check()); + } } -- Gitblit v1.9.1