The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: support windows for 2fa tokens (#1478)
Lucas Smith08a446fefd51
diff --git a/packages/lib/server-only/2fa/verify-2fa-token.ts b/packages/lib/server-only/2fa/verify-2fa-token.tsindex 0e8ec6afc..c5a4c3c95 100644--- a/packages/lib/server-only/2fa/verify-2fa-token.ts+++ b/packages/lib/server-only/2fa/verify-2fa-token.ts@@ -1,21 +1,25 @@import { base32 } from '@scure/base';-import { TOTPController } from 'oslo/otp';+import { generateHOTP } from 'oslo/otp';import type { User } from '@documenso/prisma/client';import { DOCUMENSO_ENCRYPTION_KEY } from '../../constants/crypto';import { symmetricDecrypt } from '../../universal/crypto';-const totp = new TOTPController();-type VerifyTwoFactorAuthenticationTokenOptions = {user: User;totpCode: string;+ // The number of windows to look back+ window?: number;+ // The duration that the token is valid for in seconds+ period?: number;};export const verifyTwoFactorAuthenticationToken = async ({user,totpCode,+ window = 1,+ period = 30_000,}: VerifyTwoFactorAuthenticationTokenOptions) => {const key = DOCUMENSO_ENCRYPTION_KEY;@@ -27,7 +31,21 @@ export const verifyTwoFactorAuthenticationToken = async ({'utf-8',);- const isValidToken = await totp.verify(totpCode, base32.decode(secret));+ const decodedSecret = base32.decode(secret);++ let now = Date.now();++ for (let i = 0; i < window; i++) {+ const counter = Math.floor(now / period);++ const hotp = await generateHOTP(decodedSecret, counter);++ if (totpCode === hotp) {+ return true;+ }++ now -= period;+ }- return isValidToken;+ return false;};diff --git a/packages/lib/server-only/document/is-recipient-authorized.ts b/packages/lib/server-only/document/is-recipient-authorized.tsindex 151235fe2..e9596211a 100644--- a/packages/lib/server-only/document/is-recipient-authorized.ts+++ b/packages/lib/server-only/document/is-recipient-authorized.ts@@ -112,6 +112,7 @@ export const isRecipientAuthorized = async ({return await verifyTwoFactorAuthenticationToken({user,totpCode: token,+ window: 10, // 5 minutes worth of tokens});}).exhaustive();