Skip to content

Feature/gb 1170 #1171

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

Merged
steinkel merged 6 commits into from
Feb 11, 2026
+244 −34
Merged

Feature/gb 1170 #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ee3a3e
refactor PasswordRehash configuration
arodu Feb 2, 2026
4330404
Merge branch '16.next-cake5' into feature/gb-1170
arodu Feb 6, 2026
1dd8ed9
feat: enhance login rehash functionality with improved authenticator …
arodu Feb 6, 2026
6e425dd
phpcs fix
arodu Feb 6, 2026
6cc317b
refactor: update password hash in test using updateAll method
arodu Feb 10, 2026
bdac80e
phpcs fix
arodu Feb 10, 2026
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
4 changes: 3 additions & 1 deletion config/users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@
],
'RbacPolicy' => [],
'PasswordRehash' => [
'identifiers' => ['Password'],
'authenticators' => [
'Form' => 'Authentication.Password',
],
],
],
'OAuth' => [
Expand Down
274 changes: 241 additions & 33 deletions tests/TestCase/Controller/Traits/LoginTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace CakeDC\Users\Test\TestCase\Controller\Traits;

use Authentication\Authenticator\AuthenticatorCollection;
use Authentication\Authenticator\Result;
use Authentication\Authenticator\SessionAuthenticator;
use Authentication\Identifier\IdentifierCollection;
Expand All @@ -22,6 +23,7 @@
use Cake\Event\Event;
use Cake\Http\Response;
use Cake\Http\ServerRequest;
use CakeDC\Auth\Authentication\AuthenticationService;
use CakeDC\Auth\Authentication\Failure;
use CakeDC\Auth\Authenticator\FormAuthenticator;
use CakeDC\Users\Authenticator\SocialAuthenticator;
Expand All @@ -48,9 +50,9 @@ public function setUp(): void
->getMock();

// $this->Trait->Auth = $this->getMockBuilder('Cake\Controller\Component\AuthComponent')
// ->onlyMethods(['setConfig'])
// ->disableOriginalConstructor()
// ->getMock();
// ->onlyMethods(['setConfig'])
// ->disableOriginalConstructor()
// ->getMock();
}

/**
Expand Down Expand Up @@ -147,76 +149,282 @@ public function testLoginHappy()
*/
public function testLoginRehash()
{
\Cake\Core\Configure::write('Auth.PasswordRehash', [
'authenticators' => [
'Form' => 'Password',
],
]);

$passwordIdentifier = $this->getMockBuilder(PasswordIdentifier::class)
->onlyMethods(['needsPasswordRehash'])
->getMock();
$passwordIdentifier->expects($this->any())
->method('needsPasswordRehash')
->willReturn(true);
$identifiers = new IdentifierCollection([]);
$identifiers->set('Password', $passwordIdentifier);

$SessionAuth = new SessionAuthenticator($identifiers);
$identifierCollection = new IdentifierCollection([]);
$identifierCollection->set('Password', $passwordIdentifier);

$sessionFailure = new Failure(
$SessionAuth,
new Result(null, Result::FAILURE_IDENTITY_NOT_FOUND),
);
$failures = [$sessionFailure];
$formAuthenticator = $this->getMockBuilder(FormAuthenticator::class)
->disableOriginalConstructor()
->addMethods(['getIdentifier'])
->getMock();
$formAuthenticator->expects($this->any())
->method('getIdentifier')
->willReturn($identifierCollection);

$authenticatorCollection = $this->getMockBuilder(AuthenticatorCollection::class)
->disableOriginalConstructor()
->getMock();
$authenticatorCollection->expects($this->any())
->method('has')->with('Form')->willReturn(true);
$authenticatorCollection->expects($this->any())
->method('get')->with('Form')->willReturn($formAuthenticator);

$user = $this->Trait->getUsersTable()->get('00000000-0000-0000-0000-000000000002');
$passwordBefore = $user['password'];
$userPassword = 'testLoginRehash' . time();

$service = $this->getMockBuilder(AuthenticationService::class)
->disableOriginalConstructor()
->getMock();
$service->expects($this->any())
->method('authenticators')
->willReturn($authenticatorCollection);
$service->expects($this->any())
->method('identifiers')
->willReturn(new IdentifierCollection([]));
$service->expects($this->any())
->method('getAuthenticationProvider')
->willReturn($formAuthenticator);

$result = new Result($user, Result::SUCCESS);
$service->expects($this->any())->method('getResult')->willReturn($result);

$this->_mockDispatchEvent(new Event('event'));
$this->_mockRequestPost();
$this->Trait->getRequest()->expects($this->any())

$request = $this->getMockBuilder('Cake\Http\ServerRequest')
->onlyMethods(['is', 'getData'])
->getMock();

$request->expects($this->any())
->method('is')
->with('post')
->willReturn(true);

$request->expects($this->any())
->method('getData')
->with($this->equalTo('password'))
->willReturn($userPassword);
->willReturnCallback(function ($key = null) use ($userPassword, $user) {
if ($key === 'password') {
return $userPassword;
}
if ($key === 'username' || $key === 'email') {
return $user->email;
}

return [];
});

$identityWrapper = new \Authentication\Identity($user);
$request = $request->withAttribute('authentication', $service);
$request = $request->withAttribute('identity', $identityWrapper);

$this->Trait->setRequest($request);

$authComponent = $this->getMockBuilder(\Cake\Controller\Component::class)
->disableOriginalConstructor()
->onlyMethods(['getConfig'])
->getMock();
$authComponent->expects($this->any())
->method('getConfig')
->with('loginRedirect')
->willReturn('/home');

$this->Trait->components()->set('Authentication', $authComponent);

$this->_mockFlash();
$user = $this->Trait->getUsersTable()->get('00000000-0000-0000-0000-000000000002');
$passwordBefore = $user['password'];
$this->assertNotEmpty($passwordBefore);
$this->_mockAuthentication($user->toArray(), $failures, $identifiers);
$this->Trait->Flash->expects($this->never())
->method('error');

$this->Trait->expects($this->once())
->method('redirect')
->with($this->successLoginRedirect)
->will($this->returnValue(new Response()));
->willReturn(new Response());

$registry = new ComponentRegistry(new \Cake\Controller\Controller(new \Cake\Http\ServerRequest()));
$config = [
'component' => 'CakeDC/Users.Login',
'defaultMessage' => __d('cake_d_c/users', 'Username or password is incorrect'),
'messages' => [
FormAuthenticator::FAILURE_INVALID_RECAPTCHA => __d('cake_d_c/users', 'Invalid reCaptcha'),
],
'targetAuthenticator' => FormAuthenticator::class,
'PasswordRehash' => [
'authenticators' => ['Form' => 'Password'],
],
];

$Login = $this->getMockBuilder(LoginComponent::class)
->onlyMethods(['getController'])
->setConstructorArgs([$registry, $config])
->getMock();

$Login->expects($this->any())
->method('getController')
->will($this->returnValue($this->Trait));
->willReturn($this->Trait);
$this->Trait->expects($this->any())
->method('loadComponent')
->with(
$this->equalTo('CakeDC/Users.Login'),
$this->equalTo($config),
$this->anything(),
)
->will($this->returnValue($Login));
->willReturn($Login);

$result = $this->Trait->login();
$this->assertInstanceOf(Response::class, $result);

$userAfter = $this->Trait->getUsersTable()->get('00000000-0000-0000-0000-000000000002');
$passwordAfter = $userAfter['password'];
$this->assertNotEquals($passwordBefore, $passwordAfter);
$this->assertNotEquals($passwordBefore, $userAfter['password']);

$passwordHasher = new DefaultPasswordHasher();
$check = $passwordHasher->check($userPassword, $passwordAfter);
$this->assertTrue($check);
$this->assertTrue($passwordHasher->check($userPassword, $userAfter['password']));
}

public function testLoginRehashWithAuthenticatorStructure()
{
\Cake\Core\Configure::write('Auth.PasswordRehash', [
'authenticators' => [
'Form' => 'Authentication.Password',
],
]);

$userId = '00000000-0000-0000-0000-000000000002';
$user = $this->Trait->getUsersTable()->get($userId);
$oldHash = '$2y$10$OldHashNeedsUpgrade00000000000000000000000000000000';
$this->Trait->getUsersTable()->updateAll(
['password' => $oldHash],
['id' => $userId],
);

$passwordIdentifier = $this->getMockBuilder(PasswordIdentifier::class)
->onlyMethods(['needsPasswordRehash'])
->getMock();
$passwordIdentifier->expects($this->any())
->method('needsPasswordRehash')
->willReturn(true);

$identifierCollection = new IdentifierCollection([]);
$identifierCollection->set('Authentication.Password', $passwordIdentifier);

$formAuthenticator = $this->getMockBuilder(FormAuthenticator::class)
->disableOriginalConstructor()
->addMethods(['getIdentifier'])
->getMock();
$formAuthenticator->expects($this->any())
->method('getIdentifier')
->willReturn($identifierCollection);

$authenticatorCollection = $this->getMockBuilder(AuthenticatorCollection::class)
->disableOriginalConstructor()
->getMock();
$authenticatorCollection->expects($this->any())
->method('has')->with('Form')->willReturn(true);
$authenticatorCollection->expects($this->any())
->method('get')->with('Form')->willReturn($formAuthenticator);

$service = $this->getMockBuilder(AuthenticationService::class)
->disableOriginalConstructor()
->getMock();
$service->expects($this->any())
->method('authenticators')
->willReturn($authenticatorCollection);
$service->expects($this->any())
->method('identifiers')
->willReturn(new IdentifierCollection([]));
$service->expects($this->any())
->method('getAuthenticationProvider')
->willReturn($formAuthenticator);

$result = new Result($user, Result::SUCCESS);
$service->expects($this->any())->method('getResult')->willReturn($result);

$this->_mockDispatchEvent(new Event('event'));

$request = $this->getMockBuilder('Cake\Http\ServerRequest')
->onlyMethods(['is', 'getData'])
->getMock();

$request->expects($this->any())
->method('is')
->with('post')
->willReturn(true);

$request->expects($this->any())
->method('getData')
->willReturnCallback(function ($key = null) use ($user) {
if ($key === 'password') {
return 'password123';
}
if ($key === 'username' || $key === 'email') {
return $user->email;
}

return [];
});

$identityWrapper = new \Authentication\Identity($user);

$request = $request->withAttribute('authentication', $service);
$request = $request->withAttribute('identity', $identityWrapper);

$this->Trait->setRequest($request);

$authComponent = $this->getMockBuilder(\Cake\Controller\Component::class)
->disableOriginalConstructor()
->onlyMethods(['getConfig'])
->getMock();

$authComponent->expects($this->any())
->method('getConfig')
->with('loginRedirect')
->willReturn('/');

$this->Trait->components()->set('Authentication', $authComponent);

$registry = new ComponentRegistry(new \Cake\Controller\Controller(new \Cake\Http\ServerRequest()));
$config = [
'component' => 'CakeDC/Users.Login',
'targetAuthenticator' => FormAuthenticator::class,
'PasswordRehash' => [
'authenticators' => ['Form' => 'Authentication.Password'],
],
];

$Login = $this->getMockBuilder(LoginComponent::class)
->onlyMethods(['getController'])
->setConstructorArgs([$registry, $config])
->getMock();

$Login->expects($this->any())
->method('getController')
->willReturn($this->Trait);

$this->Trait->expects($this->any())
->method('loadComponent')
->with(
$this->equalTo('CakeDC/Users.Login'),
$this->anything(),
)
->willReturn($Login);

$this->Trait->expects($this->once())
->method('redirect')
->willReturn(new Response());

$this->Trait->login();

$userAfter = $this->Trait->getUsersTable()->get($userId);

$this->assertNotEquals(
$oldHash,
$userAfter->password,
);
}

/**
Expand Down Expand Up @@ -267,8 +475,8 @@ public function testLoginGet()
->method('getController')
->will($this->returnValue($this->Trait));
// $this->Trait->expects($this->any())
// ->method('getRequest')
// ->will($this->returnValue($request));
// ->method('getRequest')
// ->will($this->returnValue($request));
$this->Trait->expects($this->any())
->method('loadComponent')
->with(
Expand Down
Loading