Merge pull request #36489 from nextcloud/bugfix/noid/brute-force-prot…

…ection-password-reset Add bruteforce protection to password reset page
nextcloud · Feb 6, 2023 · 5957881 · 5957881
2 parents fa1d50c + 875e6cf
commit 5957881
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
@@ -128,6 +128,8 @@ public function __construct(
 	 *
 	 * @PublicPage
 	 * @NoCSRFRequired
+	 * @BruteForceProtection(action=passwordResetEmail)
+	 * @AnonRateThrottle(limit=10, period=300)
 	 */
 	public function resetform(string $token, string $userId): TemplateResponse {
 		try {
@@ -137,12 +139,14 @@ public function resetform(string $token, string $userId): TemplateResponse {
 				|| ($e instanceof InvalidTokenException
 					&& !in_array($e->getCode(), [InvalidTokenException::TOKEN_NOT_FOUND, InvalidTokenException::USER_UNKNOWN]))
 			) {
-				return new TemplateResponse(
+				$response = new TemplateResponse(
 					'core', 'error', [
 						"errors" => [["error" => $e->getMessage()]]
 					],
 					TemplateResponse::RENDER_AS_GUEST
 				);
+				$response->throttle();
+				return $response;
 			}
 			return new TemplateResponse('core', 'error', [
 				'errors' => [['error' => $this->l10n->t('Password reset is disabled')]]

diff --git a/tests/Core/Controller/LostControllerTest.php b/tests/Core/Controller/LostControllerTest.php
@@ -171,6 +171,7 @@ public function testResetFormTokenError() {
 				]
 			],
 			'guest');
+		$expectedResponse->throttle();
 		$this->assertEquals($expectedResponse, $response);
 	}