Skip to content

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

fix order

Thiago Araujo da Silva0ea003ede778
diff --git a/backend/src/services/user/user-service.test.ts b/backend/src/services/user/user-service.test.ts
index 258fc2e79f..53226af3d7 100644
--- a/backend/src/services/user/user-service.test.ts
+++ b/backend/src/services/user/user-service.test.ts
@@ -327,6 +327,23 @@ describe("getStepUpMfaMethod", () => {
});
});
+ test("challenges a factor another org enforces even when the current org asks for less", async () => {
+ const service = buildMfaService({
+ userRow: { isMfaEnabled: true, selectedMfaMethod: MfaMethod.EMAIL },
+ memberOrgIds: ["loose-org", ENFORCED_ORG_ID],
+ orgs: [
+ { id: "loose-org", enforceMfa: false },
+ { id: ENFORCED_ORG_ID, enforceMfa: true, selectedMfaMethod: MfaMethod.TOTP }
+ ],
+ hasTotp: true
+ });
+
+ await expect(service.getStepUpMfaMethod(USER_ID, "loose-org", MfaMethod.TOTP)).resolves.toEqual({
+ challenge: MfaMethod.TOTP,
+ accepted: [MfaMethod.TOTP]
+ });
+ });
+
test("keeps the required method when no substitute is configured", async () => {
const service = buildMfaService({
userRow: { isMfaEnabled: true, selectedMfaMethod: MfaMethod.TOTP },
diff --git a/backend/src/services/user/user-service.ts b/backend/src/services/user/user-service.ts
index 24eae9d85c..92b49175bd 100644
--- a/backend/src/services/user/user-service.ts
+++ b/backend/src/services/user/user-service.ts
@@ -669,12 +669,13 @@ export const userServiceFactory = ({
: sessionOrg;
const { requiredMfaMethod } = getRequiredMfaMethod(org ?? {}, user ?? {});
const asRequired = { challenge: requiredMfaMethod, accepted: [requiredMfaMethod] };
- if (!user || !excludeMethod || requiredMfaMethod !== excludeMethod) return asRequired;
+ if (!user || !excludeMethod) return asRequired;
const enforcingOrgs = await findMfaEnforcingOrgs(userId);
if (enforcingOrgs.some((enforcingOrg) => (enforcingOrg.selectedMfaMethod ?? MfaMethod.EMAIL) === excludeMethod)) {
- return asRequired;
+ return { challenge: excludeMethod, accepted: [excludeMethod] };
}
+ if (requiredMfaMethod !== excludeMethod) return asRequired;
const replacement = await findReplacementMfaMethod(user, excludeMethod);
if (!replacement) return asRequired;