Add Optional 2FA Support (#61)
* Add TOTP MFA Support * Add Passkey MFA Support It's not impossible I missed some minor cleanup, but most things make sense and there isn't a lot of obvious duplication anymore. --------- Co-authored-by: Bruno Bernardino <me@brunobernardino.com>
This commit is contained in:
151
routes/mfa-verify.tsx
Normal file
151
routes/mfa-verify.tsx
Normal file
@@ -0,0 +1,151 @@
|
||||
import { Handlers, PageProps } from 'fresh/server.ts';
|
||||
|
||||
import { FreshContextState, MultiFactorAuthMethodType } from '/lib/types.ts';
|
||||
import { UserModel } from '/lib/models/user.ts';
|
||||
import { createSessionResponse } from '/lib/auth.ts';
|
||||
import { getFormDataField } from '/lib/form-utils.tsx';
|
||||
import { AppConfig } from '/lib/config.ts';
|
||||
import { MultiFactorAuthModel } from '/lib/models/multi-factor-auth.ts';
|
||||
import {
|
||||
getEnabledMultiFactorAuthMethodsFromUser,
|
||||
isMultiFactorAuthEnabledForUser,
|
||||
} from '/lib/utils/multi-factor-auth.ts';
|
||||
import { TOTPModel } from '/lib/models/multi-factor-auth/totp.ts';
|
||||
import MultiFactorAuthVerifyForm from '/components/auth/MultiFactorAuthVerifyForm.tsx';
|
||||
|
||||
interface Data {
|
||||
error?: {
|
||||
title: string;
|
||||
message: string;
|
||||
};
|
||||
email?: string;
|
||||
redirectUrl?: string;
|
||||
availableMethods?: MultiFactorAuthMethodType[];
|
||||
hasPasskey?: boolean;
|
||||
}
|
||||
|
||||
export const handler: Handlers<Data, FreshContextState> = {
|
||||
async GET(request, context) {
|
||||
const isMultiFactorAuthEnabled = await AppConfig.isMultiFactorAuthEnabled();
|
||||
|
||||
if (!isMultiFactorAuthEnabled) {
|
||||
return new Response('Redirect', { status: 303, headers: { 'Location': '/login' } });
|
||||
}
|
||||
|
||||
const searchParams = new URL(request.url).searchParams;
|
||||
const redirectUrl = searchParams.get('redirect') || '/';
|
||||
|
||||
const { user } = (await MultiFactorAuthModel.getDataFromRequest(request)) || {};
|
||||
|
||||
if (!user) {
|
||||
return new Response('Redirect', { status: 303, headers: { 'Location': '/login' } });
|
||||
}
|
||||
|
||||
const hasMultiFactorAuthEnabled = isMultiFactorAuthEnabledForUser(user);
|
||||
|
||||
if (!hasMultiFactorAuthEnabled) {
|
||||
return new Response('Redirect', { status: 303, headers: { 'Location': '/login' } });
|
||||
}
|
||||
|
||||
const enabledMethods = getEnabledMultiFactorAuthMethodsFromUser(user);
|
||||
const availableMethods = enabledMethods.map((method) => method.type);
|
||||
const hasPasskey = availableMethods.includes('passkey');
|
||||
|
||||
return await context.render({
|
||||
email: user.email,
|
||||
redirectUrl,
|
||||
availableMethods,
|
||||
hasPasskey,
|
||||
});
|
||||
},
|
||||
async POST(request, context) {
|
||||
const isMultiFactorAuthEnabled = await AppConfig.isMultiFactorAuthEnabled();
|
||||
|
||||
if (!isMultiFactorAuthEnabled) {
|
||||
return new Response('Redirect', { status: 303, headers: { 'Location': '/login' } });
|
||||
}
|
||||
|
||||
const searchParams = new URL(request.url).searchParams;
|
||||
const redirectUrl = searchParams.get('redirect') || '/';
|
||||
|
||||
const { user } = (await MultiFactorAuthModel.getDataFromRequest(request)) || {};
|
||||
|
||||
if (!user) {
|
||||
return new Response('Redirect', { status: 303, headers: { 'Location': '/login' } });
|
||||
}
|
||||
|
||||
const hasMultiFactorAuthEnabled = isMultiFactorAuthEnabledForUser(user);
|
||||
|
||||
if (!hasMultiFactorAuthEnabled) {
|
||||
return new Response('Redirect', { status: 303, headers: { 'Location': '/login' } });
|
||||
}
|
||||
|
||||
const enabledMethods = getEnabledMultiFactorAuthMethodsFromUser(user);
|
||||
const availableMethods = enabledMethods.map((method) => method.type);
|
||||
const hasPasskey = availableMethods.includes('passkey');
|
||||
|
||||
try {
|
||||
const formData = await request.formData();
|
||||
const token = getFormDataField(formData, 'token');
|
||||
|
||||
if (!token) {
|
||||
throw new Error('Authentication token is required');
|
||||
}
|
||||
|
||||
let isValid = false;
|
||||
let updateUser = false;
|
||||
|
||||
// Passkey verification is handled in a separate process
|
||||
for (const method of enabledMethods) {
|
||||
const verification = await TOTPModel.verifyMethodToken(method.metadata, token);
|
||||
if (verification.isValid) {
|
||||
isValid = true;
|
||||
|
||||
if (verification.remainingCodes && method.type === 'totp' && method.metadata.totp) {
|
||||
method.metadata.totp.hashed_backup_codes = verification.remainingCodes;
|
||||
updateUser = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isValid) {
|
||||
throw new Error('Invalid authentication token or backup code');
|
||||
}
|
||||
|
||||
if (updateUser) {
|
||||
await UserModel.update(user);
|
||||
}
|
||||
|
||||
return await createSessionResponse(request, user, { urlToRedirectTo: redirectUrl });
|
||||
} catch (error) {
|
||||
console.error('Multi-factor authentication verification error:', error);
|
||||
|
||||
return await context.render({
|
||||
error: {
|
||||
title: 'Verification Failed',
|
||||
message: (error as Error).message,
|
||||
},
|
||||
email: user.email,
|
||||
redirectUrl,
|
||||
availableMethods,
|
||||
hasPasskey,
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
export default function MultiFactorAuthVerifyPage({ data }: PageProps<Data, FreshContextState>) {
|
||||
return (
|
||||
<main>
|
||||
<section class='max-w-screen-md mx-auto flex flex-col items-center justify-center'>
|
||||
<MultiFactorAuthVerifyForm
|
||||
email={data.email || ''}
|
||||
redirectUrl={data.redirectUrl || '/'}
|
||||
availableMethods={data.availableMethods || []}
|
||||
error={data.error}
|
||||
/>
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user