Skip to content

fix(Session): Prevent immediate token invalidation #58555

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
solracsf wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −3
Open

fix(Session): Prevent immediate token invalidation #58555

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
17 changes: 14 additions & 3 deletions lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,10 +731,21 @@ private function checkTokenCredentials(IToken $dbToken, $token) {
return false;
}

// If the token password is no longer valid mark it as such
if ($this->manager->checkPassword($dbToken->getLoginName(), $pwd) === false) {
$tokenLoginName = $dbToken->getLoginName();
if ($this->manager->checkPassword($tokenLoginName, $pwd) === false) {
// If the decrypted password is empty or not a valid local password,
// but the user exists and is enabled, we DO NOT permanently invalidate the token.
if (empty($pwd) || $this->manager->get($tokenLoginName) !== null) {
$this->logger->warning('Password check failed for user {user}, but user is active. Token preserved.', [
'app' => 'core',
'user' => $tokenLoginName,
]);
return false;
}

// Legitimate password change or invalid user
// Invalidate the token
$this->tokenProvider->markPasswordInvalid($dbToken, $token);
// User is logged out
return false;
}

Expand Down
Loading