Skip to content

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

feat: add a check to make sure the project is version 3

adilsonb3dc2b545416
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.ts
index 4084c4c138..cdeb0cdcb1 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
@@ -2,8 +2,9 @@ import { createMongoAbility, ForbiddenError } from "@casl/ability";
import { Knex } from "knex";
import { describe, expect, test, vi } from "vitest";
+import { ProjectVersion } from "@app/db/schemas";
import { conditionsMatcher } from "@app/lib/casl";
-import { NotFoundError } from "@app/lib/errors";
+import { BadRequestError, NotFoundError } from "@app/lib/errors";
import { EnforcementLevel } from "@app/lib/types";
import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";
import { ActorType } from "@app/services/auth/auth-type";
@@ -76,6 +77,7 @@ type TFindFilter = { policyId?: string; projectId?: string; envId?: string; orga
const buildService = ({
permission = allowCreate,
plan = { secretApproval: true },
+ project = { id: PROJECT_ID, version: ProjectVersion.V3 } as { id: string; version: ProjectVersion } | null,
envs = [ENV_DEV, ENV_PROD],
users = [] as { id: string; username: string }[],
existingPolicy = undefined as TExistingPolicy | undefined,
@@ -144,7 +146,7 @@ const buildService = ({
Promise.resolve(envs.find((env) => env.slug === slug && env.projectId === projectId))
)
},
- projectDAL: { findEffectiveProjectSubjectsMembership },
+ projectDAL: { findById: vi.fn().mockResolvedValue(project), findEffectiveProjectSubjectsMembership },
userDAL: {
find: vi.fn(({ $in }: { $in: { username: string[] } }) =>
Promise.resolve(users.filter((user) => $in.username.includes(user.username)))
@@ -243,6 +245,26 @@ describe("secretChangePolicyBridge createSecretChangePolicy", () => {
expect(deps.approvalPolicyDAL.transaction).not.toHaveBeenCalled();
});
+ test("rejects a project that has not been upgraded to the latest secrets version", async () => {
+ const { service, deps } = buildService({ project: { id: PROJECT_ID, version: ProjectVersion.V2 } });
+
+ const result = create(service);
+ await expect(result).rejects.toBeInstanceOf(BadRequestError);
+ await expect(result).rejects.toThrow("upgraded to the latest secrets version");
+ expect(deps.projectDAL.findById).toHaveBeenCalledWith(PROJECT_ID);
+ expect(deps.licenseService.getPlan).not.toHaveBeenCalled();
+ expect(deps.approvalPolicyDAL.transaction).not.toHaveBeenCalled();
+ });
+
+ test("reports a missing project as not found", async () => {
+ const { service, deps } = buildService({ project: null });
+
+ const result = create(service);
+ await expect(result).rejects.toBeInstanceOf(NotFoundError);
+ await expect(result).rejects.toThrow(`Project with ID '${PROJECT_ID}' not found`);
+ expect(deps.approvalPolicyDAL.transaction).not.toHaveBeenCalled();
+ });
+
test("rejects when no environment is provided", async () => {
const { service } = buildService();
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 8c8f3fed1b..b4e10428d6 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,7 +1,7 @@
import { ForbiddenError } from "@casl/ability";
import { Knex } from "knex";
-import { ActionProjectType } from "@app/db/schemas";
+import { ActionProjectType, ProjectVersion } from "@app/db/schemas";
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";
import { BadRequestError, NotFoundError } from "@app/lib/errors";
@@ -44,7 +44,7 @@ type TSecretChangePolicyBridgeServiceFactoryDep = {
secretChangePolicyBridgeDAL: Pick<TSecretChangePolicyBridgeDALFactory, "findSecretChangePolicies">;
secretApprovalPolicyDAL: Pick<TSecretApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;
projectEnvDAL: Pick<TProjectEnvDALFactory, "find" | "findOne">;
- projectDAL: Pick<TProjectDALFactory, "findEffectiveProjectSubjectsMembership">;
+ projectDAL: Pick<TProjectDALFactory, "findById" | "findEffectiveProjectSubjectsMembership">;
userDAL: Pick<TUserDALFactory, "find">;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
licenseService: Pick<TLicenseServiceFactory, "getPlan">;
@@ -146,6 +146,17 @@ export const secretChangePolicyBridgeServiceFactory = ({
ProjectPermissionSub.SecretApproval
);
+ const project = await projectDAL.findById(projectId);
+ if (!project) {
+ throw new NotFoundError({ message: `Project with ID '${projectId}' not found` });
+ }
+ if (project.version !== ProjectVersion.V3) {
+ throw new BadRequestError({
+ message:
+ "Secret approval policies on the new approval system are only supported on projects that have been upgraded to the latest secrets version. Upgrade the project before creating one."
+ });
+ }
+
const plan = await licenseService.getPlan(actorOrgId);
if (!plan.secretApproval) {
throw new BadRequestError({