fix: Show error message when CSRF check fails at login

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
nextcloud · Dec 4, 2023 · 32a02b0 · 32a02b0
1 parent 90529e5
commit 32a02b0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
@@ -62,6 +62,7 @@
 class LoginController extends Controller {
 	public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword';
 	public const LOGIN_MSG_USERDISABLED = 'userdisabled';
+	public const LOGIN_MSG_CSRFCHECKFAILED = 'csrfCheckFailed';
 
 	private IUserManager $userManager;
 	private IConfig $config;
@@ -311,7 +312,7 @@ public function tryLogin(Chain $loginChain,
 				$user,
 				$user,
 				$redirect_url,
-				$this->l10n->t('Please try again')
+				self::LOGIN_MSG_CSRFCHECKFAILED
 			);
 		}
 

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
@@ -32,6 +32,11 @@
 				type="warning">
 				{{ t('core', 'Please contact your administrator.') }}
 			</NcNoteCard>
+			<NcNoteCard v-if="csrfCheckFailed"
+				:heading="t('core', 'Temporary error')"
+				type="error">
+				{{ t('core', 'Please try again.') }}
+			</NcNoteCard>
 			<NcNoteCard v-if="messages.length > 0">
 				<div v-for="(message, index) in messages"
 					:key="index">
@@ -186,6 +191,9 @@ export default {
 		apacheAuthFailed() {
 			return this.errors.indexOf('apacheAuthFailed') !== -1
 		},
+		csrfCheckFailed() {
+			return this.errors.indexOf('csrfCheckFailed') !== -1
+		},
 		internalException() {
 			return this.errors.indexOf('internalexception') !== -1
 		},

diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/lib/private/Authentication/Login/LoginResult.php b/lib/private/Authentication/Login/LoginResult.php
@@ -25,6 +25,8 @@
  */
 namespace OC\Authentication\Login;
 
+use OC\Core\Controller\LoginController;
+
 class LoginResult {
 	/** @var bool */
 	private $success;
@@ -59,6 +61,9 @@ public static function success(LoginData $data, ?string $redirectUrl = null) {
 		return $result;
 	}
 
+	/**
+	 * @param LoginController::LOGIN_MSG_*|null $msg
+	 */
 	public static function failure(LoginData $data, string $msg = null): LoginResult {
 		$result = new static(false, $data);
 		if ($msg !== null) {