mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX Using RandomGenerator class in Member->logIn(), Member->autoLogin() and Member->generateAutologinHash() for better randomization of tokens. Increased VARCHAR length of 'RememberLoginToken' and 'AutoLoginHash' fields to 1024 characters to support longer token strings. (from r114504) (from r114507)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@114509 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
0fb19f2884
commit
a7c8de9bdf
@ -11,11 +11,11 @@ class Member extends DataObject {
|
||||
'Surname' => 'Varchar',
|
||||
'Email' => 'Varchar',
|
||||
'Password' => 'Varchar(64)', // support for up to SHA256!
|
||||
'RememberLoginToken' => 'Varchar(50)',
|
||||
'RememberLoginToken' => 'Varchar(128)',
|
||||
'NumVisit' => 'Int',
|
||||
'LastVisited' => 'SSDatetime',
|
||||
'Bounced' => 'Boolean', // Note: This does not seem to be used anywhere.
|
||||
'AutoLoginHash' => 'Varchar(30)',
|
||||
'AutoLoginHash' => 'Varchar(128)',
|
||||
'AutoLoginExpired' => 'SSDatetime',
|
||||
'PasswordEncryption' => "Enum('none', 'none')",
|
||||
'Salt' => 'Varchar(50)',
|
||||
@ -213,7 +213,8 @@ class Member extends DataObject {
|
||||
$this->NumVisit++;
|
||||
|
||||
if($remember) {
|
||||
$token = substr(md5(uniqid(rand(), true)), 0, 49 - strlen($this->ID));
|
||||
$generator = new RandomGenerator();
|
||||
$token = $generator->generateHash('sha1');
|
||||
$this->RememberLoginToken = $token;
|
||||
Cookie::set('alc_enc', $this->ID . ':' . $token);
|
||||
} else {
|
||||
@ -278,9 +279,9 @@ class Member extends DataObject {
|
||||
if($member) {
|
||||
self::session_regenerate_id();
|
||||
Session::set("loggedInAs", $member->ID);
|
||||
|
||||
$token = substr(md5(uniqid(rand(), true)), 0, 49 - strlen($member->ID));
|
||||
$member->RememberLoginToken = $token;
|
||||
|
||||
$generator = new RandomGenerator();
|
||||
$member->RememberLoginToken = $generator->generateHash('sha1');
|
||||
Cookie::set('alc_enc', $member->ID . ':' . $token);
|
||||
|
||||
$member->NumVisit++;
|
||||
@ -324,8 +325,8 @@ class Member extends DataObject {
|
||||
function generateAutologinHash($lifetime = 2) {
|
||||
|
||||
do {
|
||||
$hash = substr(base_convert(md5(uniqid(mt_rand(), true)), 16, 36),
|
||||
0, 30);
|
||||
$generator = new RandomGenerator();
|
||||
$hash = $generator->generateHash('sha1');
|
||||
} while(DataObject::get_one('Member', "`AutoLoginHash` = '$hash'"));
|
||||
|
||||
$this->AutoLoginHash = $hash;
|
||||
|
Loading…
x
Reference in New Issue
Block a user