From fe2f0be4352ba0bc213a2c6d4dfcbbddea1a551c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 21 Aug 2012 04:50:14 -0400
Subject: [PATCH] Fix possible PHP warning, read default_folders using config->get() to support deprecated option name (default_imap_folders)
---
program/include/rcube_session.php | 110 ++++++++++++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 49 deletions(-)
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index e6e636e..6192466 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -19,9 +19,6 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id: session.inc 2932 2009-09-07 12:51:21Z alec $
-
*/
/**
@@ -40,10 +37,9 @@
private $unsets = array();
private $gc_handlers = array();
private $cookiename = 'roundcube_sessauth';
- private $vars = false;
+ private $vars;
private $key;
private $now;
- private $prev;
private $secret = '';
private $ip_check = false;
private $logging = false;
@@ -65,7 +61,7 @@
// use memcache backend
if ($config->get('session_storage', 'db') == 'memcache') {
- $this->memcache = rcmail::get_instance()->get_memcache();
+ $this->memcache = rcube::get_instance()->get_memcache();
// set custom functions for PHP session management if memcache is available
if ($this->memcache) {
@@ -78,7 +74,7 @@
array($this, 'gc'));
}
else {
- raise_error(array('code' => 604, 'type' => 'db',
+ rcube::raise_error(array('code' => 604, 'type' => 'db',
'line' => __LINE__, 'file' => __FILE__,
'message' => "Failed to connect to memcached. Please check configuration"),
true, true);
@@ -129,7 +125,7 @@
public function db_read($key)
{
$sql_result = $this->db->query(
- "SELECT vars, ip, changed FROM ".get_table_name('session')
+ "SELECT vars, ip, changed FROM ".$this->db->table_name('session')
." WHERE sess_id = ?", $key);
if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
@@ -138,11 +134,10 @@
$this->vars = base64_decode($sql_arr['vars']);
$this->key = $key;
- if (!empty($this->vars))
- return $this->vars;
+ return !empty($this->vars) ? (string) $this->vars : '';
}
- return false;
+ return null;
}
@@ -161,7 +156,7 @@
// no session row in DB (db_read() returns false)
if (!$this->key) {
- $oldvars = false;
+ $oldvars = null;
}
// use internal data from read() for fast requests (up to 0.5 sec.)
else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
@@ -171,24 +166,24 @@
$oldvars = $this->db_read($key);
}
- if ($oldvars !== false) {
+ if ($oldvars !== null) {
$newvars = $this->_fixvars($vars, $oldvars);
if ($newvars !== $oldvars) {
$this->db->query(
sprintf("UPDATE %s SET vars=?, changed=%s WHERE sess_id=?",
- get_table_name('session'), $now),
+ $this->db->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);
+ $this->db->query("UPDATE ".$this->db->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),
+ $this->db->table_name('session'), $now, $now),
$key, base64_encode($vars), (string)$this->ip);
}
@@ -201,7 +196,7 @@
*/
private function _fixvars($vars, $oldvars)
{
- if ($oldvars !== false) {
+ if ($oldvars !== null) {
$a_oldvars = $this->unserialize($oldvars);
if (is_array($a_oldvars)) {
foreach ((array)$this->unsets as $k)
@@ -223,13 +218,14 @@
* Handler for session_destroy()
*
* @param string Session ID
+ *
* @return boolean True on success
*/
public function db_destroy($key)
{
- $this->db->query(
- sprintf("DELETE FROM %s WHERE sess_id = ?", get_table_name('session')),
- $key);
+ if ($key) {
+ $this->db->query(sprintf("DELETE FROM %s WHERE sess_id = ?", $this->db->table_name('session')), $key);
+ }
return true;
}
@@ -246,7 +242,7 @@
// just delete all expired sessions
$this->db->query(
sprintf("DELETE FROM %s WHERE changed < %s",
- get_table_name('session'), $this->db->fromunixtime(time() - $maxlifetime)));
+ $this->db->table_name('session'), $this->db->fromunixtime(time() - $maxlifetime)));
$this->gc();
@@ -269,12 +265,12 @@
$this->vars = $arr['vars'];
$this->key = $key;
- if (!empty($this->vars))
- return $this->vars;
+ return !empty($this->vars) ? (string) $this->vars : '';
}
- return false;
+ return null;
}
+
/**
* Save session data.
@@ -290,30 +286,37 @@
// no session data in cache (mc_read() returns false)
if (!$this->key)
- $oldvars = false;
+ $oldvars = null;
// use internal data for fast requests (up to 0.5 sec.)
else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
$oldvars = $this->vars;
else // else read data again
$oldvars = $this->mc_read($key);
- $newvars = $oldvars !== false ? $this->_fixvars($vars, $oldvars) : $vars;
-
+ $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
+
if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 2)
return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)), MEMCACHE_COMPRESSED, $this->lifetime);
-
+
return true;
}
+
/**
* Handler for session_destroy() with memcache backend
*
* @param string Session ID
+ *
* @return boolean True on success
*/
public function mc_destroy($key)
{
- return $this->memcache->delete($key);
+ if ($key) {
+ // #1488592: use 2nd argument
+ $this->memcache->delete($key, 0);
+ }
+
+ return true;
}
@@ -322,8 +325,9 @@
*/
public function gc()
{
- foreach ($this->gc_handlers as $fct)
+ foreach ($this->gc_handlers as $fct) {
call_user_func($fct);
+ }
}
@@ -353,7 +357,7 @@
{
session_regenerate_id($destroy);
- $this->vars = false;
+ $this->vars = null;
$this->key = session_id();
return true;
@@ -376,16 +380,17 @@
return true;
}
-
+
+
/**
* Kill this session
*/
public function kill()
{
- $this->vars = false;
+ $this->vars = null;
$this->ip = $_SERVER['REMOTE_ADDR']; // update IP (might have changed)
$this->destroy(session_id());
- rcmail::setcookie($this->cookiename, '-del-', time() - 60);
+ rcube_utils::setcookie($this->cookiename, '-del-', time() - 60);
}
@@ -518,7 +523,6 @@
// 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);
}
/**
@@ -527,7 +531,7 @@
public function set_keep_alive($keep_alive)
{
$this->keep_alive = $keep_alive;
-
+
if ($this->lifetime < $keep_alive)
$this->set_lifetime($keep_alive + 30);
}
@@ -547,7 +551,7 @@
{
return $this->ip;
}
-
+
/**
* Setter for cookie encryption secret
*/
@@ -564,7 +568,8 @@
{
$this->ip_check = $check;
}
-
+
+
/**
* Setter for the cookie name used for session cookie
*/
@@ -589,15 +594,22 @@
$this->log("IP check failed for " . $this->key . "; expected " . $this->ip . "; got " . $_SERVER['REMOTE_ADDR']);
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;
- $this->log("Session authentication failed for " . $this->key . "; invalid auth cookie sent");
+ $this->log("Session auth check failed for " . $this->key . "; timeslot = " . date('Y-m-d H:i:s', $this->now));
+ $result = false;
+
+ // Check if using id from a previous time slot
+ for ($i = 1; $i <= 2; $i++) {
+ $prev = $this->now - ($this->lifetime / 2) * $i;
+ if ($this->_mkcookie($prev) == $this->cookie) {
+ $this->log("Send new auth cookie for " . $this->key . ": " . $this->cookie);
+ $this->set_auth_cookie();
+ $result = true;
+ }
}
}
+
+ if (!$result)
+ $this->log("Session authentication failed for " . $this->key . "; invalid auth cookie sent; timeslot = " . date('Y-m-d H:i:s', $prev));
return $result;
}
@@ -609,7 +621,7 @@
function set_auth_cookie()
{
$this->cookie = $this->_mkcookie($this->now);
- rcmail::setcookie($this->cookiename, $this->cookie, 0);
+ rcube_utils::setcookie($this->cookiename, $this->cookie, 0);
$_COOKIE[$this->cookiename] = $this->cookie;
}
@@ -624,14 +636,14 @@
$auth_string = "$this->key,$this->secret,$timeslot";
return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
}
-
+
/**
- *
+ * Writes debug information to the log
*/
function log($line)
{
if ($this->logging)
- write_log('session', $line);
+ rcube::write_log('session', $line);
}
}
--
Gitblit v1.9.1