Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

fix(pam): let the browser complete MFA challenges raised by the user's CLI session

Carlos Monastyrski94fd56ce02ad
diff --git a/backend/src/services/mfa-session/mfa-session-service.test.ts b/backend/src/services/mfa-session/mfa-session-service.test.ts
index 8fb44949c0..8d63f3d826 100644
--- a/backend/src/services/mfa-session/mfa-session-service.test.ts
+++ b/backend/src/services/mfa-session/mfa-session-service.test.ts
@@ -23,12 +23,21 @@ const makeKeyStore = (session: TMfaSession | null): Mocked<KeyStoreSlice> =>
deleteItem: vi.fn().mockResolvedValue(1)
}) as Mocked<KeyStoreSlice>;
-const makeService = (keyStore: Mocked<KeyStoreSlice>, mfaLockoutService: Record<string, unknown> = {}) =>
+const makeService = (
+ keyStore: Mocked<KeyStoreSlice>,
+ mfaLockoutService: Record<string, unknown> = {},
+ initiatingSessionUserAgent?: string
+) =>
mfaSessionServiceFactory({
keyStore: keyStore as never,
tokenService: {
createTokenForUser: vi.fn().mockResolvedValue("code"),
- validateTokenForUser: vi.fn().mockResolvedValue(undefined)
+ validateTokenForUser: vi.fn().mockResolvedValue(undefined),
+ getUserTokenSessionById: vi.fn(async (id: string, userId: string) =>
+ id === TOKEN_VERSION && userId === USER_ID && initiatingSessionUserAgent
+ ? { id, userId, userAgent: initiatingSessionUserAgent }
+ : undefined
+ )
} as never,
smtpService: { sendMail: vi.fn().mockResolvedValue(undefined) } as never,
totpService: { verifyUserTotp: vi.fn().mockResolvedValue(undefined) } as never,
@@ -143,3 +152,42 @@ describe("mfaSessionService.verifyMfaSession", () => {
expect(recordRecentMfaAuth).toHaveBeenCalledWith(USER_ID, TOKEN_VERSION, MfaMethod.EMAIL);
});
});
+
+describe("mfaSessionService completing a challenge from another login session", () => {
+ const browserArgs = { mfaSessionId: SESSION_ID, userId: USER_ID, tokenVersionId: "browser-session" };
+ const pendingSession = activeSession({ status: MfaSessionStatus.PENDING });
+
+ test("lets the user's browser complete a challenge raised by their CLI session", async () => {
+ const keyStore = makeKeyStore(pendingSession);
+ const service = makeService(keyStore, {}, "cli");
+
+ await expect(service.getMfaSessionStatus(browserArgs)).resolves.toEqual({
+ status: MfaSessionStatus.PENDING,
+ mfaMethod: MfaMethod.EMAIL
+ });
+ await expect(
+ service.verifyMfaSession({ ...browserArgs, mfaToken: "123456", mfaMethod: MfaMethod.EMAIL })
+ ).resolves.toMatchObject({ success: true });
+ });
+
+ test("still binds consumption of a CLI-raised challenge to the CLI session", async () => {
+ const service = makeService(makeKeyStore(activeSession()), {}, "cli");
+ await expect(service.isMfaSessionActive({ ...activeArgs, tokenVersionId: "browser-session" })).resolves.toBe(
+ false
+ );
+ });
+
+ test("rejects a challenge raised by another browser session", async () => {
+ const service = makeService(makeKeyStore(pendingSession), {}, "Mozilla/5.0");
+
+ await expect(service.getMfaSessionStatus(browserArgs)).rejects.toBeInstanceOf(ForbiddenRequestError);
+ await expect(
+ service.verifyMfaSession({ ...browserArgs, mfaToken: "123456", mfaMethod: MfaMethod.EMAIL })
+ ).rejects.toBeInstanceOf(ForbiddenRequestError);
+ });
+
+ test("rejects a challenge whose initiating session no longer exists", async () => {
+ const service = makeService(makeKeyStore(pendingSession));
+ await expect(service.getMfaSessionStatus(browserArgs)).rejects.toBeInstanceOf(ForbiddenRequestError);
+ });
+});
diff --git a/backend/src/services/mfa-session/mfa-session-service.ts b/backend/src/services/mfa-session/mfa-session-service.ts
index 4a9a5d5c1d..af86af2878 100644
--- a/backend/src/services/mfa-session/mfa-session-service.ts
+++ b/backend/src/services/mfa-session/mfa-session-service.ts
@@ -1,4 +1,5 @@
import { KeyStorePrefixes, KeyStoreTtls, TKeyStoreFactory } from "@app/keystore/keystore";
+import { isCliUserAgent } from "@app/lib/cli-version/cli-version-fns";
import { crypto } from "@app/lib/crypto";
import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";
import { isMfaProofAccepted } from "@app/services/auth/auth-fns";
@@ -20,7 +21,10 @@ import {
type TMfaSessionServiceFactoryDep = {
keyStore: Pick<TKeyStoreFactory, "getItem" | "setItemWithExpiry" | "setItemWithExpiryNX" | "deleteItem">;
- tokenService: Pick<TAuthTokenServiceFactory, "createTokenForUser" | "validateTokenForUser">;
+ tokenService: Pick<
+ TAuthTokenServiceFactory,
+ "createTokenForUser" | "validateTokenForUser" | "getUserTokenSessionById"
+ >;
smtpService: Pick<TSmtpService, "sendMail">;
totpService: Pick<TTotpServiceFactory, "verifyUserTotp">;
mfaLockoutService: Pick<
@@ -91,6 +95,13 @@ export const mfaSessionServiceFactory = ({
return true;
};
+ const canCompleteFromSession = async (mfaSession: TMfaSession, userId: string, tokenVersionId: string) => {
+ if (!mfaSession.initiatingTokenVersionId || mfaSession.initiatingTokenVersionId === tokenVersionId) return true;
+
+ const initiatingSession = await tokenService.getUserTokenSessionById(mfaSession.initiatingTokenVersionId, userId);
+ return isCliUserAgent(initiatingSession?.userAgent ?? undefined);
+ };
+
// Helper function to update MFA session in Redis
const updateMfaSession = async (mfaSession: TMfaSession, ttlSeconds: number): Promise<void> => {
const mfaSessionKey = KeyStorePrefixes.MfaSession(mfaSession.sessionId);
@@ -155,7 +166,7 @@ export const mfaSessionServiceFactory = ({
});
}
- if (mfaSession.initiatingTokenVersionId && mfaSession.initiatingTokenVersionId !== tokenVersionId) {
+ if (!(await canCompleteFromSession(mfaSession, userId, tokenVersionId))) {
throw new ForbiddenRequestError({
message: "MFA session does not belong to current session"
});
@@ -229,7 +240,7 @@ export const mfaSessionServiceFactory = ({
});
}
- if (mfaSession.initiatingTokenVersionId && mfaSession.initiatingTokenVersionId !== tokenVersionId) {
+ if (!(await canCompleteFromSession(mfaSession, userId, tokenVersionId))) {
throw new ForbiddenRequestError({
message: "MFA session does not belong to current session"
});