Skip to content
Closed
Changes from all commits
Commits
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
Stop adding passwords to passwordless authtokens during `updatePasswo…
…rds()`

Fixes #30894 (at least, it is supposed to).

Signed-off-by: Matt Marjanovic <[email protected]>
  • Loading branch information
mdoggydog committed Jan 28, 2022
commit 1758dc357de9eb5a079aa1389f8126e97628817d
4 changes: 4 additions & 0 deletions lib/private/Authentication/Token/PublicKeyTokenProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,10 @@ public function updatePasswords(string $uid, string $password) {
// Update the password for all tokens
$tokens = $this->mapper->getTokenByUser($uid);
foreach ($tokens as $t) {
// But, do not add a password to passwordless tokens.
if (is_null($t->getPassword())) {
continue;
}
$publicKey = $t->getPublicKey();
$t->setPassword($this->encryptPassword($password, $publicKey));
$t->setPasswordInvalid(false);
Expand Down