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
fix: return policyID as nullable (global approval policy behavior)
adilsond41b96d11108
diff --git a/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts b/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.tsindex e3a0817284..c9508c9dcf 100644--- a/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts+++ b/backend/e2e-test/routes/v1/secret-approval-request-bridge.spec.ts@@ -374,4 +374,48 @@ describe("Secret approval request bridge routing", () => {});expect(await db(TableName.SecretApprovalRequest).where({ id: globalRequest.id }).first()).toBeUndefined();});++ test("deleting a policy on the global approval system closes its open requests and keeps them readable", async () => {+ const db = getDb();++ const createRes = await createSecret("SAR_BRIDGE_POLICY_DELETE", "value", GLOBAL_SYSTEM_PATH);+ expect(createRes.statusCode).toBe(200);+ const request: TListedRequest = createRes.json().approval;+ globalSystemRequestIds.push(request.id);++ const deleteRes = await testServer.inject({+ method: "DELETE",+ url: `/api/v2/secret-approvals/${globalSystemPolicyId}`,+ headers: authHeaders()+ });+ expect(deleteRes.statusCode).toBe(200);++ expect(await db(TableName.ApprovalPolicies).where({ id: globalSystemPolicyId }).first()).toBeUndefined();+ expect(+ await db(TableName.ApprovalRequests)+ .whereIn("id", globalSystemRequestIds)+ .where({ status: ApprovalRequestStatus.Open })+ ).toEqual([]);+ expect(await db(TableName.ApprovalRequests).where({ id: request.id }).first()).toMatchObject({+ status: ApprovalRequestStatus.Closed,+ policyId: null+ });++ const closedRes = await listRequests(`&status=${RequestState.Closed}`);+ expect(closedRes.statusCode).toBe(200);+ const closed: { approvals: (TListedRequest & { policyId: string })[] } = closedRes.json();+ expect(closed.approvals.find((row) => row.id === request.id)).toMatchObject({+ policyId: "",+ status: RequestState.Closed,+ policy: { name: "Deleted policy", deletedAt: expect.any(String) as string }+ });++ const detailsRes = await getRequest(request.id);+ expect(detailsRes.statusCode).toBe(200);+ expect(detailsRes.json().approval).toMatchObject({+ policyId: "",+ status: RequestState.Closed,+ policy: { name: "Deleted policy" }+ });+ });});diff --git a/backend/src/ee/routes/v1/secret-approval-request-router.ts b/backend/src/ee/routes/v1/secret-approval-request-router.tsindex 66c0d6ddc3..61e3bb9d28 100644--- a/backend/src/ee/routes/v1/secret-approval-request-router.ts+++ b/backend/src/ee/routes/v1/secret-approval-request-router.ts@@ -48,6 +48,7 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProv200: z.object({approvals: SecretApprovalRequestsSchema.extend({// secretPath: z.string(),+ policyId: z.string().uuid().nullable(),policy: z.object({id: z.string(),name: z.string(),@@ -356,6 +357,7 @@ export const registerSecretApprovalRequestRouter = async (server: FastifyZodProv200: z.object({approval: SecretApprovalRequestsSchema.merge(z.object({+ policyId: z.string().uuid().nullable(),policy: z.object({id: z.string(),name: z.string(),diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-secret-dal.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-secret-dal.tsindex b885f201e3..351f5a1bba 100644--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-secret-dal.ts+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-secret-dal.ts@@ -223,184 +223,185 @@ export const secretApprovalRequestSecretDALFactory = (db: TDbClient) => {}};- const $findBridgeSecretV2 = async (- where: { requestId: string } | { secretChangeId: string },- errorName: string,- tx?: Knex- ) => {- try {- const doc = await (tx || db.replicaNode())({- secVerTag: TableName.SecretTag+ const queryBridgeSecretV2 = (tx?: Knex) =>+ (tx || db.replicaNode())({+ secVerTag: TableName.SecretTag+ })+ .from(TableName.SecretApprovalRequestSecretV2)+ .leftJoin(+ TableName.SecretApprovalRequestSecretTagV2,+ `${TableName.SecretApprovalRequestSecretV2}.id`,+ `${TableName.SecretApprovalRequestSecretTagV2}.secretId`+ )+ .leftJoin(TableName.SecretTag, `${TableName.SecretApprovalRequestSecretTagV2}.tagId`, `${TableName.SecretTag}.id`)+ .leftJoin(TableName.SecretV2, `${TableName.SecretApprovalRequestSecretV2}.secretId`, `${TableName.SecretV2}.id`)+ .leftJoin(+ TableName.SecretVersionV2,+ `${TableName.SecretVersionV2}.id`,+ `${TableName.SecretApprovalRequestSecretV2}.secretVersion`+ )+ .leftJoin(+ TableName.SecretVersionV2Tag,+ `${TableName.SecretVersionV2Tag}.${TableName.SecretVersionV2}Id`,+ `${TableName.SecretVersionV2}.id`+ )+ .leftJoin<TSecretTags>(+ db.ref(TableName.SecretTag).as("secVerTag"),+ `${TableName.SecretVersionV2Tag}.${TableName.SecretTag}Id`,+ db.ref("id").withSchema("secVerTag")+ )+ .leftJoin(TableName.ResourceMetadata, `${TableName.SecretV2}.id`, `${TableName.ResourceMetadata}.secretId`)+ .leftJoin(+ TableName.SecretRotationV2SecretMapping,+ `${TableName.SecretV2}.id`,+ `${TableName.SecretRotationV2SecretMapping}.secretId`+ )+ .select(selectAllTableCols(TableName.SecretApprovalRequestSecretV2))+ .select({+ secVerTagId: "secVerTag.id",+ secVerTagColor: "secVerTag.color",+ secVerTagSlug: "secVerTag.slug"})- .from(TableName.SecretApprovalRequestSecretV2)- .where((qb) => {- if ("requestId" in where) {- void qb.where(`${TableName.SecretApprovalRequestSecretV2}.requestId`, where.requestId);- } else {- void qb.where(`${TableName.SecretApprovalRequestSecretV2}.secretChangeId`, where.secretChangeId);- }- })- .leftJoin(- TableName.SecretApprovalRequestSecretTagV2,- `${TableName.SecretApprovalRequestSecretV2}.id`,- `${TableName.SecretApprovalRequestSecretTagV2}.secretId`- )- .leftJoin(- TableName.SecretTag,- `${TableName.SecretApprovalRequestSecretTagV2}.tagId`,- `${TableName.SecretTag}.id`- )- .leftJoin(TableName.SecretV2, `${TableName.SecretApprovalRequestSecretV2}.secretId`, `${TableName.SecretV2}.id`)- .leftJoin(- TableName.SecretVersionV2,- `${TableName.SecretVersionV2}.id`,- `${TableName.SecretApprovalRequestSecretV2}.secretVersion`- )- .leftJoin(- TableName.SecretVersionV2Tag,- `${TableName.SecretVersionV2Tag}.${TableName.SecretVersionV2}Id`,- `${TableName.SecretVersionV2}.id`- )- .leftJoin<TSecretTags>(- db.ref(TableName.SecretTag).as("secVerTag"),- `${TableName.SecretVersionV2Tag}.${TableName.SecretTag}Id`,- db.ref("id").withSchema("secVerTag")- )- .leftJoin(TableName.ResourceMetadata, `${TableName.SecretV2}.id`, `${TableName.ResourceMetadata}.secretId`)- .leftJoin(- TableName.SecretRotationV2SecretMapping,- `${TableName.SecretV2}.id`,- `${TableName.SecretRotationV2SecretMapping}.secretId`- )- .select(selectAllTableCols(TableName.SecretApprovalRequestSecretV2))- .select({- secVerTagId: "secVerTag.id",- secVerTagColor: "secVerTag.color",- secVerTagSlug: "secVerTag.slug"- })- .select(- db.ref("id").withSchema(TableName.SecretTag).as("tagId"),- db.ref("id").withSchema(TableName.SecretApprovalRequestSecretTagV2).as("tagJnId"),- db.ref("color").withSchema(TableName.SecretTag).as("tagColor"),- db.ref("slug").withSchema(TableName.SecretTag).as("tagSlug")- )- .select(- db.ref("version").withSchema(TableName.SecretV2).as("orgSecVersion"),- db.ref("key").withSchema(TableName.SecretV2).as("orgSecKey"),- db.ref("encryptedValue").withSchema(TableName.SecretV2).as("orgSecValue"),- db.ref("encryptedComment").withSchema(TableName.SecretV2).as("orgSecComment")- )- .select(- db.ref("version").withSchema(TableName.SecretVersionV2).as("secVerVersion"),- db.ref("key").withSchema(TableName.SecretVersionV2).as("secVerKey"),- db.ref("encryptedValue").withSchema(TableName.SecretVersionV2).as("secVerValue"),- db.ref("encryptedComment").withSchema(TableName.SecretVersionV2).as("secVerComment"),- db.ref("skipMultilineEncoding").withSchema(TableName.SecretVersionV2).as("secVerSkipMultilineEncoding")- )- .select(- db.ref("id").withSchema(TableName.ResourceMetadata).as("metadataId"),- db.ref("key").withSchema(TableName.ResourceMetadata).as("metadataKey"),- db.ref("value").withSchema(TableName.ResourceMetadata).as("metadataValue"),- db.ref("encryptedValue").withSchema(TableName.ResourceMetadata).as("metadataEncryptedValue")- )- .select(db.ref("rotationId").withSchema(TableName.SecretRotationV2SecretMapping));- const formatedDoc = sqlNestRelationships({- data: doc,- key: "id",- parentMapper: (data) => SecretApprovalRequestsSecretsV2Schema.omit({ secretVersion: true }).parse(data),- childrenMapper: [- {- key: "tagJnId",- label: "tags" as const,- mapper: ({ tagId: id, tagSlug: slug, tagColor: color }) => ({- id,- name: slug,- slug,- color- })- },- {- key: "secretId",- label: "secret" as const,- mapper: ({ orgSecVersion, orgSecKey, orgSecValue, orgSecComment, secretId, rotationId }) =>- secretId- ? {- id: secretId,- version: orgSecVersion,- key: orgSecKey,- encryptedValue: orgSecValue,- encryptedComment: orgSecComment,- isRotatedSecret: Boolean(rotationId),- rotationId- }- : undefined- },- {- key: "secretVersion",- label: "secretVersion" as const,- mapper: ({- secretVersion,- secVerVersion,- secVerKey,- secVerValue,- secVerComment,- secVerSkipMultilineEncoding- }) =>- secretVersion- ? {- version: secVerVersion,- id: secretVersion,- key: secVerKey,- encryptedValue: secVerValue,- encryptedComment: secVerComment,- skipMultilineEncoding: secVerSkipMultilineEncoding- }- : undefined,- childrenMapper: [- {- key: "secVerTagId",- label: "tags" as const,- mapper: ({ secVerTagId: id, secVerTagSlug: slug, secVerTagColor: color }) => ({- // eslint-disable-next-line- id,- // eslint-disable-next-line- name: slug,- // eslint-disable-next-line- slug,- // eslint-disable-next-line- color- })- }- ]- },- {- key: "metadataId",- label: "oldSecretMetadata" as const,- mapper: ({ metadataKey, metadataEncryptedValue, metadataValue, metadataId }) => ({- id: metadataId,- key: metadataKey,- value: metadataValue,- encryptedValue: metadataEncryptedValue- })- }- ]- });+ .select(+ db.ref("id").withSchema(TableName.SecretTag).as("tagId"),+ db.ref("id").withSchema(TableName.SecretApprovalRequestSecretTagV2).as("tagJnId"),+ db.ref("color").withSchema(TableName.SecretTag).as("tagColor"),+ db.ref("slug").withSchema(TableName.SecretTag).as("tagSlug")+ )+ .select(+ db.ref("version").withSchema(TableName.SecretV2).as("orgSecVersion"),+ db.ref("key").withSchema(TableName.SecretV2).as("orgSecKey"),+ db.ref("encryptedValue").withSchema(TableName.SecretV2).as("orgSecValue"),+ db.ref("encryptedComment").withSchema(TableName.SecretV2).as("orgSecComment")+ )+ .select(+ db.ref("version").withSchema(TableName.SecretVersionV2).as("secVerVersion"),+ db.ref("key").withSchema(TableName.SecretVersionV2).as("secVerKey"),+ db.ref("encryptedValue").withSchema(TableName.SecretVersionV2).as("secVerValue"),+ db.ref("encryptedComment").withSchema(TableName.SecretVersionV2).as("secVerComment"),+ db.ref("skipMultilineEncoding").withSchema(TableName.SecretVersionV2).as("secVerSkipMultilineEncoding")+ )+ .select(+ db.ref("id").withSchema(TableName.ResourceMetadata).as("metadataId"),+ db.ref("key").withSchema(TableName.ResourceMetadata).as("metadataKey"),+ db.ref("value").withSchema(TableName.ResourceMetadata).as("metadataValue"),+ db.ref("encryptedValue").withSchema(TableName.ResourceMetadata).as("metadataEncryptedValue")+ )+ .select(db.ref("rotationId").withSchema(TableName.SecretRotationV2SecretMapping));- return formatedDoc?.map(({ secret, secretVersion, ...el }) => ({- ...el,- secret: secret?.[0],- secretVersion: secretVersion?.[0]- }));+ const formatBridgeSecretV2 = (doc: Awaited<ReturnType<typeof queryBridgeSecretV2>>) => {+ const formatedDoc = sqlNestRelationships({+ data: doc,+ key: "id",+ parentMapper: (data) => SecretApprovalRequestsSecretsV2Schema.omit({ secretVersion: true }).parse(data),+ childrenMapper: [+ {+ key: "tagJnId",+ label: "tags" as const,+ mapper: ({ tagId: id, tagSlug: slug, tagColor: color }) => ({+ id,+ name: slug,+ slug,+ color+ })+ },+ {+ key: "secretId",+ label: "secret" as const,+ mapper: ({ orgSecVersion, orgSecKey, orgSecValue, orgSecComment, secretId, rotationId }) =>+ secretId+ ? {+ id: secretId,+ version: orgSecVersion,+ key: orgSecKey,+ encryptedValue: orgSecValue,+ encryptedComment: orgSecComment,+ isRotatedSecret: Boolean(rotationId),+ rotationId+ }+ : undefined+ },+ {+ key: "secretVersion",+ label: "secretVersion" as const,+ mapper: ({+ secretVersion,+ secVerVersion,+ secVerKey,+ secVerValue,+ secVerComment,+ secVerSkipMultilineEncoding+ }) =>+ secretVersion+ ? {+ version: secVerVersion,+ id: secretVersion,+ key: secVerKey,+ encryptedValue: secVerValue,+ encryptedComment: secVerComment,+ skipMultilineEncoding: secVerSkipMultilineEncoding+ }+ : undefined,+ childrenMapper: [+ {+ key: "secVerTagId",+ label: "tags" as const,+ mapper: ({ secVerTagId: id, secVerTagSlug: slug, secVerTagColor: color }) => ({+ // eslint-disable-next-line+ id,+ // eslint-disable-next-line+ name: slug,+ // eslint-disable-next-line+ slug,+ // eslint-disable-next-line+ color+ })+ }+ ]+ },+ {+ key: "metadataId",+ label: "oldSecretMetadata" as const,+ mapper: ({ metadataKey, metadataEncryptedValue, metadataValue, metadataId }) => ({+ id: metadataId,+ key: metadataKey,+ value: metadataValue,+ encryptedValue: metadataEncryptedValue+ })+ }+ ]+ });++ return formatedDoc?.map(({ secret, secretVersion, ...el }) => ({+ ...el,+ secret: secret?.[0],+ secretVersion: secretVersion?.[0]+ }));+ };++ const findByRequestIdBridgeSecretV2 = async (requestId: string, tx?: Knex) => {+ try {+ const doc = await queryBridgeSecretV2(tx).where(+ `${TableName.SecretApprovalRequestSecretV2}.requestId`,+ requestId+ );+ return formatBridgeSecretV2(doc);} catch (error) {- throw new DatabaseError({ error, name: errorName });+ throw new DatabaseError({ error, name: "FindByRequestIdBridgeSecretV2" });}};- const findByRequestIdBridgeSecretV2 = (requestId: string, tx?: Knex) =>- $findBridgeSecretV2({ requestId }, "FindByRequestIdBridgeSecretV2", tx);-- const findBySecretChangeIdBridgeSecretV2 = (secretChangeId: string, tx?: Knex) =>- $findBridgeSecretV2({ secretChangeId }, "FindBySecretChangeIdBridgeSecretV2", tx);+ const findBySecretChangeIdBridgeSecretV2 = async (secretChangeId: string, tx?: Knex) => {+ try {+ const doc = await queryBridgeSecretV2(tx).where(+ `${TableName.SecretApprovalRequestSecretV2}.secretChangeId`,+ secretChangeId+ );+ return formatBridgeSecretV2(doc);+ } catch (error) {+ throw new DatabaseError({ error, name: "FindBySecretChangeIdBridgeSecretV2" });+ }+ };const findCommitsBySecretChangeIds = async (secretChangeIds: string[], tx?: Knex) => {if (!secretChangeIds.length) return [];diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.test.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.test.tsindex 5f67056782..402dc1d7bc 100644--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-service.test.ts+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-service.test.ts@@ -3,10 +3,26 @@ import { describe, expect, test, vi } from "vitest";import { TSecretApprovalPolicies } from "@app/db/schemas";import { BadRequestError } from "@app/lib/errors";+import { triggerWorkflowIntegrationNotification } from "@app/lib/workflow-integrations/trigger-notification";+import { QueueJobs, QueueName } from "@app/queue";import { ActorType } from "@app/services/auth/auth-type";+import { ChangeRequestWebhookAction, WebhookEvents } from "@app/services/webhook/webhook-types";+import { sendApprovalEmailsFn } from "./secret-approval-request-fns";import { secretApprovalRequestServiceFactory } from "./secret-approval-request-service";+vi.mock("@app/lib/config/env", async (importOriginal) => ({+ ...(await importOriginal<typeof import("@app/lib/config/env")>()),+ getConfig: () => ({ SITE_URL: "https://app.test" })+}));+vi.mock("@app/lib/workflow-integrations/trigger-notification", () => ({+ triggerWorkflowIntegrationNotification: vi.fn().mockResolvedValue(undefined)+}));+vi.mock("./secret-approval-request-fns", async (importOriginal) => ({+ ...(await importOriginal<typeof import("./secret-approval-request-fns")>()),+ sendApprovalEmailsFn: vi.fn().mockResolvedValue(undefined)+}));+const POLICY_ID = "policy-1";const build = () => {@@ -20,7 +36,10 @@ const build = () => {createSecretChangeRequestSideEffects: vi.fn().mockResolvedValue(undefined)};const userDAL = { findById: vi.fn().mockResolvedValue({ id: "user-1", email: "[email protected]" }) };- const projectDAL = { findById: vi.fn().mockResolvedValue(null) };+ const projectDAL = { findById: vi.fn().mockResolvedValue({ id: "project-1", name: "Project", orgId: "org-1" }) };+ const projectEnvDAL = { findOne: vi.fn().mockResolvedValue({ id: "env-1", name: "Development", slug: "dev" }) };+ const queueService = { queue: vi.fn().mockResolvedValue(undefined) };+ const telemetryService = { sendPostHogEvents: vi.fn().mockResolvedValue(undefined) };const service = secretApprovalRequestServiceFactory({permissionService,@@ -28,7 +47,10 @@ const build = () => {secretChangePolicyBridgeService,secretChangeRequestBridgeService,userDAL,- projectDAL+ projectDAL,+ projectEnvDAL,+ queueService,+ telemetryService} as unknown as Parameters<typeof secretApprovalRequestServiceFactory>[0]);return {@@ -37,7 +59,8 @@ const build = () => {secretApprovalRequestDAL,secretChangePolicyBridgeService,secretChangeRequestBridgeService,- projectDAL+ projectDAL,+ queueService};};@@ -95,11 +118,51 @@ describe("createSecretApprovalSideEffects", () => {});test("keeps a legacy request on the legacy path", async () => {- const { service, secretChangeRequestBridgeService, projectDAL } = build();+ const { service, secretApprovalRequestDAL, secretChangeRequestBridgeService, queueService } = build();+ const createdAt = new Date("2026-10-01T00:00:00.000Z");+ secretApprovalRequestDAL.findById.mockResolvedValueOnce({+ id: "request-1",+ slug: "slug-1",+ status: "open",+ hasMerged: false,+ bypassReason: null,+ committerUserId: "user-1",+ committerUser: { firstName: "Alice", lastName: "Smith", username: "alice", email: "[email protected]" },+ policy: { id: POLICY_ID, name: "dev-policy", enforcementLevel: "hard" },+ createdAt,+ updatedAt: createdAt+ });- await expect(service.createSecretApprovalSideEffects(dto)).rejects.toThrow();+ await service.createSecretApprovalSideEffects(dto);expect(secretChangeRequestBridgeService.createSecretChangeRequestSideEffects).not.toHaveBeenCalled();- expect(projectDAL.findById).toHaveBeenCalledWith("project-1");+ expect(triggerWorkflowIntegrationNotification).toHaveBeenCalledWith(+ expect.objectContaining({+ input: {+ projectId: "project-1",+ notification: expect.objectContaining({+ payload: expect.objectContaining({ requestId: "request-1", environment: "Development" }) as object+ }) as object+ }+ })+ );+ expect(sendApprovalEmailsFn).toHaveBeenCalledWith(+ expect.objectContaining({ secretApprovalRequest: dto.secretApprovalRequest, projectId: "project-1" })+ );+ expect(secretApprovalRequestDAL.findById).toHaveBeenCalledWith("request-1", TX);+ expect(queueService.queue).toHaveBeenCalledWith(+ QueueName.SecretWebhook,+ QueueJobs.SecWebhook,+ {+ type: WebhookEvents.ChangeRequestModified,+ payload: expect.objectContaining({+ projectId: "project-1",+ environmentName: "Development",+ action: ChangeRequestWebhookAction.Created,+ request: expect.objectContaining({ id: "request-1", slug: "slug-1" }) as object+ }) as object+ },+ expect.objectContaining({ attempts: 5 })+ );});});diff --git a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.ts b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.tsindex cdeb0cdcb1..67f4fbb33d 100644--- a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.ts+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.test.ts@@ -11,6 +11,7 @@ import { ActorType } from "@app/services/auth/auth-type";import { ApproverType, BypasserType } from "../access-approval-policy/access-approval-policy-types";import { ProjectPermissionActions, ProjectPermissionSet, ProjectPermissionSub } from "../permission/project-permission";+import { RequestState } from "../secret-approval-request/secret-approval-request-types";import { TSecretChangePolicyRow } from "./secret-change-policy-bridge-dal";import { toSecretChangePolicy } from "./secret-change-policy-bridge-fns";import { secretChangePolicyBridgeServiceFactory } from "./secret-change-policy-bridge-service";@@ -123,6 +124,7 @@ const buildService = ({delete: vi.fn().mockResolvedValue([]),findPolicyByEnvIdAndSecretPath: vi.fn().mockResolvedValue(existingPolicy)},+ approvalRequestDAL: { update: vi.fn().mockResolvedValue([]) },secretChangePolicyBridgeDAL: {findSecretChangePolicies: vi.fn<(filter: TFindFilter, tx?: Knex) => Promise<TSecretChangePolicyRow[]>>(({ policyId, projectId, envId, organizationId }) =>@@ -735,6 +737,7 @@ describe("secretChangePolicyBridge deleteSecretChangePolicy", () => {const { service, deps } = buildService({ permission: allowDelete, rows: [] });await expect(remove(service)).rejects.toBeInstanceOf(NotFoundError);+ expect(deps.approvalRequestDAL.update).not.toHaveBeenCalled();expect(deps.approvalPolicyDAL.deleteById).not.toHaveBeenCalled();});@@ -742,16 +745,37 @@ describe("secretChangePolicyBridge deleteSecretChangePolicy", () => {const { service, deps } = buildService({ permission: denyAll });await expect(remove(service)).rejects.toBeInstanceOf(ForbiddenError);+ expect(deps.approvalRequestDAL.update).not.toHaveBeenCalled();expect(deps.approvalPolicyDAL.deleteById).not.toHaveBeenCalled();});- test("hard-deletes the policy and skips the plan check", async () => {+ test("reports a policy deleted before the lock was taken as not found and writes nothing", async () => {+ const { service, deps } = buildService({ permission: allowDelete });+ deps.approvalPolicyDAL.findByIdForUpdate.mockResolvedValueOnce(undefined);++ await expect(remove(service)).rejects.toBeInstanceOf(NotFoundError);+ expect(deps.approvalRequestDAL.update).not.toHaveBeenCalled();+ expect(deps.approvalPolicyDAL.deleteById).not.toHaveBeenCalled();+ });++ test("locks the policy, closes its open requests and hard-deletes it in one transaction, skipping the plan check", async () => {const { service, deps } = buildService({ permission: allowDelete });const policy = await remove(service);expect(deps.licenseService.getPlan).not.toHaveBeenCalled();- expect(deps.approvalPolicyDAL.deleteById).toHaveBeenCalledWith("policy-1");+ expect(deps.approvalPolicyDAL.findByIdForUpdate).toHaveBeenCalledWith("policy-1", TX);+ expect(deps.approvalRequestDAL.update).toHaveBeenCalledWith(+ { policyId: "policy-1", status: RequestState.Open },+ { status: RequestState.Closed },+ TX+ );+ expect(deps.approvalPolicyDAL.deleteById).toHaveBeenCalledWith("policy-1", TX);+ const [lockOrder] = deps.approvalPolicyDAL.findByIdForUpdate.mock.invocationCallOrder;+ const [closeOrder] = deps.approvalRequestDAL.update.mock.invocationCallOrder;+ const [deleteOrder] = deps.approvalPolicyDAL.deleteById.mock.invocationCallOrder;+ expect(lockOrder).toBeLessThan(closeOrder);+ expect(closeOrder).toBeLessThan(deleteOrder);expect(policy).toMatchObject({id: "policy-1",secretPath: "/",diff --git a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.ts b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.tsindex b4e10428d6..49b7d99532 100644--- a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.ts+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.ts@@ -13,6 +13,7 @@ import {TApprovalPolicyStepsDALFactory} from "@app/services/approval-policy/approval-policy-dal";import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";+import { TApprovalRequestDALFactory } from "@app/services/approval-policy/approval-request-dal";import { TProjectDALFactory } from "@app/services/project/project-dal";import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";import { TUserDALFactory } from "@app/services/user/user-dal";@@ -20,6 +21,7 @@ import { TUserDALFactory } from "@app/services/user/user-dal";import { TLicenseServiceFactory } from "../license/license-service";import { TSecretApprovalPolicyDALFactory } from "../secret-approval-policy/secret-approval-policy-dal";import { resolvePolicyForPath } from "../secret-approval-policy/secret-approval-policy-fns";+import { RequestState } from "../secret-approval-request/secret-approval-request-types";import { TSecretChangePolicyBridgeDALFactory } from "./secret-change-policy-bridge-dal";import { secretChangePolicyFnsFactory, splitApprovers, toSecretChangePolicy } from "./secret-change-policy-bridge-fns";import {@@ -41,6 +43,7 @@ type TSecretChangePolicyBridgeServiceFactoryDep = {TApprovalPolicySecretEnvironmentDALFactory,"insertMany" | "delete" | "findPolicyByEnvIdAndSecretPath">;+ approvalRequestDAL: Pick<TApprovalRequestDALFactory, "update">;secretChangePolicyBridgeDAL: Pick<TSecretChangePolicyBridgeDALFactory, "findSecretChangePolicies">;secretApprovalPolicyDAL: Pick<TSecretApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;projectEnvDAL: Pick<TProjectEnvDALFactory, "find" | "findOne">;@@ -58,6 +61,7 @@ export const secretChangePolicyBridgeServiceFactory = ({approvalPolicyStepApproversDAL,approvalPolicyBypassersDAL,approvalPolicySecretEnvironmentDAL,+ approvalRequestDAL,secretChangePolicyBridgeDAL,secretApprovalPolicyDAL,projectEnvDAL,@@ -344,9 +348,18 @@ export const secretChangePolicyBridgeServiceFactory = ({ProjectPermissionSub.SecretApproval);- // Legacy delete closes the policy's open requests. Secret change requests are not created on the- // global approval system yet, so cancelling them moves with the request migration.- await approvalPolicyDAL.deleteById(policy.id);+ await approvalPolicyDAL.transaction(async (tx) => {+ const lockedPolicy = await approvalPolicyDAL.findByIdForUpdate(policy.id, tx);+ if (!lockedPolicy) {+ throw new NotFoundError({ message: `Secret approval policy with ID '${policy.id}' not found` });+ }+ await approvalRequestDAL.update(+ { policyId: policy.id, status: RequestState.Open },+ { status: RequestState.Closed },+ tx+ );+ await approvalPolicyDAL.deleteById(policy.id, tx);+ });return { ...policy, deletedAt: new Date() };};diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.tsindex 9b75c8c51a..74fafcee56 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.test.ts@@ -405,6 +405,7 @@ describe("runSecretChangeRequestSideEffects", () => {expect(deps.userDAL.findById).toHaveBeenCalledWith("user-1", TX);expect(deps.projectEnvDAL.findOne).toHaveBeenCalledWith({ slug: "dev", projectId: "project-1" }, TX);expect(deps.userDAL.find).toHaveBeenCalledWith({ $in: { id: ["user-2", "user-3"] } }, { tx: TX });+ expect(deps.projectDAL.findProjectWithOrg).toHaveBeenCalledWith("project-1", TX);});test("logs a webhook failure instead of throwing when there is no caller transaction", async () => {diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.tsindex a61d48de10..7c7a711852 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-fns.ts@@ -95,7 +95,7 @@ export const toSecretChangeRequestBase = ({secretChangeRequest: TSecretChangeRequests;}): Omit<TSecretChangeRequest, "commits"> => ({id: approvalRequest.id,- policyId: approvalRequest.policyId as string,+ policyId: approvalRequest.policyId ?? "",status: approvalRequest.status,hasMerged: secretChangeRequest.hasMerged,conflicts: secretChangeRequest.conflicts ?? null,@@ -203,7 +203,7 @@ export const secretChangeRequestFnsFactory = ({if (!approverUserIds.length) return;const approvers = await userDAL.find({ $in: { id: approverUserIds } }, { tx });- const project = await projectDAL.findProjectWithOrg(projectId);+ const project = await projectDAL.findProjectWithOrg(projectId, tx);const approvalUrl = buildApprovalUrl(project.orgId, project.id, requestId);await notificationService.createUserNotifications(diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.tsindex 8f2f8c6e92..33022f4446 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.test.ts@@ -1243,6 +1243,7 @@ describe("secretChangeRequestBridge getSecretChangeRequestById", () => {const result = await details(service);expect(deps.secretChangePolicyBridgeService.findSecretChangePolicyById).not.toHaveBeenCalled();+ expect(result.policyId).toBe("");expect(result.policy).toMatchObject({id: "",approvals: 1,@@ -1367,6 +1368,7 @@ describe("secretChangeRequestBridge listSecretChangeRequests and countSecretChanconst result = await service.listSecretChangeRequests(filter);expect(deps.approvalPolicyDAL.findBypassersByPolicyIds).toHaveBeenCalledWith([]);+ expect(result.approvals[0].policyId).toBe("");expect(result.approvals[0].policy).toMatchObject({ id: "", approvals: 1, deletedAt: expect.any(Date) as Date });deps.approvalRequestDAL.findStepsByRequestIds.mockClear();@@ -1485,6 +1487,33 @@ describe("secretChangeRequestBridge createSecretChangeRequest", () => {expect(deps.secretApprovalRequestSecretDAL.insertApprovalSecretV2Tags).not.toHaveBeenCalled();});+ test("keeps the tags of every commit that shares a key, as the legacy system does", async () => {+ const { service, deps } = buildService();+ deps.secretChangePolicyBridgeService.findSecretChangePolicyById.mockResolvedValue({+ ...POLICY,+ projectId: "project-1"+ });++ await service.createSecretChangeRequest(+ {+ ...CREATE_DTO,+ commits: [+ { op: SecretOperations.Delete, key: "KEY", secretId: "secret-1", tagIds: ["tag-1"] },+ { op: SecretOperations.Create, key: "KEY", encryptedValue: Buffer.from("v"), tagIds: ["tag-2"] }+ ]+ } as unknown as Parameters<ReturnType<typeof buildService>["service"]["createSecretChangeRequest"]>[0],+ CALLER_TX+ );++ expect(deps.secretApprovalRequestSecretDAL.insertApprovalSecretV2Tags).toHaveBeenCalledWith(+ [+ { secretId: "commit-0", tagId: "tag-1" },+ { secretId: "commit-0", tagId: "tag-2" }+ ],+ CALLER_TX+ );+ });+test("writes nothing when the policy is gone or has no approval step", async () => {const { service, deps } = buildService({ steps: [] });deps.secretChangePolicyBridgeService.findSecretChangePolicyById.mockResolvedValueOnce(null);diff --git a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.tsindex dded63a92f..dfdd6aa74e 100644--- a/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts+++ b/backend/src/ee/services/secret-change-request-bridge/secret-change-request-bridge-service.ts@@ -446,6 +446,11 @@ export const secretChangeRequestBridgeServiceFactory = ({dto,trx) => {+ const commitTags = dto.commits.reduce<Record<string, string[]>>((acc, { key, tagIds }) => {+ if (tagIds?.length) acc[key] = [...(acc[key] ?? []), ...tagIds];+ return acc;+ }, {});+const write = async (tx: Knex) => {const policy = await secretChangePolicyBridgeService.findSecretChangePolicyById(dto.policy.id, tx);if (!policy) {@@ -465,9 +470,7 @@ export const secretChangeRequestBridgeServiceFactory = ({commitMessage: dto.commitMessage,isReplicated: dto.isReplicated,commits: dto.commits.map(({ tagIds, ...commit }) => commit),- commitTags: Object.fromEntries(- dto.commits.flatMap(({ key, tagIds }) => (tagIds?.length ? [[key, tagIds]] : []))- )+ commitTags},tx);diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 20c80b57cb..14f0990a06 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -840,6 +840,7 @@ export const registerRoutes = async (const approvalPolicyStepApproversDAL = approvalPolicyStepApproversDALFactory(db);const approvalPolicyBypassersDAL = approvalPolicyBypassersDALFactory(db);const approvalPolicySecretEnvironmentDAL = approvalPolicySecretEnvironmentDALFactory(db);+ const approvalRequestDAL = approvalRequestDALFactory(db);const secretChangePolicyBridgeDAL = secretChangePolicyBridgeDALFactory(db);const roleDAL = roleDALFactory(db);const pkiAlertHistoryDAL = pkiAlertHistoryDALFactory(db);@@ -1271,6 +1272,7 @@ export const registerRoutes = async (approvalPolicyStepApproversDAL,approvalPolicyBypassersDAL,approvalPolicySecretEnvironmentDAL,+ approvalRequestDAL,secretChangePolicyBridgeDAL,secretApprovalPolicyDAL,projectEnvDAL,@@ -1839,7 +1841,6 @@ export const registerRoutes = async (const gatewayPoolDAL = gatewayPoolDalFactory(db);const gatewayPoolMembershipDAL = gatewayPoolMembershipDalFactory(db);- const approvalRequestDAL = approvalRequestDALFactory(db);const approvalRequestGrantsDAL = approvalRequestGrantsDALFactory(db);const approvalRequestStepsDAL = approvalRequestStepsDALFactory(db);const approvalRequestStepEligibleApproversDAL = approvalRequestStepEligibleApproversDALFactory(db);diff --git a/backend/src/services/project/project-dal.ts b/backend/src/services/project/project-dal.tsindex 3bcf630acf..a80b564fb6 100644--- a/backend/src/services/project/project-dal.ts+++ b/backend/src/services/project/project-dal.ts@@ -779,10 +779,10 @@ export const projectDALFactory = (db: TDbClient) => {}};- const findProjectWithOrg = async (projectId: string) => {+ const findProjectWithOrg = async (projectId: string, tx?: Knex) => {// we just need the project, and we need to include a new .organization field that includes the org from the orgId reference- const project = await db(TableName.Project)+ const project = await (tx || db)(TableName.Project).where({ [`${TableName.Project}.id` as "id"]: projectId }).whereNull(`${TableName.Project}.deleteAfter`).join(TableName.Organization, `${TableName.Organization}.id`, `${TableName.Project}.orgId`)