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 #9981 from creative-commoners/pull/4.8/blank-password-validation

Browse Source 
FIX Ensure changing a password to blank is validated
This commit is contained in:
Andre Kiste 2021-06-18 13:09:15 +12:00 committed by GitHub
commit 852268990c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Security/Member.php
View File

@ -875,7 +875,7 @@ class Member extends DataObject
if ($this->Email) {
$this->Email = trim($this->Email);
}
// If a member with the same "unique identifier" already exists with a different ID, don't allow merging.
// Note: This does not a full replacement for safeguards in the controller layer (e.g. in a registration form),
// but rather a last line of defense against data inconsistencies.
@ -1705,8 +1705,8 @@ class Member extends DataObject
$valid = parent::validate();
$validator = static::password_validator();
if (!$this->ID || $this->isChanged('Password')) {
if ($this->Password && $validator) {
if ($validator) {
if ((!$this->ID && $this->Password) || $this->isChanged('Password')) {
$userValid = $validator->validate($this->Password, $this);
$valid->combineAnd($userValid);
}

2
src/Security/MemberPassword.php
View File

@ -53,6 +53,6 @@ class MemberPassword extends DataObject
public function checkPassword($password)
{
$encryptor = PasswordEncryptor::create_for_algorithm($this->PasswordEncryption);
return $encryptor->check($this->Password, $password, $this->Salt, $this->Member());
return $encryptor->check($this->Password ?? '', $password, $this->Salt, $this->Member());
}
}

12
tests/php/Security/MemberTest.php
View File

@ -1593,7 +1593,7 @@ class MemberTest extends FunctionalTest
$this->assertSame('Johnson', $member->getLastName(), 'getLastName should proxy to Surname');
}
public function testEmailIsTrimmed()
{
$member = new Member();
@ -1601,4 +1601,14 @@ class MemberTest extends FunctionalTest
$member->write();
$this->assertNotNull(Member::get()->find('Email', 'trimmed@test.com'));
}
public function testChangePasswordToBlankIsValidated()
{
// override setup() function which setMinLength(0)
PasswordValidator::singleton()->setMinLength(8);
// 'test' member has a password defined in yml
$member = $this->objFromFixture(Member::class, 'test');
$result = $member->changePassword('');
$this->assertFalse($result->isValid());
}
}