Skip to content

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

fix: empty bypassers

adilson55548d980186
diff --git a/backend/e2e-test/routes/v1/access-approval-global-request-lifecycle.spec.ts b/backend/e2e-test/routes/v1/access-approval-global-request-lifecycle.spec.ts
index 4a99c8d008..3e9d8c69e1 100644
--- a/backend/e2e-test/routes/v1/access-approval-global-request-lifecycle.spec.ts
+++ b/backend/e2e-test/routes/v1/access-approval-global-request-lifecycle.spec.ts
@@ -1025,7 +1025,7 @@ describe("Break-glass approvals on the global system", () => {
expect(listed.policy.bypassers).toEqual([seedData1.id]);
});
- test("A soft policy with no bypassers lets the requester break glass", async () => {
+ test("A soft policy with no bypassers refuses break-glass when self-approvals are off", async () => {
const secretPath = "/break-glass-anyone";
await createSoftPolicy({ secretPath });
@@ -1034,13 +1034,12 @@ describe("Break-glass approvals on the global system", () => {
const requestId = createRes.json().approval.id as string;
const bypassRes = await reviewAccessRequest(requestId, { status: "approved", bypassReason });
- expect(bypassRes.statusCode).toBe(200);
+ expect(bypassRes.statusCode).toBe(403);
+ expect(bypassRes.json().message).toBe("You are not permitted to bypass approval on this request");
const state = await getRequestState(requestId);
- expect(state.status).toBe("approved");
- expect(state.grant?.isBreakGlass).toBe(true);
- expect(state.grant?.expiresAt).toBeNull();
- expect(state.privilege?.isTemporary).toBe(false);
+ expect(state.status).toBe("pending");
+ expect(state.grant).toBeUndefined();
});
test("A requester who is not on a non-empty bypasser list is refused", async () => {
diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts
index d5f0a0e6e7..0119f808fe 100644
--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts
+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts
@@ -1,4 +1,3 @@
-import { TApprovalPolicies } from "@app/db/schemas";
import { NotFoundError } from "@app/lib/errors";
import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
@@ -8,6 +7,7 @@ import { TApprovalActor, TApprovalResource } from "../approval-policy-types";
import { TApprovalRequestGrantsDALFactory } from "../approval-request-dal";
import {
createSecretAccessGrantWithPrivilege,
+ getSecretAccessAllowedSelfApprovals,
getSecretAccessRequestData,
hasSameAccessCriteria,
isSecretAccessBreakGlassEligible,
@@ -90,13 +90,18 @@ export const secretAccessApprovalGlobalResourceFactory = ({
actor,
userGroupIds
}: {
- policy: Pick<TApprovalPolicies, "enforcementLevel">;
+ policy: {
+ enforcementLevel: string;
+ constraints?: unknown;
+ allowedSelfApprovals?: boolean;
+ };
bypassers: { type: string; id?: string | null }[];
actor: Pick<TApprovalActor, "id">;
userGroupIds: Set<string>;
}) =>
isSecretAccessBreakGlassEligible({
enforcementLevel: policy.enforcementLevel,
+ allowedSelfApprovals: getSecretAccessAllowedSelfApprovals(policy),
bypassers,
actorUserId: actor.id,
actorGroupIds: userGroupIds
diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.test.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.test.ts
index c9ee4d5a61..492ee821e6 100644
--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.test.ts
+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.test.ts
@@ -1,4 +1,5 @@
import {
+ getSecretAccessAllowedSelfApprovals,
getSecretAccessGrantWindow,
hasSameAccessCriteria,
isSecretAccessBreakGlassEligible,
@@ -96,6 +97,34 @@ describe("hasSameAccessCriteria", () => {
});
});
+describe("getSecretAccessAllowedSelfApprovals", () => {
+ test("a mapped policy uses the top-level flag", () => {
+ expect(getSecretAccessAllowedSelfApprovals({ allowedSelfApprovals: false })).toBe(false);
+ expect(
+ getSecretAccessAllowedSelfApprovals({
+ allowedSelfApprovals: true,
+ constraints: { version: 1, constraints: { allowedSelfApprovals: false, requestExpirationTime: null } }
+ })
+ ).toBe(true);
+ });
+
+ test("a raw policy row is read from constraints", () => {
+ expect(
+ getSecretAccessAllowedSelfApprovals({
+ constraints: {
+ version: 1,
+ constraints: { allowedSelfApprovals: false, requestExpirationTime: null, maxTimePeriod: null }
+ }
+ })
+ ).toBe(false);
+ });
+
+ test("an unreadable constraints blob keeps self-approval allowed", () => {
+ expect(getSecretAccessAllowedSelfApprovals({ constraints: { version: 1 } })).toBe(true);
+ expect(getSecretAccessAllowedSelfApprovals({})).toBe(true);
+ });
+});
+
describe("isSecretAccessBreakGlassEligible", () => {
const actorUserId = "a3c1f0e2-5b7d-4e8f-9a0b-1c2d3e4f5a6b";
const groupId = "0f9e8d7c-6b5a-4e3d-8c2b-1a0f9e8d7c6b";
@@ -103,20 +132,45 @@ describe("isSecretAccessBreakGlassEligible", () => {
test("a hard policy can never be bypassed", () => {
expect(
- isSecretAccessBreakGlassEligible({ enforcementLevel: "hard", bypassers: [], actorUserId, actorGroupIds })
+ isSecretAccessBreakGlassEligible({
+ enforcementLevel: "hard",
+ allowedSelfApprovals: true,
+ bypassers: [],
+ actorUserId,
+ actorGroupIds
+ })
).toBe(false);
});
- test("a soft policy with no bypassers lets anyone bypass", () => {
+ test("a soft policy with no bypassers lets anyone bypass when self-approvals are allowed", () => {
expect(
- isSecretAccessBreakGlassEligible({ enforcementLevel: "soft", bypassers: [], actorUserId, actorGroupIds })
+ isSecretAccessBreakGlassEligible({
+ enforcementLevel: "soft",
+ allowedSelfApprovals: true,
+ bypassers: [],
+ actorUserId,
+ actorGroupIds
+ })
).toBe(true);
});
+ test("a soft policy with no bypassers refuses break-glass when self-approvals are off", () => {
+ expect(
+ isSecretAccessBreakGlassEligible({
+ enforcementLevel: "soft",
+ allowedSelfApprovals: false,
+ bypassers: [],
+ actorUserId,
+ actorGroupIds
+ })
+ ).toBe(false);
+ });
+
test("a soft policy lets a listed user bypass", () => {
expect(
isSecretAccessBreakGlassEligible({
enforcementLevel: "soft",
+ allowedSelfApprovals: false,
bypassers: [{ type: "user", id: actorUserId }],
actorUserId,
actorGroupIds
@@ -128,6 +182,7 @@ describe("isSecretAccessBreakGlassEligible", () => {
expect(
isSecretAccessBreakGlassEligible({
enforcementLevel: "soft",
+ allowedSelfApprovals: false,
bypassers: [{ type: "group", id: groupId }],
actorUserId,
actorGroupIds
@@ -139,6 +194,7 @@ describe("isSecretAccessBreakGlassEligible", () => {
expect(
isSecretAccessBreakGlassEligible({
enforcementLevel: "soft",
+ allowedSelfApprovals: true,
bypassers: [
{ type: "user", id: "ffffffff-0000-4000-8000-000000000000" },
{ type: "group", id: "eeeeeeee-0000-4000-8000-000000000000" }
diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts
index 869c2205f3..38df6ecab2 100644
--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts
+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts
@@ -15,7 +15,10 @@ import {
EnforcementLevel
} from "../approval-policy-enums";
import { TApprovalRequestGrantsDALFactory } from "../approval-request-dal";
-import { SecretAccessPolicyRequestDataSchema } from "./secret-access-policy-schemas";
+import {
+ SecretAccessPolicyConstraintsSchema,
+ SecretAccessPolicyRequestDataSchema
+} from "./secret-access-policy-schemas";
import { TSecretAccessPolicyConstraints, TSecretAccessRequestData } from "./secret-access-policy-types";
const StoredRequestDataSchema = z.object({ version: z.literal(1), requestData: SecretAccessPolicyRequestDataSchema });
@@ -74,19 +77,37 @@ export const validateSecretAccessConstraints = (
};
};
+const StoredConstraintsSchema = z.object({
+ version: z.literal(1),
+ constraints: SecretAccessPolicyConstraintsSchema
+});
+
+export const getSecretAccessAllowedSelfApprovals = (policy: {
+ allowedSelfApprovals?: boolean;
+ constraints?: unknown;
+}) => {
+ if (typeof policy.allowedSelfApprovals === "boolean") return policy.allowedSelfApprovals;
+
+ const parsed = StoredConstraintsSchema.safeParse(policy.constraints);
+ return parsed.success ? parsed.data.constraints.allowedSelfApprovals : true;
+};
+
export const isSecretAccessBreakGlassEligible = ({
enforcementLevel,
+ allowedSelfApprovals,
bypassers,
actorUserId,
actorGroupIds
}: {
enforcementLevel: string;
+ allowedSelfApprovals: boolean;
bypassers: { type: string; id?: string | null }[];
actorUserId: string;
actorGroupIds: Set<string>;
}) => {
if (enforcementLevel !== EnforcementLevel.Soft) return false;
- if (bypassers.length === 0) return true;
+ // An empty list means everyone, and only the requester can break glass, so that is self-approval.
+ if (bypassers.length === 0) return allowedSelfApprovals;
return bypassers.some((bypasser) => {
if (!bypasser.id) return false;
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
index 284090ab9e..e03c11f861 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
@@ -383,8 +383,9 @@ export const AccessApprovalRequest = ({
const isRequestedByCurrentUser = request.requestedByUserId === user.id;
const isSelfApproveAllowed = request.policy.allowedSelfApprovals;
const userReviewStatus = request.reviewers.find(({ userId }) => userId === user.id)?.status;
- const canBypass =
- !request.policy.bypassers.length || request.policy.bypassers.includes(user.id);
+ const canBypass = request.policy.bypassers.length
+ ? request.policy.bypassers.includes(user.id)
+ : request.policy.allowedSelfApprovals;
let displayData: {
label: string;
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
index 9417afd330..9223f82b78 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
@@ -244,6 +244,7 @@ const Form = ({
const formGroupBypassers = watch("groupBypassers");
const formEnvironments = watch("environments");
const bypasserCount = (formUserBypassers || []).length + (formGroupBypassers || []).length;
+ const allowedSelfApprovals = watch("allowedSelfApprovals");
const handleCreatePolicy = async ({
environments,
@@ -1122,7 +1123,9 @@ const Form = ({
<Alert variant="warning">
<TriangleAlertIcon />
<AlertDescription>
- Not selecting specific users or groups will allow anyone to bypass this policy.
+ {isAccessPolicyType && allowedSelfApprovals === false
+ ? "Self approvals are off, so nobody can bypass this policy until you select bypassers."
+ : "Not selecting specific users or groups will allow anyone to bypass this policy."}
</AlertDescription>
</Alert>
)}