From aad6e2a9c4857715c8bd56693d21b87dd0c16263 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 27 Mar 2007 05:34:30 -0400
Subject: [PATCH] New session authentication, should fix bugs #1483951 and #1484299; testing required
---
program/include/session.inc | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/program/include/session.inc b/program/include/session.inc
index 00ca299..59631af 100644
--- a/program/include/session.inc
+++ b/program/include/session.inc
@@ -36,7 +36,10 @@
// read session data
function sess_read($key)
{
- global $DB, $SESS_CHANGED;
+ global $DB, $SESS_CHANGED, $SESS_CLIENT_IP;
+
+ if ($DB->is_error())
+ return FALSE;
$sql_result = $DB->query("SELECT vars, ip, ".$DB->unixtimestamp('changed')." AS changed
FROM ".get_table_name('session')."
@@ -45,7 +48,8 @@
if ($sql_arr = $DB->fetch_assoc($sql_result))
{
- $SESS_CHANGED = mktime(); //$sql_arr['changed'];
+ $SESS_CHANGED = $sql_arr['changed'];
+ $SESS_CLIENT_IP = $sql_arr['ip'];
if (strlen($sql_arr['vars']))
return $sql_arr['vars'];
@@ -59,6 +63,9 @@
function sess_write($key, $vars)
{
global $DB;
+
+ if ($DB->is_error())
+ return FALSE;
$sql_result = $DB->query("SELECT 1
FROM ".get_table_name('session')."
@@ -96,6 +103,9 @@
{
global $DB;
+ if ($DB->is_error())
+ return FALSE;
+
// delete session entries in cache table
$DB->query("DELETE FROM ".get_table_name('cache')."
WHERE session_id=?",
@@ -105,7 +115,6 @@
WHERE sess_id=?",
$key);
- rcmail_clear_session_temp($key);
return TRUE;
}
@@ -114,6 +123,9 @@
function sess_gc($maxlifetime)
{
global $DB;
+
+ if ($DB->is_error())
+ return FALSE;
// get all expired sessions
$sql_result = $DB->query("SELECT sess_id
@@ -137,17 +149,36 @@
WHERE sess_id IN ('".join("','", $a_exp_sessions)."')");
}
- // remove session specific temp dirs
- foreach ($a_exp_sessions as $key)
- rcmail_clear_session_temp($key);
-
// also run message cache GC
rcmail_message_cache_gc();
+ rcmail_temp_gc();
return TRUE;
}
+function sess_regenerate_id()
+ {
+ $randlen = 32;
+ $randval = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ $random = "";
+ for ($i=1; $i <= $randlen; $i++)
+ $random .= substr($randval, rand(0,(strlen($randval) - 1)), 1);
+
+ // use md5 value for id or remove capitals from string $randval
+ $random = md5($random);
+
+ // delete old session record
+ sess_destroy(session_id());
+
+ session_id($random);
+ $cookie = session_get_cookie_params();
+ setcookie(session_name(), $random, $cookie['lifetime'], $cookie['path']);
+
+ return true;
+ }
+
+
// set custom functions for PHP session management
session_set_save_handler('sess_open', 'sess_close', 'sess_read', 'sess_write', 'sess_destroy', 'sess_gc');
--
Gitblit v1.9.1