summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-07-30 15:32:13 +0000
committerthomascube <thomas@roundcube.net>2011-07-30 15:32:13 +0000
commitfcc7f861b170596c6970aecb1ddc87a3567b112f (patch)
treedb081b780e3d6c144ef70b190b724af3d7e4f2f9 /program
parenta1640053b9dbe7d8b3bd9421d74127da8e615ad2 (diff)
Log session validation errors; keep error message when redirecting to login after session error
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_session.php21
-rw-r--r--program/js/app.js3
2 files changed, 21 insertions, 3 deletions
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index a63501079..bface28cc 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -42,6 +42,7 @@ class rcube_session
private $prev;
private $secret = '';
private $ip_check = false;
+ private $logging = false;
private $keep_alive = 0;
private $memcache;
@@ -53,6 +54,7 @@ class rcube_session
$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);
@@ -565,12 +567,18 @@ class rcube_session
$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;
@@ -598,5 +606,14 @@ class rcube_session
$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);
+ }
}
diff --git a/program/js/app.js b/program/js/app.js
index da445a39c..a9ed9adbe 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -5153,7 +5153,8 @@ function rcube_webmail()
obj.click(function() { return ref.hide_message(obj); });
}
- 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;
};