Skip to content

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

refactor: add a check on policy exists on the legacy service and also move the find and other things into the fns file

adilsonb6fa8c7a5a67
diff --git a/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.test.ts b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.test.ts
new file mode 100644
index 0000000000..8976d9975d
--- /dev/null
+++ b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.test.ts
@@ -0,0 +1,72 @@
+import { createMongoAbility } from "@casl/ability";
+import { describe, expect, test, vi } from "vitest";
+
+import { conditionsMatcher } from "@app/lib/casl";
+import { EnforcementLevel } from "@app/lib/types";
+import { ActorType } from "@app/services/auth/auth-type";
+
+import { ApproverType } from "../access-approval-policy/access-approval-policy-types";
+import { ProjectPermissionActions, ProjectPermissionSet, ProjectPermissionSub } from "../permission/project-permission";
+import { secretApprovalPolicyServiceFactory } from "./secret-approval-policy-service";
+
+const ORG_ID = "org-1";
+const PROJECT_ID = "project-1";
+const ENV_DEV = { id: "env-dev", name: "Development", slug: "dev", projectId: PROJECT_ID };
+
+const allowCreate = createMongoAbility<ProjectPermissionSet>(
+ [{ action: ProjectPermissionActions.Create, subject: ProjectPermissionSub.SecretApproval }],
+ { conditionsMatcher }
+);
+
+// Only the collaborators the duplicate-policy check reaches; anything else crashes the test if touched.
+const buildService = ({ bridgePolicy }: { bridgePolicy?: { id: string; environments: { id: string }[] } }) => {
+ const deps = {
+ permissionService: { getProjectPermission: vi.fn().mockResolvedValue({ permission: allowCreate }) },
+ licenseService: { getPlan: vi.fn().mockResolvedValue({ secretApproval: true }) },
+ projectEnvDAL: { find: vi.fn().mockResolvedValue([ENV_DEV]) },
+ secretApprovalPolicyDAL: { findPolicyByEnvIdAndSecretPath: vi.fn().mockResolvedValue(undefined) },
+ secretChangePolicyBridgeService: {
+ findSecretChangePolicyBySecretPath: vi.fn().mockResolvedValue(bridgePolicy)
+ }
+ };
+
+ const service = secretApprovalPolicyServiceFactory(
+ deps as unknown as Parameters<typeof secretApprovalPolicyServiceFactory>[0]
+ );
+ return { service, deps };
+};
+
+describe("secretApprovalPolicyService createSecretApprovalPolicy", () => {
+ test("rejects a path and environment already governed by a policy created through the bridge", async () => {
+ const { service, deps } = buildService({
+ bridgePolicy: { id: "bridge-policy-1", environments: [{ id: ENV_DEV.id }] }
+ });
+
+ await expect(
+ service.createSecretApprovalPolicy({
+ actor: ActorType.USER,
+ actorId: "actor-1",
+ actorOrgId: ORG_ID,
+ actorAuthMethod: null,
+ projectId: PROJECT_ID,
+ name: "dev-policy",
+ approvals: 1,
+ approvers: [{ type: ApproverType.User, id: "user-1" }],
+ secretPath: "/",
+ environment: ENV_DEV.slug,
+ enforcementLevel: EnforcementLevel.Hard,
+ allowedSelfApprovals: true,
+ bypassForMachineIdentities: false
+ } as unknown as Parameters<typeof service.createSecretApprovalPolicy>[0])
+ ).rejects.toThrow("A policy for secret path '/' already exists in environment 'dev'");
+
+ expect(deps.secretApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath).toHaveBeenCalledWith({
+ envIds: [ENV_DEV.id],
+ secretPath: "/"
+ });
+ expect(deps.secretChangePolicyBridgeService.findSecretChangePolicyBySecretPath).toHaveBeenCalledWith({
+ envIds: [ENV_DEV.id],
+ secretPath: "/"
+ });
+ });
+});
diff --git a/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.ts b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.ts
index bc478081ba..3b0c5f55bc 100644
--- a/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.ts
+++ b/backend/src/ee/services/secret-approval-policy/secret-approval-policy-service.ts
@@ -62,7 +62,10 @@ type TSecretApprovalPolicyServiceFactoryDep = {
secretApprovalPolicyEnvironmentDAL: TSecretApprovalPolicyEnvironmentDALFactory;
secretChangePolicyBridgeService: Pick<
TSecretChangePolicyBridgeServiceFactory,
- "findSecretChangePolicy" | "updateSecretChangePolicy" | "deleteSecretChangePolicy"
+ | "findSecretChangePolicy"
+ | "findSecretChangePolicyBySecretPath"
+ | "updateSecretChangePolicy"
+ | "deleteSecretChangePolicy"
>;
};
@@ -97,12 +100,13 @@ export const secretApprovalPolicyServiceFactory = ({
if (!envIds && !envId) {
throw new BadRequestError({ message: "At least one environment should be provided" });
}
- const policy = await secretApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath({
- envIds: envId ? [envId] : envIds || [],
- secretPath
- });
+ const policyEnvIds = envId ? [envId] : envIds || [];
+ const policies = await Promise.all([
+ secretApprovalPolicyDAL.findPolicyByEnvIdAndSecretPath({ envIds: policyEnvIds, secretPath }),
+ secretChangePolicyBridgeService.findSecretChangePolicyBySecretPath({ envIds: policyEnvIds, secretPath })
+ ]);
- return policyId ? policy && policy.id !== policyId : Boolean(policy);
+ return policies.some((policy) => policy && policy.id !== policyId);
};
const $useSecretChangePolicyBridge = async (policyId: string) =>
diff --git a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-fns.ts b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-fns.ts
index f61899867d..b581c1ce7c 100644
--- a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-fns.ts
+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-fns.ts
@@ -1,5 +1,9 @@
+import { Knex } from "knex";
+
import { TProjectEnvironments } from "@app/db/schemas";
import { BadRequestError } from "@app/lib/errors";
+import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";
+import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";
import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TUserDALFactory } from "@app/services/user/user-dal";
@@ -10,6 +14,7 @@ import { TCreateSapDTO } from "../secret-approval-policy/secret-approval-policy-
import { TApprovalPolicySecretEnvironmentDALFactory } from "./secret-change-policy-environment-dal";
type TSecretChangePolicyFnsFactoryDep = {
+ approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findOne">;
approvalPolicySecretEnvironmentDAL: Pick<
TApprovalPolicySecretEnvironmentDALFactory,
"findPolicyByEnvIdAndSecretPath"
@@ -20,6 +25,7 @@ type TSecretChangePolicyFnsFactoryDep = {
};
export const secretChangePolicyFnsFactory = ({
+ approvalPolicyDAL,
approvalPolicySecretEnvironmentDAL,
secretApprovalPolicyDAL,
projectDAL,
@@ -27,6 +33,14 @@ export const secretChangePolicyFnsFactory = ({
}: TSecretChangePolicyFnsFactoryDep) => {
const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });
+ const findSecretChangePolicy = (policyId: string, tx?: Knex) =>
+ approvalPolicyDAL.findOne({ id: policyId, type: ApprovalPolicyType.SecretChange }, tx);
+
+ const findSecretChangePolicyBySecretPath = (
+ { envIds, secretPath }: { envIds: string[]; secretPath: string },
+ tx?: Knex
+ ) => approvalPolicySecretEnvironmentDAL.findPolicyByEnvIdAndSecretPath({ envIds, secretPath }, tx);
+
// Policies are being migrated onto the approval system, so a path is taken whether the policy that
// governs it still lives on the legacy secret approval tables or already lives on the new ones.
const assertNoPolicyForSecretPath = async ({
@@ -161,5 +175,12 @@ export const secretChangePolicyFnsFactory = ({
}
};
- return { assertNoPolicyForSecretPath, resolveBypassers, resolveApproverUserIds, verifyPolicyActorsMembership };
+ return {
+ findSecretChangePolicy,
+ findSecretChangePolicyBySecretPath,
+ assertNoPolicyForSecretPath,
+ resolveBypassers,
+ resolveApproverUserIds,
+ verifyPolicyActorsMembership
+ };
};
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.ts
index d22927dbeb..f824129495 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
@@ -1,5 +1,4 @@
import { ForbiddenError } from "@casl/ability";
-import { Knex } from "knex";
import { ActionProjectType, TApprovalPolicies, TProjectEnvironments } from "@app/db/schemas";
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
@@ -58,16 +57,20 @@ export const secretChangePolicyBridgeServiceFactory = ({
permissionService,
licenseService
}: TSecretChangePolicyBridgeServiceFactoryDep) => {
- const { assertNoPolicyForSecretPath, resolveBypassers, resolveApproverUserIds, verifyPolicyActorsMembership } =
- secretChangePolicyFnsFactory({
- approvalPolicySecretEnvironmentDAL,
- secretApprovalPolicyDAL,
- projectDAL,
- userDAL
- });
-
- const findSecretChangePolicy = (policyId: string, tx?: Knex) =>
- approvalPolicyDAL.findOne({ id: policyId, type: ApprovalPolicyType.SecretChange }, tx);
+ const {
+ findSecretChangePolicy,
+ findSecretChangePolicyBySecretPath,
+ assertNoPolicyForSecretPath,
+ resolveBypassers,
+ resolveApproverUserIds,
+ verifyPolicyActorsMembership
+ } = secretChangePolicyFnsFactory({
+ approvalPolicyDAL,
+ approvalPolicySecretEnvironmentDAL,
+ secretApprovalPolicyDAL,
+ projectDAL,
+ userDAL
+ });
const $toSecretChangePolicy = (
policy: TApprovalPolicies,
@@ -255,6 +258,7 @@ export const secretChangePolicyBridgeServiceFactory = ({
return {
findSecretChangePolicy,
+ findSecretChangePolicyBySecretPath,
createSecretChangePolicy,
updateSecretChangePolicy,
deleteSecretChangePolicy,