From fdee3395245a0bc843370f54cdd82285a11f8912 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Mon, 9 Sep 2024 17:20:44 +0100
Subject: [PATCH] Issue #3306107 by b_sharpe, catch, carolpettirossi, quietone:
Allow failed logins in maintenance mode to be themed differently to other
maintenance pages
(cherry picked from commit b9161b4f066a72b880ecde1779729c71a615e55d)
---
core/modules/user/src/Form/UserLoginForm.php | 2 +-
core/modules/user/tests/src/Functional/UserLoginTest.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/modules/user/src/Form/UserLoginForm.php b/core/modules/user/src/Form/UserLoginForm.php
index 33e6653eb154..d2780de747a9 100644
--- a/core/modules/user/src/Form/UserLoginForm.php
+++ b/core/modules/user/src/Form/UserLoginForm.php
@@ -284,7 +284,7 @@ public function validateFinal(array &$form, FormStateInterface $form_state) {
// We did not find a uid, so the limit is IP-based.
$message = $this->t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', [':url' => Url::fromRoute('user.pass')->toString()]);
}
- $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $message], $this->t('Login failed'), 'maintenance_page');
+ $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $message], $this->t('Login failed'), 'maintenance_page__flood');
$response->setStatusCode(403);
$form_state->setResponse($response);
}
diff --git a/core/modules/user/tests/src/Functional/UserLoginTest.php b/core/modules/user/tests/src/Functional/UserLoginTest.php
index 5006d1b292bd..26c7807fe975 100644
--- a/core/modules/user/tests/src/Functional/UserLoginTest.php
+++ b/core/modules/user/tests/src/Functional/UserLoginTest.php
@@ -311,7 +311,7 @@ public function assertFailedLogin(User $account, ?string $flood_trigger = NULL):
->fetchField();
if ($flood_trigger == 'user') {
$this->assertSession()->pageTextMatches("/There (has|have) been more than \w+ failed login attempt.* for this account. It is temporarily blocked. Try again later or request a new password./");
- $this->assertSession()->elementExists('css', 'body.maintenance-page');
+ $this->assertSession()->elementExists('css', 'body.maintenance-page--flood');
$this->assertSession()->linkExists("request a new password");
$this->assertSession()->linkByHrefExists(Url::fromRoute('user.pass')->toString());
$this->assertEquals('Flood control blocked login attempt for uid %uid from %ip', $last_log, 'A watchdog message was logged for the login attempt blocked by flood control per user.');
@@ -319,7 +319,7 @@ public function assertFailedLogin(User $account, ?string $flood_trigger = NULL):
else {
// No uid, so the limit is IP-based.
$this->assertSession()->pageTextContains("Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.");
- $this->assertSession()->elementExists('css', 'body.maintenance-page');
+ $this->assertSession()->elementExists('css', 'body.maintenance-page--flood');
$this->assertSession()->linkExists("request a new password");
$this->assertSession()->linkByHrefExists(Url::fromRoute('user.pass')->toString());
$this->assertEquals('Flood control blocked login attempt from %ip', $last_log, 'A watchdog message was logged for the login attempt blocked by flood control per IP.');
--
GitLab