Skip to content

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

Address greptile comments

Carlos Monastyrskib678af65eda7
diff --git a/backend/src/ee/services/pam/pam-mfa.ts b/backend/src/ee/services/pam/pam-mfa.ts
index 75b1b00456..97bca1f257 100644
--- a/backend/src/ee/services/pam/pam-mfa.ts
+++ b/backend/src/ee/services/pam/pam-mfa.ts
@@ -42,7 +42,13 @@ export const enforceMfa = async (
const mfaMethod = (orgMfaMethod ?? userMfaMethod ?? MfaMethod.EMAIL) as MfaMethod;
// Bound to the session that raised the challenge
- const newMfaSessionId = await mfaSessionService.createMfaSession(userId, accountId, mfaMethod, tokenVersionId);
+ const newMfaSessionId = await mfaSessionService.createMfaSession(
+ userId,
+ accountId,
+ mfaMethod,
+ tokenVersionId,
+ true
+ );
if (mfaMethod === MfaMethod.EMAIL && actorEmail) {
await mfaSessionService.sendMfaCode(userId, actorEmail);
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 8d63f3d826..4b98196698 100644
--- a/backend/src/services/mfa-session/mfa-session-service.test.ts
+++ b/backend/src/services/mfa-session/mfa-session-service.test.ts
@@ -1,7 +1,8 @@
import { describe, expect, type Mocked, test, vi } from "vitest";
+import { enforceMfa } from "@app/ee/services/pam/pam-mfa";
import { KeyStorePrefixes, TKeyStoreFactory } from "@app/keystore/keystore";
-import { ForbiddenRequestError } from "@app/lib/errors";
+import { BadRequestError, ForbiddenRequestError } from "@app/lib/errors";
import { MfaMethod } from "@app/services/auth/auth-type";
import { mfaSessionServiceFactory } from "./mfa-session-service";
@@ -10,6 +11,7 @@ import { MfaSessionStatus, MfaStepUpResource, TMfaSession } from "./mfa-session-
const USER_ID = "user-1";
const SESSION_ID = "mfa-session-1";
const TOKEN_VERSION = "login-session-a";
+const ACCOUNT_ID = "pam-account-1";
type KeyStoreSlice = Pick<TKeyStoreFactory, "getItem" | "setItemWithExpiry" | "setItemWithExpiryNX" | "deleteItem">;
@@ -155,7 +157,7 @@ describe("mfaSessionService.verifyMfaSession", () => {
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 });
+ const pendingSession = activeSession({ status: MfaSessionStatus.PENDING, allowCliHandoff: true });
test("lets the user's browser complete a challenge raised by their CLI session", async () => {
const keyStore = makeKeyStore(pendingSession);
@@ -170,11 +172,45 @@ describe("mfaSessionService completing a challenge from another login session",
).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("keeps step-up challenges raised by a CLI session bound to that session", async () => {
+ const service = makeService(makeKeyStore(activeSession({ status: MfaSessionStatus.PENDING })), {}, "cli");
+
+ await expect(service.getMfaSessionStatus(browserArgs)).rejects.toBeInstanceOf(ForbiddenRequestError);
+ await expect(
+ service.verifyMfaSession({ ...browserArgs, mfaToken: "123456", mfaMethod: MfaMethod.EMAIL })
+ ).rejects.toBeInstanceOf(ForbiddenRequestError);
+ });
+
+ test("a challenge verified in the browser is accepted by enforceMfa only from the CLI session", async () => {
+ const store = new Map<string, string>();
+ const keyStore = {
+ getItem: vi.fn(async (key: string) => store.get(key) ?? null),
+ setItemWithExpiry: vi.fn(async (key: string, _ttl: number, value: string) => {
+ store.set(key, value);
+ return "OK";
+ }),
+ setItemWithExpiryNX: vi.fn().mockResolvedValue("OK"),
+ deleteItem: vi.fn(async (key: string) => Number(store.delete(key)))
+ } as Mocked<KeyStoreSlice>;
+ const service = makeService(keyStore, {}, "cli");
+ const enforce = (tokenVersionId: string, mfaSessionId?: string) =>
+ enforceMfa(
+ {
+ mfaSessionService: service,
+ orgDAL: { findOrgById: vi.fn().mockResolvedValue({ enforceMfa: false }) } as never,
+ userDAL: { findById: vi.fn().mockResolvedValue({ isMfaEnabled: false }) } as never
+ },
+ { userId: USER_ID, orgId: "org-1", actorEmail: "", accountId: ACCOUNT_ID, mfaSessionId, tokenVersionId }
+ );
+
+ const challenge = (await enforce(TOKEN_VERSION).catch((err: unknown) => err)) as BadRequestError;
+ const { mfaSessionId } = challenge.details as { mfaSessionId: string };
+ await service.verifyMfaSession({ ...browserArgs, mfaSessionId, mfaToken: "123456", mfaMethod: MfaMethod.EMAIL });
+
+ await expect(enforce("browser-session", mfaSessionId)).rejects.toThrow(
+ "MFA session belongs to a different login session"
);
+ await expect(enforce(TOKEN_VERSION, mfaSessionId)).resolves.toBeUndefined();
});
test("rejects a challenge raised by another browser session", async () => {
diff --git a/backend/src/services/mfa-session/mfa-session-service.ts b/backend/src/services/mfa-session/mfa-session-service.ts
index af86af2878..1ed7e56d65 100644
--- a/backend/src/services/mfa-session/mfa-session-service.ts
+++ b/backend/src/services/mfa-session/mfa-session-service.ts
@@ -97,6 +97,7 @@ export const mfaSessionServiceFactory = ({
const canCompleteFromSession = async (mfaSession: TMfaSession, userId: string, tokenVersionId: string) => {
if (!mfaSession.initiatingTokenVersionId || mfaSession.initiatingTokenVersionId === tokenVersionId) return true;
+ if (!mfaSession.allowCliHandoff) return false;
const initiatingSession = await tokenService.getUserTokenSessionById(mfaSession.initiatingTokenVersionId, userId);
return isCliUserAgent(initiatingSession?.userAgent ?? undefined);
@@ -256,7 +257,8 @@ export const mfaSessionServiceFactory = ({
userId: string,
resourceId: string,
mfaMethod: MfaMethod,
- initiatingTokenVersionId?: string
+ initiatingTokenVersionId?: string,
+ allowCliHandoff?: boolean
): Promise<string> => {
const mfaSessionId = crypto.randomBytes(32).toString("hex");
const mfaSession: TMfaSession = {
@@ -265,7 +267,8 @@ export const mfaSessionServiceFactory = ({
resourceId,
status: MfaSessionStatus.PENDING,
mfaMethod,
- initiatingTokenVersionId
+ initiatingTokenVersionId,
+ allowCliHandoff
};
await keyStore.setItemWithExpiry(
diff --git a/backend/src/services/mfa-session/mfa-session-types.ts b/backend/src/services/mfa-session/mfa-session-types.ts
index c94397ce8a..51945ea246 100644
--- a/backend/src/services/mfa-session/mfa-session-types.ts
+++ b/backend/src/services/mfa-session/mfa-session-types.ts
@@ -19,6 +19,7 @@ export type TMfaSession = {
status: MfaSessionStatus;
mfaMethod: MfaMethod;
initiatingTokenVersionId?: string;
+ allowCliHandoff?: boolean;
};
export type TCreateMfaSessionDTO = {