Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
refactor: use the approval-policy-factory so it keeps the same behavior as others permissions
adilsona10563dbf40d
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.tsindex 63e5451625..119f9b68a3 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@@ -17,7 +17,7 @@ const globalPolicyIds: string[] = [];const authHeaders = () => ({ authorization: `Bearer ${jwtAuthToken}` });-const createGlobalPolicy = async (dto: { name: string; secretPath: string }) => {+const createGlobalPolicy = async (dto: { name: string; secretPath: string }, body: Record<string, unknown> = {}) => {const res = await testServer.inject({method: "POST",url: "/api/v1/access-approvals/policies",@@ -29,7 +29,8 @@ const createGlobalPolicy = async (dto: { name: string; secretPath: string }) =>secretPath: dto.secretPath,approvers: [{ type: ApproverType.User, id: seedData1.id }],approvals: 1,- allowedSelfApprovals: true+ allowedSelfApprovals: true,+ ...body}});expect(res.statusCode).toBe(200);@@ -280,6 +281,97 @@ describe("Access approval request lifecycle on the global system", () => {expect(bypassRes.statusCode).toBe(400);expect(bypassRes.json().message).toBe("Break-glass approvals are not supported for this request yet");});++ test("A policy's max time period caps the requested range and survives an update that omits it", async () => {+ const db = getDb();+ const secretPath = "/lifecycle-max-time";+ const policy = await createGlobalPolicy({ name: "lifecycle-max-time", secretPath }, { maxTimePeriod: "1h" });++ const storedPolicy = await db(TableName.ApprovalPolicies).where({ id: policy.id }).first();+ expect(storedPolicy?.maxRequestTtl).toBeNull();+ expect(storedPolicy?.constraints).toEqual(+ expect.objectContaining({ constraints: expect.objectContaining({ maxTimePeriod: "1h" }) })+ );++ const tooLongRes = await createAccessRequest(secretPath, { isTemporary: true, temporaryRange: "2h" });+ expect(tooLongRes.statusCode).toBe(400);+ expect(tooLongRes.json().message).toBe("Requested access time range is limited to 1h by policy");++ const permanentRes = await createAccessRequest(secretPath);+ expect(permanentRes.statusCode).toBe(400);+ expect(permanentRes.json().message).toBe("Requested access time range is limited to 1h by policy");++ const updateRes = await testServer.inject({+ method: "PATCH",+ url: `/api/v1/access-approvals/policies/${policy.id}`,+ headers: authHeaders(),+ body: { name: "lifecycle-max-time-renamed", approvers: [{ type: ApproverType.User, id: seedData1.id }] }+ });+ expect(updateRes.statusCode).toBe(200);++ const getRes = await testServer.inject({+ method: "GET",+ url: `/api/v1/access-approvals/policies/${policy.id}`,+ headers: authHeaders()+ });+ expect(getRes.statusCode).toBe(200);+ expect(getRes.json().approval.maxTimePeriod).toBe("1h");++ const withinRes = await createAccessRequest(secretPath, { isTemporary: true, temporaryRange: "30m" });+ expect(withinRes.statusCode).toBe(200);+ });++ test("Asking again for access the user already holds is rejected", async () => {+ const secretPath = "/lifecycle-active-grant";+ await createApprovedTemporaryRequest(secretPath);++ const repeatRes = await createAccessRequest(secretPath, { isTemporary: true, temporaryRange: "1h" });+ expect(repeatRes.statusCode).toBe(400);+ expect(repeatRes.json().message).toBe("You already have an active privilege with the same criteria");+ });++ test("A request with a range is granted temporary access even when isTemporary is false", async () => {+ const db = getDb();+ const secretPath = "/lifecycle-range-without-flag";+ await createGlobalPolicy({ name: "lifecycle-range-without-flag", secretPath });++ const createRes = await createAccessRequest(secretPath, { isTemporary: false, temporaryRange: "1h" });+ expect(createRes.statusCode).toBe(200);+ const requestId = createRes.json().approval.id as string;++ const reviewRes = await reviewAccessRequest(requestId, { status: "approved" });+ expect(reviewRes.statusCode).toBe(200);++ const grant = await db(TableName.ApprovalRequestGrants).where({ requestId }).first();+ expect(grant?.expiresAt).toBeTruthy();++ const privilege = await db(TableName.AdditionalPrivilege).where({ grantId: grant?.id }).first();+ expect(privilege?.isTemporary).toBe(true);+ expect(privilege?.temporaryRange).toBe("1h");+ expect(privilege?.temporaryAccessEndTime).toBeTruthy();+ });++ test("A temporary request without a range fails only on the approval that would grant it", async () => {+ const db = getDb();+ const secretPath = "/lifecycle-missing-range";+ await createGlobalPolicy({ name: "lifecycle-missing-range", secretPath });++ const createRes = await createAccessRequest(secretPath, { isTemporary: true });+ expect(createRes.statusCode).toBe(200);+ const requestId = createRes.json().approval.id as string;++ const approveRes = await reviewAccessRequest(requestId, { status: "approved" });+ expect(approveRes.statusCode).toBe(400);+ expect(approveRes.json().message).toBe("Temporary range is required for temporary access");++ const request = await db(TableName.ApprovalRequests).where({ id: requestId }).first();+ expect(request?.status).toBe("pending");+ const grants = await db(TableName.ApprovalRequestGrants).where({ requestId });+ expect(grants).toHaveLength(0);++ const rejectRes = await reviewAccessRequest(requestId, { status: "rejected" });+ expect(rejectRes.statusCode).toBe(200);+ });});type TApprover = { userId: string; token: string };diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts b/backend/src/ee/services/access-approval-request/access-approval-request-service.tsindex 187ef60971..310e4ff464 100644--- a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts+++ b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts@@ -16,7 +16,13 @@ import { triggerWorkflowIntegrationNotification } from "@app/lib/workflow-integrimport { TriggerFeature } from "@app/lib/workflow-integrations/types";import { QueueJobs, QueueName, TQueueServiceFactory } from "@app/queue";import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";-import { TApprovalPolicySecretEnvironmentDALFactory } from "@app/services/approval-policy/approval-policy-dal";+import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";+import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";+import { secretAccessPolicyFactory } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";+import {+ TSecretAccessPolicy,+ TSecretAccessPolicyInputs+} from "@app/services/approval-policy/secret-access/secret-access-policy-types";import { ActorType } from "@app/services/auth/auth-type";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/microsoft-teams-service";@@ -72,10 +78,7 @@ type TSecretApprovalRequestServiceFactoryDep = {| "getCount">;accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findOne" | "find" | "findLastValidPolicy">;- approvalPolicySecretEnvironmentDAL: Pick<- TApprovalPolicySecretEnvironmentDALFactory,- "findPolicyByEnvIdsAndSecretPath"- >;+ approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findSecretAccessPolicyByEnvIdAndSecretPath">;secretAccessApprovalBridge: Pick<TSecretAccessApprovalBridgeServiceFactory,| "createAccessApprovalRequest"@@ -103,6 +106,13 @@ type TSecretApprovalRequestServiceFactoryDep = {queueService: Pick<TQueueServiceFactory, "queue">;};+type TApprovalPolicyRouting =+ | { usesGlobalBridge: true; globalPolicy: TSecretAccessPolicy }+ | {+ usesGlobalBridge: false;+ legacyPolicy: Awaited<ReturnType<TAccessApprovalPolicyDALFactory["findLastValidPolicy"]>>;+ };+export const accessApprovalRequestServiceFactory = ({groupDAL,projectDAL,@@ -112,7 +122,7 @@ export const accessApprovalRequestServiceFactory = ({accessApprovalRequestReviewerDAL,accessApprovalPolicyDAL,accessApprovalPolicyApproverDAL,- approvalPolicySecretEnvironmentDAL,+ approvalPolicyDAL,secretAccessApprovalBridge,additionalPrivilegeDAL,smtpService,@@ -124,6 +134,8 @@ export const accessApprovalRequestServiceFactory = ({notificationService,queueService}: TSecretApprovalRequestServiceFactoryDep): TAccessApprovalRequestServiceFactory => {+ const secretAccessPolicy = secretAccessPolicyFactory(ApprovalPolicyType.SecretAccess);+const $queueAccessRequestWebhook = async ({action,accessApprovalRequest,@@ -237,25 +249,16 @@ export const accessApprovalRequestServiceFactory = ({};const $usesGlobalApprovalBridge = async ({- envId,- secretPath- }: {- envId: string;- secretPath: string;- }): Promise<- | { usesGlobalBridge: true; globalPolicy: { id: string; name: string } }- | {- usesGlobalBridge: false;- legacyPolicy: Awaited<ReturnType<TAccessApprovalPolicyDALFactory["findLastValidPolicy"]>>;- }- > => {+ projectId,+ ...inputs+ }: TSecretAccessPolicyInputs & { projectId: string }): Promise<TApprovalPolicyRouting> => {const [legacyPolicy, globalPolicy] = await Promise.all([- accessApprovalPolicyDAL.findLastValidPolicy({ envId, secretPath }),- approvalPolicySecretEnvironmentDAL.findPolicyByEnvIdsAndSecretPath({ envIds: [envId], secretPath })+ accessApprovalPolicyDAL.findLastValidPolicy({ envId: inputs.envId, secretPath: inputs.secretPath }),+ secretAccessPolicy.matchPolicy(approvalPolicyDAL as TApprovalPolicyDALFactory, projectId, inputs)]);if (globalPolicy) {- return { usesGlobalBridge: true, globalPolicy: { id: globalPolicy.policyId, name: globalPolicy.policyName } };+ return { usesGlobalBridge: true, globalPolicy };}return { usesGlobalBridge: false, legacyPolicy };@@ -298,7 +301,13 @@ export const accessApprovalRequestServiceFactory = ({if (!environment) throw new NotFoundError({ message: `Environment with slug '${envSlug}' not found` });- const approvalBridge = await $usesGlobalApprovalBridge({ envId: environment.id, secretPath });+ const approvalBridge = await $usesGlobalApprovalBridge({+ projectId: project.id,+ envId: environment.id,+ secretPath,+ permissions: requestedPermissions,+ isTemporary+ });if (approvalBridge.usesGlobalBridge) {return secretAccessApprovalBridge.createAccessApprovalRequest({@@ -306,6 +315,7 @@ export const accessApprovalRequestServiceFactory = ({projectId: project.id,envId: environment.id,envSlug,+ envName: environment.name,secretPath,requestedByUserId: actorId,actorOrgId,diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 4041fa0da5..9e9d461061 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -2658,7 +2658,7 @@ export const registerRoutes = async (permissionService,accessApprovalRequestReviewerDAL,accessApprovalPolicyDAL,- approvalPolicySecretEnvironmentDAL,+ approvalPolicyDAL,secretAccessApprovalBridge: secretAccessApprovalBridgeService,accessApprovalRequestDAL,projectEnvDAL,diff --git a/backend/src/services/approval-policy/approval-policy-dal.ts b/backend/src/services/approval-policy/approval-policy-dal.tsindex 661222b1cb..5ab1085b9f 100644--- a/backend/src/services/approval-policy/approval-policy-dal.ts+++ b/backend/src/services/approval-policy/approval-policy-dal.ts@@ -3,7 +3,7 @@ import { Knex } from "knex";import { TDbClient } from "@app/db";import { TableName } from "@app/db/schemas";import { DatabaseError } from "@app/lib/errors";-import { ormify } from "@app/lib/knex";+import { ormify, selectAllTableCols } from "@app/lib/knex";import { ApprovalPolicyType, ApproverType } from "./approval-policy-enums";import { ApprovalPolicyStep, PolicyBypasser } from "./approval-policy-types";@@ -208,6 +208,43 @@ export const approvalPolicyDALFactory = (db: TDbClient) => {}};+ const findSecretAccessPolicyByEnvIdAndSecretPath = async ({+ projectId,+ envId,+ secretPath+ }: {+ projectId: string;+ envId: string;+ secretPath: string;+ }) => {+ try {+ const policy = await db+ .replicaNode()(TableName.ApprovalPolicies)+ .join(+ TableName.ApprovalPolicySecretEnvironment,+ `${TableName.ApprovalPolicySecretEnvironment}.policyId`,+ `${TableName.ApprovalPolicies}.id`+ )+ .where(`${TableName.ApprovalPolicies}.type`, ApprovalPolicyType.SecretAccess)+ .where(`${TableName.ApprovalPolicies}.projectId`, projectId)+ .where(`${TableName.ApprovalPolicySecretEnvironment}.envId`, envId)+ .where(`${TableName.ApprovalPolicySecretEnvironment}.secretPath`, secretPath)+ .select(selectAllTableCols(TableName.ApprovalPolicies))+ .first();++ if (!policy) return null;++ const [steps, bypassers] = await Promise.all([+ findStepsByPolicyId(policy.id),+ findBypassersByPolicyId(policy.id)+ ]);++ return { ...policy, steps, bypassers };+ } catch (error) {+ throw new DatabaseError({ error, name: "Find secret access approval policy by environment and secret path" });+ }+ };+/*** Return the list of policies (with name + id) that include the given subject as an approver* on any step. The subject is identified by `userId` OR `groupId` (not both). Used to block@@ -490,6 +527,7 @@ export const approvalPolicyDALFactory = (db: TDbClient) => {findBypassersByPolicyId,findBypassersByPolicyIds,findByProjectId,+ findSecretAccessPolicyByEnvIdAndSecretPath,findPoliciesWhereSubjectIsApprover,isProjectApprover,findScopeIdsWithApprovers,diff --git a/backend/src/services/approval-policy/approval-policy-factory.ts b/backend/src/services/approval-policy/approval-policy-factory.tsindex 7c64d94362..a444338a70 100644--- a/backend/src/services/approval-policy/approval-policy-factory.ts+++ b/backend/src/services/approval-policy/approval-policy-factory.ts@@ -20,6 +20,5 @@ export const APPROVAL_POLICY_FACTORY_MAP: Record<ApprovalPolicyType, TApprovalPo[ApprovalPolicyType.PamAccess]: pamAccessPolicyFactory as TApprovalPolicyFactoryImplementation,[ApprovalPolicyType.CertRequest]: certRequestPolicyFactory as TApprovalPolicyFactoryImplementation,[ApprovalPolicyType.CertCodeSigning]: codeSigningPolicyFactory as TApprovalPolicyFactoryImplementation,- // TODO(adilson): stub while secret access requests stay on the legacy tables; every routine throws[ApprovalPolicyType.SecretAccess]: secretAccessPolicyFactory as TApprovalPolicyFactoryImplementation};diff --git a/backend/src/services/approval-policy/approval-policy-types.ts b/backend/src/services/approval-policy/approval-policy-types.tsindex 1896695797..0dc08fa359 100644--- a/backend/src/services/approval-policy/approval-policy-types.ts+++ b/backend/src/services/approval-policy/approval-policy-types.ts@@ -1,6 +1,7 @@import { Knex } from "knex";import { TApprovalPolicies, TApprovalRequestGrants } from "@app/db/schemas";+import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";import { TApprovalRequestGrantsDALFactory } from "@app/services/approval-policy/approval-request-dal";import { ActorAuthMethod, ActorType } from "@app/services/auth/auth-type";@@ -177,6 +178,7 @@ export type TPostApprovalContext = {};certificateApprovalService?: TCertificateApprovalService;certificateRequestDAL?: Pick<TCertificateRequestDALFactory, "updateById" | "findById">;+ additionalPrivilegeDAL?: Pick<TAdditionalPrivilegeDALFactory, "create">;};export type TApprovalRequestFactoryPostApprovalRoutine<C extends TPostApprovalContext = TPostApprovalContext> = (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.tsindex 4b11222162..b6b25688fc 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,31 +1,109 @@-import { BadRequestError } from "@app/lib/errors";+import { NotFoundError } from "@app/lib/errors";-import { TApprovalResourceFactory } from "../approval-policy-types";-import { TSecretAccessPolicy, TSecretAccessPolicyInputs, TSecretAccessRequestData } from "./secret-access-policy-types";--const unsupported = () =>- new BadRequestError({- message: "Secret access approval requests are not supported on the global approval system yet"- });+import { ApprovalRequestGrantStatus } from "../approval-policy-enums";+import {+ TApprovalRequestFactoryCanAccess,+ TApprovalRequestFactoryMatchPolicy,+ TApprovalRequestFactoryPostApprovalRoutine,+ TApprovalRequestFactoryPostRejectionRoutine,+ TApprovalRequestFactoryValidateConstraints,+ TApprovalResourceFactory+} from "../approval-policy-types";+import {+ createSecretAccessGrantWithPrivilege,+ getSecretAccessRequestData,+ hasSameAccessCriteria,+ validateSecretAccessConstraints+} from "./secret-access-policy-fns";+import { SecretAccessPolicyRequestDataSchema } from "./secret-access-policy-schemas";+import {+ TSecretAccessApprovalContext,+ TSecretAccessPolicy,+ TSecretAccessPolicyInputs,+ TSecretAccessRequestData+} from "./secret-access-policy-types";export const secretAccessPolicyFactory: TApprovalResourceFactory<TSecretAccessPolicyInputs,TSecretAccessPolicy,- TSecretAccessRequestData-> = () => ({- matchPolicy: async () => {- throw unsupported();- },- canAccess: async () => {- throw unsupported();- },- validateConstraints: () => {- throw unsupported();- },- postApprovalRoutine: async () => {- throw unsupported();- },- postRejectionRoutine: async () => {- throw unsupported();- }-});+ TSecretAccessRequestData,+ TSecretAccessApprovalContext+> = (policyType) => {+ const matchPolicy: TApprovalRequestFactoryMatchPolicy<TSecretAccessPolicyInputs, TSecretAccessPolicy> = async (+ approvalPolicyDAL,+ projectId,+ inputs+ ) => {+ const policy = await approvalPolicyDAL.findSecretAccessPolicyByEnvIdAndSecretPath({+ projectId,+ envId: inputs.envId,+ secretPath: inputs.secretPath+ });++ return policy as TSecretAccessPolicy | null;+ };++ const canAccess: TApprovalRequestFactoryCanAccess<TSecretAccessPolicyInputs> = async (+ approvalRequestGrantsDAL,+ projectId,+ userId,+ inputs+ ) => {+ const grants = await approvalRequestGrantsDAL.find({+ granteeUserId: userId,+ type: policyType,+ status: ApprovalRequestGrantStatus.Active,+ projectId,+ revokedAt: null+ });++ const now = new Date();++ return (+ grants.find(+ (grant) =>+ (!grant.expiresAt || new Date(grant.expiresAt) > now) &&+ hasSameAccessCriteria(SecretAccessPolicyRequestDataSchema.safeParse(grant.attributes).data ?? null, inputs)+ ) ?? null+ );+ };++ const validateConstraints: TApprovalRequestFactoryValidateConstraints<+ TSecretAccessPolicy,+ TSecretAccessRequestData+ > = (policy, inputs) => validateSecretAccessConstraints(policy.constraints.constraints, inputs);++ const postApprovalRoutine: TApprovalRequestFactoryPostApprovalRoutine<TSecretAccessApprovalContext> = async (+ approvalRequestGrantsDAL,+ request,+ { additionalPrivilegeDAL, tx }+ ) => {+ const { requesterId } = request;+ if (!requesterId) {+ throw new NotFoundError({ message: "The user who created this access request no longer exists" });+ }++ await createSecretAccessGrantWithPrivilege(+ {+ projectId: request.projectId,+ requestId: request.id,+ granteeUserId: requesterId,+ data: getSecretAccessRequestData(request)+ },+ { approvalRequestGrantsDAL, additionalPrivilegeDAL },+ tx+ );+ };++ const postRejectionRoutine: TApprovalRequestFactoryPostRejectionRoutine<+ TSecretAccessApprovalContext+ > = async () => {};++ return {+ matchPolicy,+ canAccess,+ validateConstraints,+ postApprovalRoutine,+ postRejectionRoutine+ };+};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.tsnew file mode 100644index 0000000000..493af778c6--- /dev/null+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.test.ts@@ -0,0 +1,99 @@+import {+ getSecretAccessGrantWindow,+ hasSameAccessCriteria,+ validateSecretAccessConstraints+} from "./secret-access-policy-fns";+import { TSecretAccessRequestData } from "./secret-access-policy-types";++const storedRequest: TSecretAccessRequestData = {+ envId: "7b8f3a52-91c4-4d0e-9a6b-2f1c5e8d4a73",+ envSlug: "dev",+ secretPath: "/app",+ permissions: [["read", "secrets", { environment: "dev", secretPath: { $glob: "/app" } }]],+ isTemporary: false,+ temporaryRange: null+};++describe("validateSecretAccessConstraints", () => {+ test("accepts any request when the policy has no max time period", () => {+ expect(validateSecretAccessConstraints({ maxTimePeriod: null }, { temporaryRange: null })).toEqual({+ valid: true,+ errors: undefined+ });+ expect(validateSecretAccessConstraints({ maxTimePeriod: null }, { temporaryRange: "30d" }).valid).toBe(true);+ });++ test("rejects a permanent request under a max time period", () => {+ expect(validateSecretAccessConstraints({ maxTimePeriod: "1h" }, { temporaryRange: null })).toEqual({+ valid: false,+ errors: ["Requested access time range is limited to 1h by policy"]+ });+ });++ test("rejects a range longer than the max time period", () => {+ expect(validateSecretAccessConstraints({ maxTimePeriod: "1h" }, { temporaryRange: "2h" })).toEqual({+ valid: false,+ errors: ["Requested access time range is limited to 1h by policy"]+ });+ });++ test("accepts a range up to the max time period", () => {+ expect(validateSecretAccessConstraints({ maxTimePeriod: "1h" }, { temporaryRange: "30m" }).valid).toBe(true);+ expect(validateSecretAccessConstraints({ maxTimePeriod: "1h" }, { temporaryRange: "60m" }).valid).toBe(true);+ });+});++describe("getSecretAccessGrantWindow", () => {+ const now = new Date("2026-10-01T00:00:00.000Z");+ const inOneHour = new Date("2026-10-01T01:00:00.000Z");++ test("a request without a range is permanent", () => {+ expect(getSecretAccessGrantWindow({ isTemporary: false, temporaryRange: null }, now)).toBeNull();+ });++ test("a temporary request expires after its range", () => {+ expect(getSecretAccessGrantWindow({ isTemporary: true, temporaryRange: "1h" }, now)).toEqual({+ temporaryRange: "1h",+ startTime: now,+ endTime: inOneHour+ });+ });++ test("a range makes the access temporary even when isTemporary is false", () => {+ expect(getSecretAccessGrantWindow({ isTemporary: false, temporaryRange: "1h" }, now)).toEqual({+ temporaryRange: "1h",+ startTime: now,+ endTime: inOneHour+ });+ });++ test("a temporary request without a range is rejected", () => {+ expect(() => getSecretAccessGrantWindow({ isTemporary: true, temporaryRange: null }, now)).toThrow(+ "Temporary range is required for temporary access"+ );+ });+});++describe("hasSameAccessCriteria", () => {+ test("ignores key order inside the permission conditions", () => {+ const reordered = [["read", "secrets", { secretPath: { $glob: "/app" }, environment: "dev" }]];++ expect(hasSameAccessCriteria(storedRequest, { permissions: reordered, isTemporary: false })).toBe(true);+ });++ test("a different isTemporary is different criteria", () => {+ expect(hasSameAccessCriteria(storedRequest, { permissions: storedRequest.permissions, isTemporary: true })).toBe(+ false+ );+ });++ test("different permissions are different criteria", () => {+ const otherPath = [["read", "secrets", { environment: "dev", secretPath: { $glob: "/other" } }]];++ expect(hasSameAccessCriteria(storedRequest, { permissions: otherPath, isTemporary: false })).toBe(false);+ });++ test("unreadable stored data never matches", () => {+ expect(hasSameAccessCriteria(null, { permissions: storedRequest.permissions, isTemporary: false })).toBe(false);+ });+});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.tsnew file mode 100644index 0000000000..02a45c3209--- /dev/null+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts@@ -0,0 +1,140 @@+import slugify from "@sindresorhus/slugify";+import { Knex } from "knex";+import { z } from "zod";++import { TemporaryPermissionMode } from "@app/db/schemas";+import { BadRequestError } from "@app/lib/errors";+import { ms } from "@app/lib/ms";+import { alphaNumericNanoId } from "@app/lib/nanoid";+import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";++import { ApprovalPolicyType, ApprovalRequestGrantStatus } from "../approval-policy-enums";+import { TApprovalRequestGrantsDALFactory } from "../approval-request-dal";+import { SecretAccessPolicyRequestDataSchema } from "./secret-access-policy-schemas";+import { TSecretAccessPolicyConstraints, TSecretAccessRequestData } from "./secret-access-policy-types";++const StoredRequestDataSchema = z.object({ version: z.literal(1), requestData: SecretAccessPolicyRequestDataSchema });++export const parseSecretAccessRequestData = (requestData: unknown): TSecretAccessRequestData | null => {+ const parsed = StoredRequestDataSchema.safeParse(requestData);+ return parsed.success ? parsed.data.requestData : null;+};++export const getSecretAccessRequestData = ({ requestData }: { requestData?: unknown }): TSecretAccessRequestData => {+ const data = parseSecretAccessRequestData(requestData);+ if (!data) {+ throw new BadRequestError({ message: "The access request is malformed and cannot be processed" });+ }+ return data;+};++// jsonb does not preserve object key order, so a stored permission set has to be+// compared against the incoming one on a canonical form rather than raw JSON text.+const canonicalize = (value: unknown): unknown => {+ if (Array.isArray(value)) return value.map(canonicalize);+ if (value && typeof value === "object") {+ return Object.fromEntries(+ Object.keys(value as Record<string, unknown>)+ .sort()+ .map((key) => [key, canonicalize((value as Record<string, unknown>)[key])])+ );+ }+ return value;+};++export const hasSameAccessCriteria = (+ data: TSecretAccessRequestData | null,+ criteria: Pick<TSecretAccessRequestData, "permissions" | "isTemporary">+) => {+ if (!data) return false;+ return (+ data.isTemporary === criteria.isTemporary &&+ JSON.stringify(canonicalize(data.permissions)) === JSON.stringify(canonicalize(criteria.permissions))+ );+};++export const validateSecretAccessConstraints = (+ { maxTimePeriod }: Pick<TSecretAccessPolicyConstraints, "maxTimePeriod">,+ { temporaryRange }: Pick<TSecretAccessRequestData, "temporaryRange">+): { valid: boolean; errors?: string[] } => {+ const errors: string[] = [];++ if (maxTimePeriod && (!temporaryRange || ms(temporaryRange) > ms(maxTimePeriod))) {+ errors.push(`Requested access time range is limited to ${maxTimePeriod} by policy`);+ }++ return {+ valid: errors.length === 0,+ errors: errors.length > 0 ? errors : undefined+ };+};++export const getSecretAccessGrantWindow = (+ { isTemporary, temporaryRange }: Pick<TSecretAccessRequestData, "isTemporary" | "temporaryRange">,+ now: Date = new Date()+) => {+ if (isTemporary && !temporaryRange) {+ throw new BadRequestError({ message: "Temporary range is required for temporary access" });+ }+ if (!temporaryRange) return null;++ return {+ temporaryRange,+ startTime: now,+ endTime: new Date(now.getTime() + ms(temporaryRange))+ };+};++type TCreateSecretAccessGrantWithPrivilegeDep = {+ approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "create">;+ additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create">;+};++export const createSecretAccessGrantWithPrivilege = async (+ {+ projectId,+ requestId,+ granteeUserId,+ data+ }: {+ projectId: string;+ requestId: string;+ granteeUserId: string;+ data: TSecretAccessRequestData;+ },+ { approvalRequestGrantsDAL, additionalPrivilegeDAL }: TCreateSecretAccessGrantWithPrivilegeDep,+ tx: Knex+) => {+ const grantWindow = getSecretAccessGrantWindow(data);++ const grant = await approvalRequestGrantsDAL.create(+ {+ projectId,+ requestId,+ granteeUserId,+ status: ApprovalRequestGrantStatus.Active,+ type: ApprovalPolicyType.SecretAccess,+ attributes: data,+ expiresAt: grantWindow?.endTime ?? null+ },+ tx+ );++ await additionalPrivilegeDAL.create(+ {+ actorUserId: granteeUserId,+ projectId,+ name: `requested-privilege-${slugify(alphaNumericNanoId(12))}`,+ permissions: JSON.stringify(data.permissions),+ grantId: grant.id,+ ...(grantWindow && {+ isTemporary: true,+ temporaryMode: TemporaryPermissionMode.Relative,+ temporaryRange: grantWindow.temporaryRange,+ temporaryAccessStartTime: grantWindow.startTime,+ temporaryAccessEndTime: grantWindow.endTime+ })+ },+ tx+ );+};diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-schemas.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-schemas.tsindex 8d80eb380e..bca2e003bb 100644--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-schemas.ts+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-schemas.ts@@ -2,13 +2,12 @@ import { z } from "zod";import { BaseApprovalPolicySchema, BaseApprovalRequestSchema } from "../approval-policy-schemas";-export const SecretAccessPolicyInputsSchema = z.object({});-export const SecretAccessPolicyConditionsSchema = z.object({});export const SecretAccessPolicyConstraintsSchema = z.object({allowedSelfApprovals: z.boolean(),- requestExpirationTime: z.string().nullable()+ requestExpirationTime: z.string().nullable(),+ maxTimePeriod: z.string().nullable().default(null)});export const SecretAccessPolicyRequestDataSchema = z.object({@@ -20,6 +19,13 @@ export const SecretAccessPolicyRequestDataSchema = z.object({temporaryRange: z.string().nullable()});+export const SecretAccessPolicyInputsSchema = SecretAccessPolicyRequestDataSchema.pick({+ envId: true,+ secretPath: true,+ permissions: true,+ isTemporary: true+});+export const SecretAccessPolicySchema = BaseApprovalPolicySchema.extend({conditions: z.object({version: z.literal(1),diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-types.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-types.tsindex aaa9c80762..e815266690 100644--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-types.ts+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-types.ts@@ -1,5 +1,8 @@+import { Knex } from "knex";import { z } from "zod";+import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";+import {SecretAccessPolicyConditionsSchema,SecretAccessPolicyConstraintsSchema,@@ -16,3 +19,8 @@ export type TSecretAccessPolicyConstraints = z.infer<typeof SecretAccessPolicyCoexport type TSecretAccessRequest = z.infer<typeof SecretAccessRequestSchema>;export type TSecretAccessRequestData = z.infer<typeof SecretAccessPolicyRequestDataSchema>;++export type TSecretAccessApprovalContext = {+ additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create">;+ tx: Knex;+};diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-dal.ts b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-dal.tsindex 46cac6dff8..c7a1ee4028 100644--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-dal.ts+++ b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-dal.ts@@ -6,11 +6,7 @@ import { AccessScope, TableName, TUsers } from "@app/db/schemas";import { ApproverType, BypasserType } from "@app/ee/services/access-approval-policy/access-approval-policy-types";import { DatabaseError } from "@app/lib/errors";import { selectAllTableCols, sqlNestRelationships } from "@app/lib/knex";-import {- ApprovalPolicyType,- ApprovalRequestGrantStatus,- ApprovalRequestStatus-} from "@app/services/approval-policy/approval-policy-enums";+import { ApprovalPolicyType, ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";import { SecretAccessPolicyConstraintsSchema } from "@app/services/approval-policy/secret-access/secret-access-policy-schemas";const StoredConstraintsSchema = z.object({ version: z.literal(1), constraints: SecretAccessPolicyConstraintsSchema });@@ -18,7 +14,7 @@ const StoredConstraintsSchema = z.object({ version: z.literal(1), constraints: Sconst parseConstraints = (constraints: unknown) => {const parsed = StoredConstraintsSchema.safeParse(constraints);if (parsed.success) return parsed.data.constraints;- return { allowedSelfApprovals: true, requestExpirationTime: null };+ return { allowedSelfApprovals: true, requestExpirationTime: null, maxTimePeriod: null };};export type TSecretAccessApprovalBridgeDALFactory = ReturnType<typeof secretAccessApprovalBridgeDALFactory>;@@ -91,7 +87,7 @@ export const secretAccessApprovalBridgeDALFactory = (db: TDbClient) => {data: docs,key: "id",parentMapper: (data) => {- const { allowedSelfApprovals, requestExpirationTime } = parseConstraints(data.constraints);+ const { allowedSelfApprovals, requestExpirationTime, maxTimePeriod } = parseConstraints(data.constraints);return {id: data.id,name: data.name,@@ -103,7 +99,7 @@ export const secretAccessApprovalBridgeDALFactory = (db: TDbClient) => {deletedAt: null as Date | null,secretPath: data.secretPath,envId: data.environmentId,- maxTimePeriod: data.maxRequestTtl ?? null,+ maxTimePeriod,allowedSelfApprovals,requestExpirationTime};@@ -193,25 +189,6 @@ export const secretAccessApprovalBridgeDALFactory = (db: TDbClient) => {}};- const findActiveGrants = async ({ projectId, granteeUserId }: { projectId: string; granteeUserId: string }) => {- try {- return await db- .replicaNode()(TableName.ApprovalRequestGrants)- .where({- projectId,- granteeUserId,- type: ApprovalPolicyType.SecretAccess,- status: ApprovalRequestGrantStatus.Active- })- .whereNull("revokedAt")- .where((qb) => {- void qb.whereNull("expiresAt").orWhere("expiresAt", ">", new Date());- });- } catch (error) {- throw new DatabaseError({ error, name: "Find active secret access grants" });- }- };-const findPendingRequests = async ({ policyId, requesterId }: { policyId: string; requesterId: string }) => {try {return await db@@ -330,7 +307,6 @@ export const secretAccessApprovalBridgeDALFactory = (db: TDbClient) => {findSecretAccessPolicies,findSecretAccessRequestById,findSecretAccessRequests,- findActiveGrants,findPendingRequests,findGrantsByRequestIds,findPrivilegesByGrantIds,diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.ts b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.tsindex 3f01ee79d5..7d4bf029c9 100644--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.ts+++ b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-fns.ts@@ -1,5 +1,4 @@import msFn from "ms";-import { z } from "zod";import { TAdditionalPrivileges, TApprovalRequestGrants, TApprovalRequests, TUsers } from "@app/db/schemas";import { TAccessApprovalPolicyDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-dal";@@ -19,7 +18,7 @@ import {} from "@app/services/approval-policy/approval-policy-enums";import { ApprovalPolicyStep } from "@app/services/approval-policy/approval-policy-types";import { resolveStepApproverUserIds } from "@app/services/approval-policy/approval-request-fns";-import { SecretAccessPolicyRequestDataSchema } from "@app/services/approval-policy/secret-access/secret-access-policy-schemas";+import { getSecretAccessRequestData } from "@app/services/approval-policy/secret-access/secret-access-policy-fns";import { TSecretAccessRequestData } from "@app/services/approval-policy/secret-access/secret-access-policy-types";import { NotificationType } from "@app/services/notification/notification-types";import { SmtpTemplates } from "@app/services/smtp/smtp-service";@@ -27,38 +26,6 @@ import { SmtpTemplates } from "@app/services/smtp/smtp-service";import { TSecretAccessApprovalBridgeDALFactory } from "./secret-access-approval-bridge-dal";import { TSecretAccessApprovalBridgeServiceFactoryDep } from "./secret-access-approval-bridge-types";-const StoredRequestDataSchema = z.object({ version: z.literal(1), requestData: SecretAccessPolicyRequestDataSchema });--export const parseSecretAccessRequestData = (requestData: unknown): TSecretAccessRequestData | null => {- const parsed = StoredRequestDataSchema.safeParse(requestData);- return parsed.success ? parsed.data.requestData : null;-};--// jsonb does not preserve object key order, so a stored permission set has to be-// compared against the incoming one on a canonical form rather than raw JSON text.-const canonicalize = (value: unknown): unknown => {- if (Array.isArray(value)) return value.map(canonicalize);- if (value && typeof value === "object") {- return Object.fromEntries(- Object.keys(value as Record<string, unknown>)- .sort()- .map((key) => [key, canonicalize((value as Record<string, unknown>)[key])])- );- }- return value;-};--export const hasSameAccessCriteria = (- data: TSecretAccessRequestData | null,- criteria: { permissions: unknown; isTemporary: boolean }-) => {- if (!data) return false;- return (- data.isTemporary === criteria.isTemporary &&- JSON.stringify(canonicalize(data.permissions)) === JSON.stringify(canonicalize(criteria.permissions))- );-};-type TSecretAccessApprovalPolicyExistsDep = {accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;approvalPolicySecretEnvironmentDAL: Pick<@@ -104,16 +71,6 @@ export type TSecretAccessRequestRow = TApprovalRequests & {privilegeId: string | null;};-export const getSecretAccessRequestData = (- request: Pick<TSecretAccessRequestRow, "requestData">-): TSecretAccessRequestData => {- const data = parseSecretAccessRequestData(request.requestData);- if (!data) {- throw new BadRequestError({ message: "The access request is malformed and cannot be processed" });- }- return data;-};-export const toLegacyAccessApprovalRequest = (request: Pick<TSecretAccessRequestRow,diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.tsindex 578edb9471..4ab830071d 100644--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts+++ b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts@@ -1,8 +1,7 @@import { ForbiddenError, subject } from "@casl/ability";-import slugify from "@sindresorhus/slugify";import { Knex } from "knex";-import { ActionProjectType, ProjectMembershipRole, TemporaryPermissionMode } from "@app/db/schemas";+import { ActionProjectType, ProjectMembershipRole } from "@app/db/schemas";import { approvalPolicyMembershipVerifierFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-fns";import {ApproverType,@@ -31,9 +30,18 @@ import {ApprovalRequestStatus,ApprovalRequestStepStatus} from "@app/services/approval-policy/approval-policy-enums";+import { TApprovalRequest } from "@app/services/approval-policy/approval-policy-types";import { createApprovalRequestWithSteps } from "@app/services/approval-policy/approval-request-fns";-import { SecretAccessPolicyRequestDataSchema } from "@app/services/approval-policy/secret-access/secret-access-policy-schemas";-import { TSecretAccessRequestData } from "@app/services/approval-policy/secret-access/secret-access-policy-types";+import { secretAccessPolicyFactory } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";+import {+ getSecretAccessRequestData,+ hasSameAccessCriteria,+ parseSecretAccessRequestData+} from "@app/services/approval-policy/secret-access/secret-access-policy-fns";+import {+ TSecretAccessPolicy,+ TSecretAccessRequestData+} from "@app/services/approval-policy/secret-access/secret-access-policy-types";import { ActorType } from "@app/services/auth/auth-type";import { AccessRequestWebhookAction, WebhookEvents } from "@app/services/webhook/webhook-types";@@ -42,11 +50,8 @@ import {collectSecretAccessPolicyGroupIds,collectSecretAccessRequestUserIds,composeSecretAccessRequestRows,- getSecretAccessRequestData,- hasSameAccessCriteria,isPolicySubjectMatch,notifySecretAccessStepApprovers,- parseSecretAccessRequestData,secretAccessApprovalPolicyExists,toLegacyAccessApprovalRequest} from "./secret-access-approval-bridge-fns";@@ -104,6 +109,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({queueService}: TSecretAccessApprovalBridgeServiceFactoryDep) => {const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });+ const secretAccessPolicy = secretAccessPolicyFactory(ApprovalPolicyType.SecretAccess);const $splitApprovers = (approvers: TApproverInput) => ({groupApprovers: approvers.filter((approver) => approver.type === ApproverType.Group) as TSequencedSubject[],@@ -386,14 +392,17 @@ export const secretAccessApprovalBridgeServiceFactory = ({type: ApprovalPolicyType.SecretAccess,name,enforcementLevel,- maxRequestTtl: maxTimePeriod ?? null,bypassForMachineIdentities: false,scopeType: null,scopeId: null,conditions: { version: 1, conditions: {} },constraints: {version: 1,- constraints: { allowedSelfApprovals, requestExpirationTime: requestExpirationTime ?? null }+ constraints: {+ allowedSelfApprovals,+ requestExpirationTime: requestExpirationTime ?? null,+ maxTimePeriod: maxTimePeriod ?? null+ }}},tx@@ -421,7 +430,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({deletedAt: null,allowedSelfApprovals,bypassForMachineIdentities: false,- maxTimePeriod: policy.maxRequestTtl ?? null,+ maxTimePeriod: maxTimePeriod ?? null,requestExpirationTime: requestExpirationTime ?? null,environment: envs[0],environments: envs,@@ -499,13 +508,13 @@ export const secretAccessApprovalBridgeServiceFactory = ({{name,enforcementLevel,- maxRequestTtl: maxTimePeriod,constraints: {version: 1,constraints: {allowedSelfApprovals,requestExpirationTime:- requestExpirationTime === undefined ? policy.requestExpirationTime : requestExpirationTime+ requestExpirationTime === undefined ? policy.requestExpirationTime : requestExpirationTime,+ maxTimePeriod: maxTimePeriod === undefined ? policy.maxTimePeriod : maxTimePeriod}}},@@ -686,13 +695,13 @@ export const secretAccessApprovalBridgeServiceFactory = ({project,policy,requestedByUser,- envId,envSlug,+ envName,secretPath}: {request: ReturnType<typeof toLegacyAccessApprovalRequest>;project: { id: string; name: string; orgId: string };- policy: Awaited<ReturnType<typeof $findPolicyById>>;+ policy: TSecretAccessPolicy;requestedByUser: {id: string;firstName?: string | null;@@ -700,8 +709,8 @@ export const secretAccessApprovalBridgeServiceFactory = ({username: string;email?: string | null;};- envId: string;envSlug: string;+ envName: string;secretPath: string;}) => {const { requestedPermissions } = verifyRequestedPermissions({ permissions: request.permissions });@@ -716,7 +725,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({projectId: project.id,projectName: project.name,environment: envSlug,- environmentName: policy.environments.find((env) => env.id === envId)?.name,+ environmentName: envName,secretPath,action: AccessRequestWebhookAction.Created,request: {@@ -728,7 +737,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({id: policy.id,name: policy.name,enforcementLevel: policy.enforcementLevel,- hasSequencedApprovers: policy.approvers.some((approver) => (approver.sequence ?? 1) > 1)+ hasSequencedApprovers: policy.steps.length > 1},requestedAccess: {isTemporary: request.isTemporary,@@ -766,10 +775,11 @@ export const secretAccessApprovalBridgeServiceFactory = ({Boolean(await approvalRequestDAL.findOne({ id: requestId, type: ApprovalPolicyType.SecretAccess }));const createAccessApprovalRequest = async ({- policy: policyRef,+ policy,projectId,envId,envSlug,+ envName,secretPath,requestedByUserId,actorOrgId,@@ -778,40 +788,36 @@ export const secretAccessApprovalBridgeServiceFactory = ({temporaryRange,note}: TCreateSecretAccessApprovalRequestDTO) => {- const policy = await $findPolicyById(- policyRef.id,- `No policy in environment with slug '${envSlug}' and with secret path '${secretPath}' was found.`- );+ const requestData: TSecretAccessRequestData = {+ envId,+ envSlug,+ secretPath,+ permissions,+ isTemporary,+ temporaryRange: temporaryRange || null+ };- if (policy.maxTimePeriod) {- if (!temporaryRange || ms(temporaryRange) > ms(policy.maxTimePeriod)) {- throw new BadRequestError({- message: `Requested access time range is limited to ${policy.maxTimePeriod} by policy`- });- }+ const constraintValidation = secretAccessPolicy.validateConstraints(policy, requestData);+ if (!constraintValidation.valid) {+ throw new BadRequestError({ message: constraintValidation.errors?.join("; ") ?? "Policy constraints not met" });}- const [requestedByUser, project, policySteps] = await Promise.all([+ const [requestedByUser, project] = await Promise.all([userDAL.findById(requestedByUserId),- projectDAL.findById(projectId),- approvalPolicyDAL.findStepsByPolicyId(policy.id)+ projectDAL.findById(projectId)]);if (!requestedByUser) throw new ForbiddenRequestError({ message: "User not found" });if (!project) throw new NotFoundError({ message: `Project with ID '${projectId}' not found` });- if (!policySteps.length) {+ if (!policy.steps.length) {throw new BadRequestError({ message: `Policy '${policy.name}' has no approvers configured` });}- const activeGrants = await secretAccessApprovalBridgeDAL.findActiveGrants({- projectId,- granteeUserId: requestedByUserId+ const activeGrant = await secretAccessPolicy.canAccess(approvalRequestGrantsDAL, projectId, requestedByUserId, {+ envId,+ secretPath,+ permissions,+ isTemporary});- const activeGrant = activeGrants.find((grant) =>- hasSameAccessCriteria(SecretAccessPolicyRequestDataSchema.safeParse(grant.attributes).data ?? null, {- permissions,- isTemporary- })- );if (activeGrant) {throw new BadRequestError({ message: "You already have an active privilege with the same criteria" });}@@ -827,18 +833,10 @@ export const secretAccessApprovalBridgeServiceFactory = ({throw new BadRequestError({ message: "You already have a pending access request with the same criteria" });}- const parsedMs = policy.requestExpirationTime ? ms(policy.requestExpirationTime) : null;+ const { requestExpirationTime } = policy.constraints.constraints;+ const parsedMs = requestExpirationTime ? ms(requestExpirationTime) : null;const expiresAt = parsedMs && !Number.isNaN(parsedMs) ? new Date(Date.now() + parsedMs) : null;- const requestData: TSecretAccessRequestData = {- envId,- envSlug,- secretPath,- permissions,- isTemporary,- temporaryRange: temporaryRange || null- };-const created = await approvalRequestDAL.transaction((tx) =>createApprovalRequestWithSteps({@@ -846,7 +844,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({organizationId: actorOrgId,policyId: policy.id,policyType: ApprovalPolicyType.SecretAccess,- policySteps,+ policySteps: policy.steps,requestData,justification: note || null,expiresAt,@@ -862,7 +860,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({const request = await $findRequestById(created.id);await notifySecretAccessStepApprovers(- { step: policySteps[0], request, project, requestedByUser, data: requestData },+ { step: policy.steps[0], request, project, requestedByUser, data: requestData },{userDAL,userGroupMembershipDAL,@@ -884,8 +882,8 @@ export const secretAccessApprovalBridgeServiceFactory = ({project,policy,requestedByUser,- envId,envSlug,+ envName,secretPath});} catch (error) {@@ -948,9 +946,6 @@ export const secretAccessApprovalBridgeServiceFactory = ({}const data = getSecretAccessRequestData(request);- if (data.isTemporary && !data.temporaryRange) {- throw new BadRequestError({ message: "Temporary range is required for temporary access" });- }const isSelfReview = actorId === request.requesterId;const isApproving = status === ApprovalStatus.APPROVED;@@ -1045,40 +1040,10 @@ export const secretAccessApprovalBridgeServiceFactory = ({}await approvalRequestDAL.updateById(requestId, { status: ApprovalRequestStatus.Approved }, tx);-- const startTime = new Date();- const endTime = data.isTemporary ? new Date(startTime.getTime() + ms(data.temporaryRange!)) : null;-- const grant = await approvalRequestGrantsDAL.create(- {- projectId: request.projectId,- requestId: request.id,- granteeUserId: request.requesterId,- status: ApprovalRequestGrantStatus.Active,- type: ApprovalPolicyType.SecretAccess,- attributes: data,- expiresAt: endTime- },- tx- );-- await additionalPrivilegeDAL.create(- {- actorUserId: request.requesterId,- projectId: request.projectId,- name: `requested-privilege-${slugify(alphaNumericNanoId(12))}`,- permissions: JSON.stringify(data.permissions),- grantId: grant.id,- ...(data.isTemporary && {- isTemporary: true,- temporaryMode: TemporaryPermissionMode.Relative,- temporaryRange: data.temporaryRange!,- temporaryAccessStartTime: startTime,- temporaryAccessEndTime: endTime- })- },+ await secretAccessPolicy.postApprovalRoutine(approvalRequestGrantsDAL, locked as TApprovalRequest, {+ additionalPrivilegeDAL,tx- );+ });return { approval: createdApproval, nextStep: null };});diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.tsindex eab32ab4f2..b5c2e006d2 100644--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts+++ b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts@@ -28,6 +28,7 @@ import {TApprovalRequestStepEligibleApproversDALFactory,TApprovalRequestStepsDALFactory} from "@app/services/approval-policy/approval-request-dal";+import { TSecretAccessPolicy } from "@app/services/approval-policy/secret-access/secret-access-policy-types";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/microsoft-teams-service";import { TProjectMicrosoftTeamsConfigDALFactory } from "@app/services/microsoft-teams/project-microsoft-teams-config-dal";@@ -48,10 +49,7 @@ export type TSecretAccessApprovalBridgeServiceFactoryDep = {groupDAL: Pick<TGroupDALFactory, "find">;userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "findGroupMembershipsByUserIdInOrg">;accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;- approvalPolicyDAL: Pick<- TApprovalPolicyDALFactory,- "create" | "transaction" | "updateById" | "deleteById" | "findStepsByPolicyId"- >;+ approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "create" | "transaction" | "updateById" | "deleteById">;approvalPolicyStepsDAL: Pick<TApprovalPolicyStepsDALFactory, "insertMany" | "delete">;approvalPolicyStepApproversDAL: Pick<TApprovalPolicyStepApproversDALFactory, "insertMany">;approvalPolicyBypassersDAL: Pick<TApprovalPolicyBypassersDALFactory, "insertMany" | "delete">;@@ -66,14 +64,13 @@ export type TSecretAccessApprovalBridgeServiceFactoryDep = {approvalRequestStepsDAL: Pick<TApprovalRequestStepsDALFactory, "create" | "find" | "updateById">;approvalRequestStepEligibleApproversDAL: Pick<TApprovalRequestStepEligibleApproversDALFactory, "create" | "find">;approvalRequestApprovalsDAL: Pick<TApprovalRequestApprovalsDALFactory, "create" | "find">;- approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "create" | "updateById" | "findByIdForUpdate">;+ approvalRequestGrantsDAL: TApprovalRequestGrantsDALFactory;additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create" | "delete">;secretAccessApprovalBridgeDAL: Pick<TSecretAccessApprovalBridgeDALFactory,| "findSecretAccessPolicies"| "findSecretAccessRequestById"| "findSecretAccessRequests"- | "findActiveGrants"| "findPendingRequests"| "findGrantsByRequestIds"| "findPrivilegesByGrantIds"@@ -100,10 +97,11 @@ export type TListSecretAccessApprovalPoliciesDTO = { projectId: string };export type TCountSecretAccessApprovalPoliciesDTO = { projectId: string; envId: string };export type TCreateSecretAccessApprovalRequestDTO = {- policy: { id: string; name: string };+ policy: TSecretAccessPolicy;projectId: string;envId: string;envSlug: string;+ envName: string;secretPath: string;requestedByUserId: string;actorOrgId: string;