Skip to content

[stable25] Fix unnecessary authtoken updates #43087

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

Closed
ChristophWurst wants to merge 6 commits into from
Closed

[stable25] Fix unnecessary authtoken updates #43087

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24363f0
PublickKeyTokenProvider: Fix password update routine with password hash
marcelklehr Dec 1, 2022
3dcbcd4
chore(version): Bump dev version to trigger database migration
juliusknorr Jan 3, 2023
b1de95d
fix(authentication): Only verify each hash once
nickvergessen Jan 9, 2023
f06240d
fix(authentication): Invert the logic to the original intention
nickvergessen Jan 9, 2023
cce0295
fix(authentication): Only hash the new password when needed
nickvergessen Jan 9, 2023
c5f5448
fix(authentication): Update the token when the hash is null or can no…
nickvergessen Jan 9, 2023
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
Prev Previous commit
Next Next commit
fix(authentication): Only verify each hash once 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @ChristophWurst
nickvergessen authored and ChristophWurst committed Jan 24, 2024
commit b1de95d165dd3ca96bb092dce6600e241613fb88
6 changes: 4 additions & 2 deletions lib/private/Authentication/Token/PublicKeyTokenProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,11 @@ public function updatePasswords(string $uid, string $password) {
// Update the password for all tokens
$tokens = $this->mapper->getTokenByUser($uid);
$passwordHash = $this->hashPassword($password);
$verifiedHashes = [];
foreach ($tokens as $t) {
$publicKey = $t->getPublicKey();
if ($t->getPasswordHash() === null || $this->hasher->verify(sha1($password) . $password, $t->getPasswordHash())) {
if ($t->getPasswordHash() === null || isset($verifiedHashes[$t->getPasswordHash()]) || $this->hasher->verify(sha1($password) . $password, $t->getPasswordHash())) {
$verifiedHashes[$t->getPasswordHash() ?: ''] = true;
$publicKey = $t->getPublicKey();
$t->setPassword($this->encryptPassword($password, $publicKey));
$t->setPasswordHash($passwordHash);
$t->setPasswordInvalid(false);
Expand Down