Skip to content

fix(core): Throttle lost-password reset form when link is disabled #61615

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

Open
nfebe wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −20
Open

fix(core): Throttle lost-password reset form when link is disabled #61615

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
25 changes: 10 additions & 15 deletions core/Controller/LostController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,19 @@ public function resetform(string $token, string $userId): TemplateResponse {
try {
$this->checkPasswordResetToken($token, $userId);
} catch (Exception $e) {
if ($this->config->getSystemValue('lost_password_link', '') !== 'disabled'
|| ($e instanceof InvalidTokenException
&& !in_array($e->getCode(), [InvalidTokenException::TOKEN_NOT_FOUND, InvalidTokenException::USER_UNKNOWN]))
) {
$response = new TemplateResponse(
'core', 'error', [
'errors' => [['error' => $e->getMessage()]]
],
TemplateResponse::RENDER_AS_GUEST
);
$response->throttle();
return $response;
if ($this->config->getSystemValue('lost_password_link', '') === 'disabled') {
$message = $this->l10n->t('Password reset is disabled');
} else {
$message = $e->getMessage();
}
return new TemplateResponse('core', 'error', [
'errors' => [['error' => $this->l10n->t('Password reset is disabled')]]
],
$response = new TemplateResponse(
'core', 'error', [
'errors' => [['error' => $message]]
],
TemplateResponse::RENDER_AS_GUEST
);
$response->throttle();
return $response;
}
$this->initialState->provideInitialState('resetPasswordUser', $userId);
$this->initialState->provideInitialState('resetPasswordTarget',
Expand Down
36 changes: 31 additions & 5 deletions tests/Core/Controller/LostControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class LostControllerTest extends TestCase {
private $defaults;
/** @var IConfig | MockObject */
private $config;
private string $lostPasswordLink = '';
/** @var IMailer | MockObject */
private $mailer;
/** @var IManager|MockObject */
Expand Down Expand Up @@ -93,11 +94,13 @@ protected function setUp(): void {
$this->config = $this->createMock(IConfig::class);
$this->config->expects($this->any())
->method('getSystemValue')
->willReturnMap([
['secret', null, 'SECRET'],
['secret', '', 'SECRET'],
['lost_password_link', '', ''],
]);
->willReturnCallback(function (string $key, $default = '') {
return match ($key) {
'secret' => 'SECRET',
'lost_password_link' => $this->lostPasswordLink,
default => $default,
};
});
$this->l10n = $this->createMock(IL10N::class);
$this->l10n
->expects($this->any())
Expand Down Expand Up @@ -162,6 +165,29 @@ public function testResetFormTokenError(): void {
$this->assertEquals($expectedResponse, $response);
}

public function testResetFormTokenErrorWithDisabledLink(): void {
$this->lostPasswordLink = 'disabled';
$this->userManager->method('get')
->with('ValidTokenUser')
->willReturn($this->existingUser);
$this->verificationToken->expects($this->once())
->method('check')
->with('12345:MySecretToken', $this->existingUser, 'lostpassword', 'test@example.com')
->willThrowException(new InvalidTokenException(InvalidTokenException::TOKEN_NOT_FOUND));

$response = $this->lostController->resetform('12345:MySecretToken', 'ValidTokenUser');
$expectedResponse = new TemplateResponse('core',
'error',
[
'errors' => [
['error' => 'Password reset is disabled'],
]
],
'guest');
$expectedResponse->throttle();
$this->assertEquals($expectedResponse, $response);
}

public function testResetFormValidToken(): void {
$this->userManager->method('get')
->with('ValidTokenUser')
Expand Down
Loading