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

BUGFIX: old 2.3 passwords now handled correctly and migrated accordingly (from r97357)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102443 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-12 05:01:31 +00:00
parent d2e310a773
commit f400c28099
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/PasswordEncryptor.php
View File

@ -161,7 +161,7 @@ class PasswordEncryptor_PHPHash extends PasswordEncryptor {
*/ */
class PasswordEncryptor_LegacyPHPHash extends PasswordEncryptor_PHPHash { class PasswordEncryptor_LegacyPHPHash extends PasswordEncryptor_PHPHash {
function encrypt($password, $salt = null, $member = null) { function encrypt($password, $salt = null, $member = null) {
$password = parent::encrypt($password . $salt, $member, $salt); $password = parent::encrypt($password, $salt, $member);
// Legacy fix: This shortening logic is producing unpredictable results. // Legacy fix: This shortening logic is producing unpredictable results.
// //

23
tests/security/MemberAuthenticatorTest.php
View File

@ -9,13 +9,16 @@ class MemberAuthenticatorTest extends SapphireTest {
function testLegacyPasswordHashMigrationUponLogin() { function testLegacyPasswordHashMigrationUponLogin() {
$member = new Member(); $member = new Member();
$member->Email = 'test@test.com';
$field=Member::get_unique_identifier_field();
$member->$field = 'test@test.com';
$member->PasswordEncryption = "sha1"; $member->PasswordEncryption = "sha1";
$member->Password = "mypassword"; $member->Password = "mypassword";
$member->write(); $member->write();
$data = array( $data = array(
'Email' => $member->Email, 'Email' => $member->$field,
'Password' => 'mypassword' 'Password' => 'mypassword'
); );
MemberAuthenticator::authenticate($data); MemberAuthenticator::authenticate($data);
@ -29,14 +32,16 @@ class MemberAuthenticatorTest extends SapphireTest {
function testNoLegacyPasswordHashMigrationOnIncompatibleAlgorithm() { function testNoLegacyPasswordHashMigrationOnIncompatibleAlgorithm() {
PasswordEncryptor::register('crc32', 'PasswordEncryptor_PHPHash("crc32")'); PasswordEncryptor::register('crc32', 'PasswordEncryptor_PHPHash("crc32")');
$field=Member::get_unique_identifier_field();
$member = new Member(); $member = new Member();
$member->Email = 'test@test.com'; $member->$field = 'test@test.com';
$member->PasswordEncryption = "crc32"; $member->PasswordEncryption = "crc32";
$member->Password = "mypassword"; $member->Password = "mypassword";
$member->write(); $member->write();
$data = array( $data = array(
'Email' => $member->Email, 'Email' => $member->$field,
'Password' => 'mypassword' 'Password' => 'mypassword'
); );
MemberAuthenticator::authenticate($data); MemberAuthenticator::authenticate($data);
@ -46,4 +51,14 @@ class MemberAuthenticatorTest extends SapphireTest {
$result = $member->checkPassword('mypassword'); $result = $member->checkPassword('mypassword');
$this->assertTrue($result->valid()); $this->assertTrue($result->valid());
} }
function testCustomIdentifierField(){
Member::set_unique_identifier_field('Username');
$label=singleton('Member')->fieldLabel(Member::get_unique_identifier_field());
$this->assertEquals($label, 'Username');
}
} }