From ab0b51a1fef87bcc643c3aaf2e635c811b28ccd8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Feb 2011 06:10:59 -0500
Subject: [PATCH] - Use only one from IMAP authentication methods to prevent login delays (1487784)
---
program/include/rcube_session.php | 244 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 192 insertions(+), 52 deletions(-)
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index c3332f0..2bd663c 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/include/rcube_session.php |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -31,12 +31,17 @@
{
private $db;
private $ip;
+ private $start;
private $changed;
private $unsets = array();
private $gc_handlers = array();
- private $start;
+ private $cookiename = 'roundcube_sessauth';
private $vars = false;
private $key;
+ private $now;
+ private $prev;
+ private $secret = '';
+ private $ip_check = false;
private $keep_alive = 0;
/**
@@ -45,8 +50,10 @@
public function __construct($db, $lifetime=60)
{
$this->db = $db;
- $this->lifetime = $lifetime;
$this->start = microtime(true);
+ $this->ip = $_SERVER['REMOTE_ADDR'];
+
+ $this->set_lifetime($lifetime);
// set custom functions for PHP session management
session_set_save_handler(
@@ -81,19 +88,26 @@
if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
$this->changed = $sql_arr['changed'];
- $this->vars = $sql_arr['vars'];
- $this->ip = $sql_arr['ip'];
- $this->key = $key;
+ $this->ip = $sql_arr['ip'];
+ $this->vars = base64_decode($sql_arr['vars']);
+ $this->key = $key;
- if (!empty($sql_arr['vars']))
- return $sql_arr['vars'];
+ if (!empty($this->vars))
+ return $this->vars;
}
return false;
}
-
- // save session data
+
+ /**
+ * Save session data.
+ * handler for session_read()
+ *
+ * @param string Session ID
+ * @param string Serialized session vars
+ * @return boolean True on success
+ */
public function write($key, $vars)
{
$ts = microtime(true);
@@ -105,35 +119,35 @@
} else { // else read data again from DB
$oldvars = $this->read($key);
}
-
+
if ($oldvars !== false) {
- $a_oldvars = $this->unserialize($oldvars);
- foreach ((array)$this->unsets as $k)
- unset($a_oldvars[$k]);
+ $a_oldvars = $this->unserialize($oldvars);
+ if (is_array($a_oldvars)) {
+ foreach ((array)$this->unsets as $k)
+ unset($a_oldvars[$k]);
- $newvars = $this->serialize(array_merge(
- (array)$a_oldvars, (array)$this->unserialize($vars)));
-
- if ($this->keep_alive>0) {
- $timeout = min($this->lifetime * 0.5,
- $this->lifetime - $this->keep_alive);
- } else {
- $timeout = 0;
+ $newvars = $this->serialize(array_merge(
+ (array)$a_oldvars, (array)$this->unserialize($vars)));
}
+ else
+ $newvars = $vars;
- if (!($newvars === $oldvars) || ($ts - $this->changed > $timeout)) {
+ if ($newvars !== $oldvars) {
$this->db->query(
- sprintf("UPDATE %s SET vars = ?, changed = %s WHERE sess_id = ?",
- get_table_name('session'), $now),
- $newvars, $key);
+ sprintf("UPDATE %s SET vars=?, changed=%s WHERE sess_id=?",
+ get_table_name('session'), $now),
+ base64_encode($newvars), $key);
+ }
+ else if ($ts - $this->changed > $this->lifetime / 2) {
+ $this->db->query("UPDATE ".get_table_name('session')." SET changed=$now WHERE sess_id=?", $key);
}
}
else {
$this->db->query(
sprintf("INSERT INTO %s (sess_id, vars, ip, created, changed) ".
"VALUES (?, ?, ?, %s, %s)",
- get_table_name('session'), $now, $now),
- $key, $vars, (string)$_SERVER['REMOTE_ADDR']);
+ get_table_name('session'), $now, $now),
+ $key, base64_encode($vars), (string)$this->ip);
}
$this->unsets = array();
@@ -141,7 +155,12 @@
}
- // handler for session_destroy()
+ /**
+ * Handler for session_destroy()
+ *
+ * @param string Session ID
+ * @return boolean True on success
+ */
public function destroy($key)
{
$this->db->query(
@@ -152,7 +171,12 @@
}
- // garbage collecting function
+ /**
+ * Garbage collecting function
+ *
+ * @param string Session lifetime in seconds
+ * @return boolean True on success
+ */
public function gc($maxlifetime)
{
// just delete all expired sessions
@@ -167,7 +191,11 @@
}
- // registering additional garbage collector functions
+ /**
+ * Register additional garbage collector functions
+ *
+ * @param mixed Callback function
+ */
public function register_gc_handler($func_name)
{
if ($func_name && !in_array($func_name, $this->gc_handlers))
@@ -175,33 +203,41 @@
}
+ /**
+ * Generate and set new session id
+ */
public function regenerate_id()
{
+ // delete old session record
+ $this->destroy(session_id());
+ $this->vars = false;
+
$randval = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
for ($random = '', $i=1; $i <= 32; $i++) {
$random .= substr($randval, mt_rand(0,(strlen($randval) - 1)), 1);
}
- // use md5 value for id or remove capitals from string $randval
- $random = md5($random);
-
- // delete old session record
- $this->destroy(session_id());
-
- session_id($random);
+ // use md5 value for id
+ $this->key = md5($random);
+ session_id($this->key);
$cookie = session_get_cookie_params();
$lifetime = $cookie['lifetime'] ? time() + $cookie['lifetime'] : 0;
- rcmail::setcookie(session_name(), $random, $lifetime);
+ rcmail::setcookie(session_name(), $this->key, $lifetime);
return true;
}
- // unset session variable
- public function remove($var=NULL)
+ /**
+ * Unset a session variable
+ *
+ * @param string Varibale name
+ * @return boolean True on success
+ */
+ public function remove($var=null)
{
if (empty($var))
return $this->destroy(session_id());
@@ -211,9 +247,21 @@
return true;
}
+
+ /**
+ * Kill this session
+ */
+ public function kill()
+ {
+ $this->vars = false;
+ $this->destroy(session_id());
+ rcmail::setcookie($this->cookiename, '-del-', time() - 60);
+ }
- // serialize session data
+ /**
+ * Serialize session data
+ */
private function serialize($vars)
{
$data = '';
@@ -226,8 +274,10 @@
}
- // unserialize session data
- // http://www.php.net/manual/en/function.session-decode.php#56106
+ /**
+ * Unserialize session data
+ * http://www.php.net/manual/en/function.session-decode.php#56106
+ */
private function unserialize($str)
{
$str = (string)$str;
@@ -312,26 +362,116 @@
return unserialize( 'a:' . $items . ':{' . $serialized . '}' );
}
+
+ /**
+ * Setter for session lifetime
+ */
+ public function set_lifetime($lifetime)
+ {
+ $this->lifetime = max(120, $lifetime);
+
+ // valid time range is now - 1/2 lifetime to now + 1/2 lifetime
+ $now = time();
+ $this->now = $now - ($now % ($this->lifetime / 2));
+ $this->prev = $this->now - ($this->lifetime / 2);
+ }
+
+ /**
+ * Setter for keep_alive interval
+ */
public function set_keep_alive($keep_alive)
{
$this->keep_alive = $keep_alive;
+
+ if ($this->lifetime < $keep_alive)
+ $this->set_lifetime($keep_alive + 30);
}
+ /**
+ * Getter for keep_alive interval
+ */
public function get_keep_alive()
{
return $this->keep_alive;
}
- // getter for private variables
- public function get_ts()
- {
- return $this->changed;
- }
-
- // getter for private variables
+ /**
+ * Getter for remote IP saved with this session
+ */
public function get_ip()
{
return $this->ip;
}
+
+ /**
+ * Setter for cookie encryption secret
+ */
+ function set_secret($secret)
+ {
+ $this->secret = $secret;
+ }
+
+
+ /**
+ * Enable/disable IP check
+ */
+ function set_ip_check($check)
+ {
+ $this->ip_check = $check;
+ }
+
+ /**
+ * Setter for the cookie name used for session cookie
+ */
+ function set_cookiename($cookiename)
+ {
+ if ($cookiename)
+ $this->cookiename = $cookiename;
+ }
+
+
+ /**
+ * Check session authentication cookie
+ *
+ * @return boolean True if valid, False if not
+ */
+ function check_auth()
+ {
+ $this->cookie = $_COOKIE[$this->cookiename];
+ $result = $this->ip_check ? $_SERVER['REMOTE_ADDR'] == $this->ip : true;
+
+ if ($result && $this->_mkcookie($this->now) != $this->cookie) {
+ // Check if using id from previous time slot
+ if ($this->_mkcookie($this->prev) == $this->cookie)
+ $this->set_auth_cookie();
+ else
+ $result = false;
+ }
+
+ return $result;
+ }
+
+
+ /**
+ * Set session authentication cookie
+ */
+ function set_auth_cookie()
+ {
+ $this->cookie = $this->_mkcookie($this->now);
+ rcmail::setcookie($this->cookiename, $this->cookie, 0);
+ $_COOKIE[$this->cookiename] = $this->cookie;
+ }
+
+
+ /**
+ * Create session cookie from session data
+ *
+ * @param int Time slot to use
+ */
+ function _mkcookie($timeslot)
+ {
+ $auth_string = "$this->key,$this->secret,$timeslot";
+ return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
+ }
}
--
Gitblit v1.9.1