Skip to content

chore(mfa): Remove redudant checks for mfa #19518

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
merged 1 commit into from
Oct 8, 2025
Merged

chore(mfa): Remove redudant checks for mfa #19518

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
10 changes: 0 additions & 10 deletions packages/fxa-auth-server/lib/routes/password.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,6 @@ module.exports = function (
// The subsequent call to 'getKeys' would fail, ultimately orphaning a passwordChangeToken...
const sessionToken = request.auth.credentials;

if (!sessionToken.emailVerified) {
statsd.increment('passwordChange.start.emailNotVerified');
throw error.unverifiedAccount();
}

if (sessionToken.tokenVerificationId) {
statsd.increment('passwordChange.start.sessionNotVerified');
throw error.unverifiedSession();
}

await customs.checkAuthenticated(
request,
sessionToken.uid,
Expand Down
16 changes: 2 additions & 14 deletions packages/fxa-auth-server/lib/routes/recovery-codes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@ module.exports = (log, db, config, customs, mailer, glean, statsd) => {
async handler(request) {
log.begin('replaceRecoveryCodes', request);

const { authenticatorAssuranceLevel, uid } = request.auth.credentials;

// Since TOTP and backup authentication codes go hand in hand, you should only be
// able to replace backup authentication codes in a TOTP verified session.
if (!authenticatorAssuranceLevel || authenticatorAssuranceLevel <= 1) {
throw errors.unverifiedSession();
}
const { uid } = request.auth.credentials;

const recoveryCodes = await db.replaceRecoveryCodes(
uid,
Expand Down Expand Up @@ -158,13 +152,7 @@ module.exports = (log, db, config, customs, mailer, glean, statsd) => {
async handler(request) {
log.begin('updateRecoveryCodes', request);

const { authenticatorAssuranceLevel, uid } = request.auth.credentials;

// Since TOTP and backup authentication codes go hand in hand, you should only be
// able to replace backup authentication codes in a TOTP verified session.
if (!authenticatorAssuranceLevel || authenticatorAssuranceLevel <= 1) {
throw errors.unverifiedSession();
}
const { uid } = request.auth.credentials;

const { recoveryCodes } = request.payload;
await db.updateRecoveryCodes(uid, recoveryCodes);
Expand Down
10 changes: 1 addition & 9 deletions packages/fxa-auth-server/lib/routes/recovery-key.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ module.exports = (

const sessionToken = request.auth.credentials;

if (sessionToken.tokenVerificationId) {
throw errors.unverifiedSession();
}

const { uid } = sessionToken;
const { recoveryKeyId, recoveryData, enabled, replaceKey } =
request.payload;
Expand Down Expand Up @@ -434,11 +430,7 @@ module.exports = (
async handler(request) {
log.begin('recoveryKeyDelete', request);

const { tokenVerificationId, uid } = request.auth.credentials;

if (tokenVerificationId) {
throw errors.unverifiedSession();
}
const { uid } = request.auth.credentials;

await db.deleteRecoveryKey(uid);
await recordSecurityEvent('account.recovery_key_removed', {
Expand Down
6 changes: 1 addition & 5 deletions packages/fxa-auth-server/lib/routes/totp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,13 @@ module.exports = (
handler: async function (request) {
log.begin('totp.create', request);

const { email, uid, tokenVerificationId } = request.auth.credentials;
const { email, uid } = request.auth.credentials;

const account = await db.account(uid);
if (!account.emailVerified) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this needed now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's also a check on line 556 in /totp/destroy that's not needed.

throw errors.unverifiedAccount();
}

if (tokenVerificationId) {
throw errors.unverifiedSession();
}

await customs.checkAuthenticated(request, uid, email, 'totpCreate');

const hasEnabledToken = await otpUtils.hasTotpToken({ uid });
Expand Down
21 changes: 0 additions & 21 deletions packages/fxa-auth-server/test/local/routes/recovery-codes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,6 @@ describe('backup authentication codes', () => {
);
});
});

it("should't replace codes in non-TOTP verified session", () => {
requestOptions.credentials.authenticatorAssuranceLevel = 1;
return runTest('/recoveryCodes', requestOptions, 'GET').then(
assert.fail,
(err) => {
assert.equal(err.errno, error.ERRNO.SESSION_UNVERIFIED);
}
);
});
});

describe('PUT /recoveryCodes', () => {
Expand Down Expand Up @@ -168,17 +158,6 @@ describe('backup authentication codes', () => {
);
});
});

it("should't overwrite codes for non-TOTP verified session", () => {
requestOptions.credentials.authenticatorAssuranceLevel = 1;
requestOptions.payload.recoveryCodes = ['123'];
return runTest('/recoveryCodes', requestOptions, 'PUT').then(
assert.fail,
(err) => {
assert.equal(err.errno, error.ERRNO.SESSION_UNVERIFIED);
}
);
});
});

describe('GET /recoveryCodes/exists', () => {
Expand Down
29 changes: 0 additions & 29 deletions packages/fxa-auth-server/test/local/routes/recovery-keys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,35 +784,6 @@ describe('DELETE /recoveryKey', () => {
);
});
});

describe('should fail for unverified session', () => {
beforeEach(() => {
mockAccountEventsManager = mocks.mockAccountEventsManager();
const requestOptions = {
method: 'DELETE',
credentials: { uid, email, tokenVerificationId: 'unverified' },
log,
};
return setup(
{ db: { recoveryData } },
{},
'/recoveryKey',
requestOptions
).then(assert.fail, (err) => (response = err));
});

after(() => {
mocks.unMockAccountEventsManager();
});

it('returned the correct response', () => {
assert.equal(
response.errno,
errors.ERRNO.SESSION_UNVERIFIED,
'unverified session'
);
});
});
});

describe('POST /recoveryKey/hint', () => {
Expand Down
12 changes: 0 additions & 12 deletions packages/fxa-auth-server/test/local/routes/totp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,6 @@ describe('totp', () => {
});
});

it('should be disabled in unverified session', () => {
requestOptions.credentials.tokenVerificationId = 'notverified';
return setup(
{ db: { email: TEST_EMAIL, emailVerified: true } },
{},
'/totp/create',
requestOptions
).then(assert.fail, (err) => {
assert.deepEqual(err.errno, 138, 'unverified session error');
});
});

it('should be disabled for unverified email', () => {
return setup(
{ db: { email: TEST_EMAIL, emailVerified: false } },
Expand Down