Skip to content

Fix race condition in EmailMultifactorMethod #6280

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

Merged
BurntimeX merged 1 commit into from
May 5, 2025
Merged

Fix race condition in EmailMultifactorMethod #6280

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
32 changes: 8 additions & 24 deletions wcfsetup/install/files/lib/system/user/multifactor/EmailMultifactorMethod.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,40 +238,24 @@ public function createAuthenticationForm(IFormDocument $form, Setup $setup): voi
*/
public function processAuthenticationForm(IFormDocument $form, Setup $setup): void
{
$userCode = $form->getData()['data']['code'];

$sql = "SELECT code
FROM wcf1_user_multifactor_email
WHERE setupID = ?
AND createTime > ?
FOR UPDATE";
$statement = WCF::getDB()->prepare($sql);
$statement->execute([
$this->invalidateUsedCode(
$setup->getId(),
(\TIME_NOW - self::LIFETIME),
]);
$codes = $statement->fetchAll(\PDO::FETCH_ASSOC);

$usedCode = $this->findValidCode($userCode, $codes);

if ($usedCode === null) {
throw new \RuntimeException('Unable to find a valid code.');
}
$form->getData()['data']['code']
);
}

private function invalidateUsedCode(int $id, string $code): void
{
$sql = "DELETE FROM wcf1_user_multifactor_email
WHERE setupID = ?
AND createTime > ?
AND code = ?";
$statement = WCF::getDB()->prepare($sql);
$statement->execute([
$setup->getId(),
$id,
(\TIME_NOW - self::LIFETIME),
$usedCode['code'],
$code,
]);

if ($statement->getAffectedRows() !== 1) {
throw new \RuntimeException('Unable to invalidate the code.');
}
}

/**
Expand Down