mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3852 from owncloud/fixing-3830-master 

session life time is now configurable and set to the same value
This commit is contained in:
Thomas Müller 2013-06-30 14:41:51 -07:00
parent 8beec2015a 3b91ce695f
commit 121d3904c9
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.sample.php
View File

@ -145,6 +145,9 @@ $CONFIG = array(
/* Lifetime of the remember login cookie, default is 15 days */ /* Lifetime of the remember login cookie, default is 15 days */
"remember_login_cookie_lifetime" => 60*60*24*15, "remember_login_cookie_lifetime" => 60*60*24*15,
/* Life time of a session after inactivity */
"session_lifetime" => 60 * 60 * 24,
/* Custom CSP policy, changing this will overwrite the standard policy */ /* Custom CSP policy, changing this will overwrite the standard policy */
"custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *", "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *",

19
lib/base.php
View File

@ -311,16 +311,17 @@ class OC {
exit(); exit();
} }
$sessionLifeTime = self::getSessionLifeTime();
// regenerate session id periodically to avoid session fixation // regenerate session id periodically to avoid session fixation
if (!self::$session->exists('SID_CREATED')) { if (!self::$session->exists('SID_CREATED')) {
self::$session->set('SID_CREATED', time()); self::$session->set('SID_CREATED', time());
} else if (time() - self::$session->get('SID_CREATED') > 60*60*12) { } else if (time() - self::$session->get('SID_CREATED') > $sessionLifeTime / 2) {
session_regenerate_id(true); session_regenerate_id(true);
self::$session->set('SID_CREATED', time()); self::$session->set('SID_CREATED', time());
} }
// session timeout // session timeout
if (self::$session->exists('LAST_ACTIVITY') && (time() - self::$session->get('LAST_ACTIVITY') > 60*60*24)) { if (self::$session->exists('LAST_ACTIVITY') && (time() - self::$session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
if (isset($_COOKIE[session_name()])) { if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), '', time() - 42000, $cookie_path); setcookie(session_name(), '', time() - 42000, $cookie_path);
} }
@ -332,6 +333,13 @@ class OC {
self::$session->set('LAST_ACTIVITY', time()); self::$session->set('LAST_ACTIVITY', time());
} }
/**
* @return int
*/
private static function getSessionLifeTime() {
return OC_Config::getValue('session_lifetime', 60 * 60 * 24);
}
public static function getRouter() { public static function getRouter() {
if (!isset(OC::$router)) { if (!isset(OC::$router)) {
OC::$router = new OC_Router(); OC::$router = new OC_Router();
@ -393,9 +401,6 @@ class OC {
@ini_set('post_max_size', '10G'); @ini_set('post_max_size', '10G');
@ini_set('file_uploads', '50'); @ini_set('file_uploads', '50');
//try to set the session lifetime to 60min
@ini_set('gc_maxlifetime', '3600');
//copy http auth headers for apache+php-fcgid work around //copy http auth headers for apache+php-fcgid work around
if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) { if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION']; $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
@ -455,6 +460,10 @@ class OC {
exit; exit;
} }
//try to set the session lifetime
$sessionLifeTime = self::getSessionLifeTime();
@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
// User and Groups // User and Groups
if (!OC_Config::getValue("installed", false)) { if (!OC_Config::getValue("installed", false)) {
self::$session->set('user_id',''); self::$session->set('user_id','');