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

Jump to bottom

Use original password to generate new password hash. #481

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use original password to generate new password hash. #481

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/ZfcUser/Authentication/Adapter/Db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,13 @@ public function authenticate(AuthenticationEvent $event)
if ($this->isSatisfied()) {
$storage = $this->getStorage()->read();
$event->setIdentity($storage['identity'])
->setCode(AuthenticationResult::SUCCESS)
->setMessages(array('Authentication successful.'));
->setCode(AuthenticationResult::SUCCESS)
->setMessages(array('Authentication successful.'));
return;
}

$identity = $event->getRequest()->getPost()->get('identity');
$credential = $event->getRequest()->getPost()->get('credential');
$credential = $this->preProcessCredential($credential);
$userObject = null;

// Cycle through the configured identity sources and test each
Expand All @@ -81,7 +80,7 @@ public function authenticate(AuthenticationEvent $event)

if (!$userObject) {
$event->setCode(AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND)
->setMessages(array('A record with the supplied identity could not be found.'));
->setMessages(array('A record with the supplied identity could not be found.'));
$this->setSatisfied(false);
return false;
}
Expand All @@ -90,17 +89,18 @@ public function authenticate(AuthenticationEvent $event)
// Don't allow user to login if state is not in allowed list
if (!in_array($userObject->getState(), $this->getOptions()->getAllowedLoginStates())) {
$event->setCode(AuthenticationResult::FAILURE_UNCATEGORIZED)
->setMessages(array('A record with the supplied identity is not active.'));
->setMessages(array('A record with the supplied identity is not active.'));
$this->setSatisfied(false);
return false;
}
}

$preprocessedCredential = $this->preProcessCredential($credential);
$cryptoService = $this->getHydrator()->getCryptoService();
if (!$cryptoService->verify($credential, $userObject->getPassword())) {
if (!$cryptoService->verify($preprocessedCredential, $userObject->getPassword())) {
// Password does not match
$event->setCode(AuthenticationResult::FAILURE_CREDENTIAL_INVALID)
->setMessages(array('Supplied credential is invalid.'));
->setMessages(array('Supplied credential is invalid.'));
$this->setSatisfied(false);
return false;
} elseif ($cryptoService instanceof Bcrypt) {
Expand All @@ -119,7 +119,7 @@ public function authenticate(AuthenticationEvent $event)
$storage['identity'] = $event->getIdentity();
$this->getStorage()->write($storage);
$event->setCode(AuthenticationResult::SUCCESS)
->setMessages(array('Authentication successful.'));
->setMessages(array('Authentication successful.'));
}

protected function updateUserPasswordHash(UserEntity $user, $password, Bcrypt $bcrypt)
Expand Down
55 changes: 55 additions & 0 deletions tests/ZfcUserTest/Authentication/Adapter/DbTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit_Framework_TestCase as TestCase;
use Zend\Crypt\Password\Bcrypt;
use ZfcUser\Authentication\Adapter\Db;

class DbTest extends TestCase
Expand Down Expand Up @@ -392,6 +393,60 @@ public function testUpdateUserPasswordHashWithoutSameCost()
$method->invoke($this->db, $this->user, 'ZfcUserNew', $this->bcrypt);
}

/**
* @covers ZfcUser\Authentication\Adapter\Db::Authenticate
*/
public function testUpdatePasswordUsesUnprocessedCredential()
{
$this->setAuthenticationCredentials('zfc-user@zf-commons.io');
$this->setAuthenticationEmail();

$this->options->expects($this->once())
->method('getEnableUserState')
->will($this->returnValue(false));

$this->bcrypt->expects($this->once())
->method('verify')
->will($this->returnValue(true));
$this->bcrypt->expects($this->any())
->method('getCost')
->will($this->returnValue(static::PASSWORD_COST_10));

$this->user->expects($this->exactly(2))
->method('getPassword')
->will($this->returnValue('$2a$04$5kq1mnYWbww8X.rIj7eOVOHXtvGw/peefjIcm0lDGxRTEjm9LnOae'));
$this->user->expects($this->once())
->method('getId')
->will($this->returnValue(1));

$this->storage->expects($this->any())
->method('getNameSpace')
->will($this->returnValue('test'));

$this->authEvent->expects($this->once())
->method('setIdentity')
->with(1)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setCode')
->with(\Zend\Authentication\Result::SUCCESS)
->will($this->returnValue($this->authEvent));
$this->authEvent->expects($this->once())
->method('setMessages')
->with(array('Authentication successful.'))
->will($this->returnValue($this->authEvent));

$this->db->setCredentialPreprocessor(function() {
return 'should-not-be-used';
});
$this->hydrator->expects($this->once())
->method('hydrate')
->with(['password' => 'ZfcUserPassword'], $this->user)
->will($this->returnValue($this->user));

$this->db->authenticate($this->authEvent);
}

/**
* @covers ZfcUser\Authentication\Adapter\Db::getCredentialPreprocessor
* @covers ZfcUser\Authentication\Adapter\Db::setCredentialPreprocessor
Expand Down