From 26bc46d9b671ea069fc779ecb8b4ac90323c2291 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 07 Sep 2011 02:59:48 -0400
Subject: [PATCH] - Move two entries from 0.6-rc to trunk's changelog part

---
 program/include/rcube_session.php |   51 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 3f1e1cc..3986c89 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -6,6 +6,7 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2011, Kolab Systems AG                                  |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -42,6 +43,7 @@
   private $prev;
   private $secret = '';
   private $ip_check = false;
+  private $logging = false;
   private $keep_alive = 0;
   private $memcache;
 
@@ -53,31 +55,24 @@
     $this->db = $db;
     $this->start = microtime(true);
     $this->ip = $_SERVER['REMOTE_ADDR'];
+    $this->logging = $config->get('log_session', false);
 
     $lifetime = $config->get('session_lifetime', 1) * 60;
     $this->set_lifetime($lifetime);
 
     // use memcache backend
     if ($config->get('session_storage', 'db') == 'memcache') {
-      $this->memcache = new Memcache;
-      $mc_available = 0;
-      foreach ($config->get('memcache_hosts', array()) as $host) {
-        list($host, $port) = explode(':', $host);
-        if (!$port) $port = 11211;
-        // add server and attempt to connect if not already done yet
-        if ($this->memcache->addServer($host, $port) && !$mc_available)
-          $mc_available += intval($this->memcache->connect($host, $port));
-      }
+      $this->memcache = rcmail::get_instance()->get_memcache();
 
       // set custom functions for PHP session management if memcache is available
-      if ($mc_available) {
+      if ($this->memcache) {
         session_set_save_handler(
           array($this, 'open'),
           array($this, 'close'),
           array($this, 'mc_read'),
           array($this, 'mc_write'),
           array($this, 'mc_destroy'),
-          array($this, 'rcube_gc'));
+          array($this, 'gc'));
       }
       else {
         raise_error(array('code' => 604, 'type' => 'db',
@@ -131,12 +126,11 @@
   public function db_read($key)
   {
     $sql_result = $this->db->query(
-      sprintf("SELECT vars, ip, %s AS changed FROM %s WHERE sess_id = ?",
-        $this->db->unixtimestamp('changed'), get_table_name('session')),
+      "SELECT vars, ip, changed FROM ".get_table_name('session')." WHERE sess_id = ?",
       $key);
 
     if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-      $this->changed = $sql_arr['changed'];
+      $this->changed = strtotime($sql_arr['changed']);
       $this->ip      = $sql_arr['ip'];
       $this->vars    = base64_decode($sql_arr['vars']);
       $this->key     = $key;
@@ -163,7 +157,7 @@
     $now = $this->db->fromunixtime((int)$ts);
 
     // use internal data from read() for fast requests (up to 0.5 sec.)
-    if ($key == $this->key && $ts - $this->start < 0.5) {
+    if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
       $oldvars = $this->vars;
     } else { // else read data again from DB
       $oldvars = $this->db_read($key);
@@ -190,11 +184,13 @@
         $key, base64_encode($vars), (string)$this->ip);
     }
 
-    $this->unsets = array();
     return true;
   }
 
 
+  /**
+   * Merge vars with old vars and apply unsets
+   */
   private function _fixvars($vars, $oldvars)
   {
     $ts = microtime(true);
@@ -287,7 +283,7 @@
     $ts = microtime(true);
 
     // use internal data for fast requests (up to 0.5 sec.)
-    if ($key == $this->key && $ts - $this->start < 0.5)
+    if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
       $oldvars = $this->vars;
     else // else read data again
       $oldvars = $this->mc_read($key);
@@ -318,7 +314,7 @@
   public function gc()
   {
     foreach ($this->gc_handlers as $fct)
-      $fct();
+      call_user_func($fct);
   }
 
 
@@ -572,12 +568,18 @@
     $this->cookie = $_COOKIE[$this->cookiename];
     $result = $this->ip_check ? $_SERVER['REMOTE_ADDR'] == $this->ip : true;
 
+    if (!$result)
+      $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)
+      if ($this->_mkcookie($this->prev) == $this->cookie) {
         $this->set_auth_cookie();
-      else
+      }
+      else {
         $result = false;
+        $this->log("Session authentication failed for " . $this->key . "; invalid auth cookie sent");
+      }
     }
 
     return $result;
@@ -605,5 +607,14 @@
     $auth_string = "$this->key,$this->secret,$timeslot";
     return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
   }
+  
+  /**
+   * 
+   */
+  function log($line)
+  {
+    if ($this->logging)
+      write_log('session', $line);
+  }
 
 }

--
Gitblit v1.9.1