Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enforce password and password-confirm as strings #4355

Merged
merged 1 commit into from
Jun 7, 2016
+87 −23
Merged

Enforce password and password-confirm as strings #4355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions app/code/Magento/Customer/Model/Customer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,4 +1367,20 @@ public function isCustomerLocked()
}
return false;
}

/**
* @return string
*/
public function getPasswordConfirm()
{
return (string) $this->getData('password_confirm');
}

/**
* @return string
*/
public function getPassword()
{
return (string) $this->getData('password');
}
}
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function beforeSave($object)
);
}

if (trim($password) != $password) {
if (trim($password) !== $password) {
throw new LocalizedException(__('The password can not begin or end with a space.'));
}

Expand All @@ -68,7 +68,7 @@ public function beforeSave($object)
public function validate($object)
{
$password = $object->getPassword();
if ($password && $password == $object->getPasswordConfirm()) {
if ($password && $password === $object->getPasswordConfirm()) {
return true;
}

Expand Down
90 changes: 69 additions & 21 deletions app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

namespace Magento\Customer\Test\Unit\Model\Customer\Attribute\Backend;

use Magento\Framework\DataObject;
use Magento\Framework\Stdlib\StringUtils;
use Magento\Customer\Model\Customer\Attribute\Backend\Password;

Expand All @@ -25,14 +26,15 @@ protected function setUp()
public function testValidatePositive()
{
$password = 'password';
$object = $this->getMockBuilder('Magento\Framework\DataObject')
->disableOriginalConstructor()
->setMethods(['getPassword', 'getPasswordConfirm'])
->getMock();

$object->expects($this->once())->method('getPassword')->will($this->returnValue($password));
$object->expects($this->once())->method('getPasswordConfirm')->will($this->returnValue($password));
/** @var \Magento\Framework\DataObject $object */
/** @var DataObject|\PHPUnit_Framework_MockObject_MockObject $object */
$object = $this->getMockBuilder(DataObject::class)
->disableOriginalConstructor()
->setMethods(['getPassword', 'getPasswordConfirm'])
->getMock();

$object->expects($this->once())->method('getPassword')->willReturn($password);
$object->expects($this->once())->method('getPasswordConfirm')->willReturn($password);

$this->assertTrue($this->testable->validate($object));
}
Expand All @@ -52,13 +54,13 @@ public function passwordNegativeDataProvider()
*/
public function testBeforeSaveNegative($password)
{
$object = $this->getMockBuilder('Magento\Framework\DataObject')
->disableOriginalConstructor()
->setMethods(['getPassword'])
->getMock();
/** @var DataObject|\PHPUnit_Framework_MockObject_MockObject $object */
$object = $this->getMockBuilder(DataObject::class)
->disableOriginalConstructor()
->setMethods(['getPassword'])
->getMock();

$object->expects($this->once())->method('getPassword')->will($this->returnValue($password));
/** @var \Magento\Framework\DataObject $object */
$object->expects($this->once())->method('getPassword')->willReturn($password);

$this->testable->beforeSave($object);
}
Expand All @@ -67,16 +69,62 @@ public function testBeforeSavePositive()
{
$password = 'more-then-6';
$passwordHash = 'password-hash';
$object = $this->getMockBuilder('Magento\Framework\DataObject')
->disableOriginalConstructor()
->setMethods(['getPassword', 'setPasswordHash', 'hashPassword'])
->getMock();

$object->expects($this->once())->method('getPassword')->will($this->returnValue($password));
$object->expects($this->once())->method('hashPassword')->will($this->returnValue($passwordHash));
$object->expects($this->once())->method('setPasswordHash')->with($passwordHash)->will($this->returnSelf());
/** @var \Magento\Framework\DataObject $object */
/** @var DataObject|\PHPUnit_Framework_MockObject_MockObject $object */
$object = $this->getMockBuilder(DataObject::class)
->disableOriginalConstructor()
->setMethods(['getPassword', 'setPasswordHash', 'hashPassword'])
->getMock();

$object->expects($this->once())->method('getPassword')->willReturn($password);
$object->expects($this->once())->method('hashPassword')->willReturn($passwordHash);
$object->expects($this->once())->method('setPasswordHash')->with($passwordHash)->willReturnSelf();

$this->testable->beforeSave($object);
}

/**
* @return array
*/
public function randomValuesProvider()
{
return [
[ false ],
[ 1 ],
[ "23" ],
[ null ],
[ "" ],
[ -1 ],
[ 12.3 ],
[ true ],
[ 0 ],
];
}

/**
* @dataProvider randomValuesProvider
* @param mixed $randomValue
*/
public function testCustomerGetPasswordAndGetPasswordConfirmAlwaysReturnsAString($randomValue)
{
/** @var \Magento\Customer\Model\Customer|\PHPUnit_Framework_MockObject_MockObject $customer */
$customer = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
->disableOriginalConstructor()
->setMethods(['getData'])
->getMock();

$customer->expects($this->exactly(2))->method('getData')->willReturn($randomValue);

$this->assertInternalType(
'string',
$customer->getPassword(),
'Customer password should always return a string'
);

$this->assertInternalType(
'string',
$customer->getPasswordConfirm(),
'Customer password-confirm should always return a string'
);
}
}