Changeset 4991 in subversion

Timestamp:

Jul 30, 2011 11:32:13 AM (23 months ago)

Author:

thomasb

Message:

Log session validation errors; keep error message when redirecting to login after session error

Location:

trunk/roundcubemail

Files:

• config/main.inc.php.dist (modified) (1 diff)
• index.php (modified) (4 diffs)
• program/include/rcube_session.php (modified) (4 diffs)
• program/js/app.js (modified) (1 diff)

trunk/roundcubemail/config/main.inc.php.dist

@@ -41 +41 @@
 // Log successful logins to <log_dir>/userlogins or to syslog
 $rcmail_config['log_logins'] = false;
+
+// Log session authentication errors to <log_dir>/session or to syslog
+$rcmail_config['log_session'] = false;
 
 // Log SQL queries to <log_dir>/sql or to syslog

trunk/roundcubemail/index.php

@@ -121 +121 @@
     // allow plugins to control the redirect url after login success
     $redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('_task' => 'mail'));
-    unset($redir['abort']);
+    unset($redir['abort'], $redir['_err']);
 
     // send redirect
@@ -148 +148 @@
 else if ($RCMAIL->task != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
   if (!$RCMAIL->session->check_auth()) {
-    $OUTPUT->show_message('sessionerror', 'error');
     $RCMAIL->kill_session();
+    $session_error = true;
   }
 }
@@ -155 +155 @@
 // not logged in -> show login page
 if (empty($RCMAIL->user->ID)) {
+  // log session failures
+  if ($RCMAIL->task != 'login' && !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])) {
+    $RCMAIL->session->log("Aborted session " . $sess_id . "; no valid session data found");
+    $session_error = true;
+  }
+
   if ($OUTPUT->ajax_call)
-    $OUTPUT->redirect(array(), 2000);
+    $OUTPUT->redirect(array('_err' => 'session'), 2000);
 
   if (!empty($_REQUEST['_framed']))
-    $OUTPUT->command('redirect', '?');
+    $OUTPUT->command('redirect', $RCMAIL->url(array('_err' => 'session')));
 
   // check if installer is still active
@@ -172 +178 @@
     );
   }
+  
+  if ($session_error || $_REQUEST['_err'] == 'session')
+    $OUTPUT->show_message('sessionerror', 'error', null, true, -1);
 
   $RCMAIL->set_task('login');

trunk/roundcubemail/program/include/rcube_session.php

@@ -43 +43 @@
   private $secret = '';
   private $ip_check = false;
+  private $logging = false;
   private $keep_alive = 0;
   private $memcache;
@@ -54 +55 @@
     $this->start = microtime(true);
     $this->ip = $_SERVER['REMOTE_ADDR'];
+    $this->logging = $config->get('log_session', false);
 
     $lifetime = $config->get('session_lifetime', 1) * 60;
@@ -566 +568 @@
     $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");
+      }
     }
 
@@ -599 +607 @@
     return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
   }
+  
+  /**
+   * 
+   */
+  function log($line)
+  {
+    if ($this->logging)
+      write_log('session', $line);
+  }
 
 }

trunk/roundcubemail/program/js/app.js

@@ -5154 +5154 @@
     }
 
-    window.setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
+    if (timeout > 0)
+      window.setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
     return id;
   };