Skip to content

fix(security): block two-factor replacement #1

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
juliendargelos merged 1 commit into from
Jul 31, 2026
Merged

fix(security): block two-factor replacement #1

Show file tree
Hide file tree
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
14 changes: 13 additions & 1 deletion src/endpoints/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,19 @@ export function createSetupHandler(
return Response.json({ error: 'Unauthorized' }, { status: 401 })
}

const user = req.user as UserWith2FA
const user = (await req.payload.findByID({
collection: pluginConfig.collection as CollectionSlug,
id: req.user.id,
overrideAccess: true,
})) as UserWith2FA

if (user.twoFactorEnabled === true) {
return Response.json(
{ error: '2FA is already enabled for this account.' },
{ status: 409 },
)
}

const totp = createTOTPService(pluginConfig.encryptionKey)

const secret = totp.generateSecret()
Expand Down
13 changes: 12 additions & 1 deletion src/endpoints/verify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,20 @@ export function createVerifyHandler(

const totp = createTOTPService(pluginConfig.encryptionKey)
const totpWindow = pluginConfig.totp.window
const user = req.user as UserWith2FA
const user = (await req.payload.findByID({
collection: pluginConfig.collection as CollectionSlug,
id: req.user.id,
overrideAccess: true,
})) as UserWith2FA

if (action === 'enable') {
if (user.twoFactorEnabled === true) {
return Response.json(
{ error: '2FA is already enabled for this account.' },
{ status: 409 },
)
}

const encryptedPending = user.twoFactorPending

if (!encryptedPending) {
Expand Down
Loading