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

Refactored session_regenerate_id to make it easier to disable in some circumstances.

Browse Source 
Temporarily disabled session_regenerate_id so that Windmill can work.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48154 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-01-17 03:00:53 +00:00
parent 1d304a995c
commit f7b484658f
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
security/Member.php
View File

@ -87,6 +87,23 @@ class Member extends DataObject {
return ($this->Password === $encryption_details['password']); return ($this->Password === $encryption_details['password']);
} }
/**
* Regenerate the session_id, if possible.
* Calls session_regenerate_id(), unless Windmill is controlling the browsing session.
* Windmill is a testing framework that can't handle session_regenerate_id() calls.
*/
static function session_regenerate_id() {
// This has been temporarily disabled.
return;
if(strpos($_SERVER['HTTP_REFERER'],'windmill-serv') !== false) {
Session::set('isWindmill', true);
}
if(!Session::get('isWindmill')) {
session_regenerate_id(true);
}
}
/** /**
* Logs this member in * Logs this member in
@ -95,7 +112,8 @@ class Member extends DataObject {
* automatically the next time. * automatically the next time.
*/ */
function logIn($remember = false) { function logIn($remember = false) {
session_regenerate_id(true); self::session_regenerate_id();
Session::set("loggedInAs", $this->ID); Session::set("loggedInAs", $this->ID);
$this->NumVisit++; $this->NumVisit++;
@ -132,7 +150,7 @@ class Member extends DataObject {
} }
if($member) { if($member) {
session_regenerate_id(true); self::session_regenerate_id();
Session::set("loggedInAs", $member->ID); Session::set("loggedInAs", $member->ID);
$token = substr(md5(uniqid(rand(), true)), 0, 49 - strlen($member->ID)); $token = substr(md5(uniqid(rand(), true)), 0, 49 - strlen($member->ID));
@ -151,7 +169,7 @@ class Member extends DataObject {
*/ */
function logOut() { function logOut() {
Session::clear("loggedInAs"); Session::clear("loggedInAs");
session_regenerate_id(true); self::session_regenerate_id();
$this->RememberLoginToken = null; $this->RememberLoginToken = null;
Cookie::set('alc_enc', null); Cookie::set('alc_enc', null);