Skip to content

[stable22] fix(2fa): Add missing BruteForceProtection attribute #63886

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
artonge merged 1 commit into from
Sep 1, 2026
+8 −1
Merged

[stable22] fix(2fa): Add missing BruteForceProtection attribute #63886

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
5 changes: 4 additions & 1 deletion core/Controller/TwoFactorChallengeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@
* @TwoFactorSetUpDoneRequired
*
* @UserRateThrottle(limit=5, period=100)
* @BruteForceProtection(action=solveChallenge)
*
* @param string $challengeProviderId
* @param string $challenge
Expand Down Expand Up @@ -209,10 +210,12 @@
}

$this->session->set('two_factor_auth_error', true);
return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.showChallenge', [
$response = new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.showChallenge', [
'challengeProviderId' => $provider->getId(),
'redirect_url' => $redirect_url,
]));
$response->throttle(['user' => $uid, 'provider' => $challengeProviderId]);

Check failure on line 217 in core/Controller/TwoFactorChallengeController.php

View workflow job for this annotation

GitHub Actions / Psalm 

Cannot find referenced variable $uid (see https://psalm.dev/024)

Check failure on line 217 in core/Controller/TwoFactorChallengeController.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedVariable 

core/Controller/TwoFactorChallengeController.php:217:34: UndefinedVariable: Cannot find referenced variable $uid (see https://psalm.dev/024)
return $response;
}

/**
Expand Down
4 changes: 4 additions & 0 deletions tests/Core/Controller/TwoFactorChallengeControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ public function testSolveChallengeInvalidProvider() {

public function testSolveInvalidChallenge() {
$user = $this->createMock(IUser::class);
$user->method('getUID')->willReturn('myuser');
$provider = $this->createMock(IProvider::class);

$this->userSession->expects($this->once())
Expand Down Expand Up @@ -288,11 +289,13 @@ public function testSolveInvalidChallenge() {
->willReturn('myprovider');

$expected = new RedirectResponse('files/index/url');
$expected->throttle(['user' => 'myuser', 'provider' => 'myprovider']);
$this->assertEquals($expected, $this->controller->solveChallenge('myprovider', 'token', '/url'));
}

public function testSolveChallengeTwoFactorException() {
$user = $this->createMock(IUser::class);
$user->method('getUID')->willReturn('myuser');
$provider = $this->createMock(IProvider::class);
$exception = new TwoFactorException("2FA failed");

Expand Down Expand Up @@ -326,6 +329,7 @@ public function testSolveChallengeTwoFactorException() {
->willReturn('myprovider');

$expected = new RedirectResponse('files/index/url');
$expected->throttle(['user' => 'myuser', 'provider' => 'myprovider']);
$this->assertEquals($expected, $this->controller->solveChallenge('myprovider', 'token', '/url'));
}

Expand Down
Loading