tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2201 from hafriedlander/fix/session

Browse Source 
Fixes to session, primarily around cookie_secure
This commit is contained in:
Sam Minnée 2013-07-06 18:59:07 -07:00
commit ecf8f273c0
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/Director.php
View File

@ -127,7 +127,7 @@ class Director implements TemplateGlobalProvider {
} }
// Only resume a session if its not started already, and a session identifier exists // Only resume a session if its not started already, and a session identifier exists
if(!isset($_SESSION) && (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))) { if(!isset($_SESSION) && Session::request_contains_session_id()) {
Session::start(); Session::start();
} }
// Initiate an empty session - doesn't initialize an actual PHP session until saved (see belwo) // Initiate an empty session - doesn't initialize an actual PHP session until saved (see belwo)

40
control/Session.php
View File

@ -128,6 +128,14 @@ class Session {
protected $changedData = array(); protected $changedData = array();
protected function userAgent() {
if (isset($_SERVER['HTTP_USER_AGENT'])) {
return $_SERVER['HTTP_USER_AGENT'];
} else {
return '';
}
}
/** /**
* Start PHP session, then create a new Session object with the given start data. * Start PHP session, then create a new Session object with the given start data.
* *
@ -138,14 +146,8 @@ class Session {
$this->data = $data; $this->data = $data;
if (isset($_SERVER['HTTP_USER_AGENT'])) {
$ua = $_SERVER['HTTP_USER_AGENT'];
} else {
$ua = '';
}
if (isset($this->data['HTTP_USER_AGENT'])) { if (isset($this->data['HTTP_USER_AGENT'])) {
if ($this->data['HTTP_USER_AGENT'] != $ua) { if ($this->data['HTTP_USER_AGENT'] != $this->userAgent()) {
// Funny business detected! // Funny business detected!
$this->inst_clearAll(); $this->inst_clearAll();
@ -153,8 +155,6 @@ class Session {
Session::start(); Session::start();
} }
} }
$this->inst_set('HTTP_USER_AGENT', $ua);
} }
/** /**
@ -461,12 +461,17 @@ class Session {
return $this->data; return $this->data;
} }
public function inst_finalize() {
$this->inst_set('HTTP_USER_AGENT', $this->userAgent());
}
/** /**
* Save data to session * Save data to session
* Only save the changes, so that anyone manipulating $_SESSION directly doesn't get burned. * Only save the changes, so that anyone manipulating $_SESSION directly doesn't get burned.
*/ */
public function inst_save() { public function inst_save() {
if($this->changedData) { if($this->changedData) {
$this->inst_finalize();
if(!isset($_SESSION)) Session::start(); if(!isset($_SESSION)) Session::start();
$this->recursivelyApply($this->changedData, $_SESSION); $this->recursivelyApply($this->changedData, $_SESSION);
} }
@ -508,6 +513,16 @@ class Session {
Session::set("FormInfo.$formname.formError.type", $type); Session::set("FormInfo.$formname.formError.type", $type);
} }
/**
* Is there a session ID in the request?
* @return bool
*/
public static function request_contains_session_id() {
$secure = Director::is_https() && Config::inst()->get('Session', 'cookie_secure');
$name = $secure ? 'SECSESSID' : session_name();
return isset($_COOKIE[$name]) || isset($_REQUEST[$name]);
}
/** /**
* Initialize session. * Initialize session.
* *
@ -517,7 +532,7 @@ class Session {
$path = Config::inst()->get('Session', 'cookie_path'); $path = Config::inst()->get('Session', 'cookie_path');
if(!$path) $path = Director::baseURL(); if(!$path) $path = Director::baseURL();
$domain = Config::inst()->get('Session', 'cookie_domain'); $domain = Config::inst()->get('Session', 'cookie_domain');
$secure = Config::inst()->get('Session', 'cookie_secure'); $secure = Director::is_https() && Config::inst()->get('Session', 'cookie_secure');
$session_path = Config::inst()->get('Session', 'session_store_path'); $session_path = Config::inst()->get('Session', 'session_store_path');
$timeout = Config::inst()->get('Session', 'timeout'); $timeout = Config::inst()->get('Session', 'timeout');
@ -533,11 +548,14 @@ class Session {
// Allow storing the session in a non standard location // Allow storing the session in a non standard location
if($session_path) session_save_path($session_path); if($session_path) session_save_path($session_path);
// If we want a secure cookie for HTTPS, use a seperate session name. This lets us have a
// seperate (less secure) session for non-HTTPS requests
if($secure) session_name('SECSESSID');
// @ is to supress win32 warnings/notices when session wasn't cleaned up properly // @ is to supress win32 warnings/notices when session wasn't cleaned up properly
// There's nothing we can do about this, because it's an operating system function! // There's nothing we can do about this, because it's an operating system function!
if($sid) session_id($sid); if($sid) session_id($sid);
@session_start(); @session_start();
} }
// Modify the timeout behaviour so it's the *inactive* time before the session expires. // Modify the timeout behaviour so it's the *inactive* time before the session expires.

1
tests/control/SessionTest.php
View File

@ -99,6 +99,7 @@ class SessionTest extends SapphireTest {
// Generate our session // Generate our session
$s = new Session(array()); $s = new Session(array());
$s->inst_set('val', 123); $s->inst_set('val', 123);
$s->inst_finalize();
// Change our UA // Change our UA
$_SERVER['HTTP_USER_AGENT'] = 'Fake Agent'; $_SERVER['HTTP_USER_AGENT'] = 'Fake Agent';