Skip to content

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

Merge branch 'main' into feat/adilsitos/secrets-723

adilson7d75e5010f7f
diff --cc backend/e2e-test/testUtils/secret-approval-policies.ts
index c0d819b921,cb9216b5f3..6925dca84b
--- a/backend/e2e-test/testUtils/secret-approval-policies.ts
+++ b/backend/e2e-test/testUtils/secret-approval-policies.ts
@@@ -1,28 -1,32 +1,60 @@@
+import { Knex } from "knex";
+
+import { TableName } from "@app/db/schemas";
+ import { ApproverType } from "@app/ee/services/access-approval-policy/access-approval-policy-types";
+import { EnforcementLevel } from "@app/lib/types";
+ import { request } from "./request";
+
+// The API puts every new policy on a V3 project on the global approval system, so a policy on the legacy
+// approval system can only be seeded directly.
+export const seedLegacySecretApprovalPolicy = async (
+ db: Knex,
+ dto: { projectId: string; environment: string; secretPath: string; name: string; approverUserId: string }
+) => {
+ const env = await db(TableName.Environment).where({ projectId: dto.projectId, slug: dto.environment }).first();
+ if (!env) throw new Error(`environment '${dto.environment}' not found in project ${dto.projectId}`);
+
+ const [policy] = await db(TableName.SecretApprovalPolicy)
+ .insert({
+ name: dto.name,
+ secretPath: dto.secretPath,
+ approvals: 1,
+ envId: env.id,
+ enforcementLevel: EnforcementLevel.Hard,
+ bypassForMachineIdentities: false
+ })
+ .returning("*");
+ await db(TableName.SecretApprovalPolicyEnvironment).insert({ policyId: policy.id, envId: env.id });
+ await db(TableName.SecretApprovalPolicyApprover).insert({ policyId: policy.id, approverUserId: dto.approverUserId });
+ return policy;
+};
++
+ // Reviewers that must sign off before a secret change in a path takes effect. One user approver and
+ // one required approval is enough to make a write wait on a request.
+ export const createSecretApprovalPolicy = (dto: {
+ projectId: string;
+ environmentSlug: string;
+ secretPath: string;
+ approverUserIds: string[];
+ authToken: string;
+ }) =>
+ request(
+ {
+ method: "POST",
+ url: "/api/v1/secret-approvals",
+ headers: { authorization: `Bearer ${dto.authToken}` },
+ body: {
+ workspaceId: dto.projectId,
+ environment: dto.environmentSlug,
+ name: `policy${dto.secretPath.replaceAll("/", "-")}`,
+ secretPath: dto.secretPath,
+ approvers: dto.approverUserIds.map((id) => ({ type: ApproverType.User, id })),
+ approvals: 1
+ }
+ },
+ (res) => {
+ expect(res.statusCode).toBe(200);
+ return res.json<{ approval: { id: string } }>().approval;
+ }
+ );
diff --cc backend/src/services/secret-folder/secret-folder-service.ts
index bc0b758023,6a649fe473..26ddaf4e0b
--- a/backend/src/services/secret-folder/secret-folder-service.ts
+++ b/backend/src/services/secret-folder/secret-folder-service.ts
@@@ -2020,9 -1999,9 +2017,8 @@@ export const secretFolderServiceFactor
resourceMetadataDAL,
folderCommitService,
secretApprovalPolicyService,
- secretApprovalRequestDAL,
- secretApprovalRequestSecretDAL,
+ secretApprovalRequestCreationFns,
secretQueueService,
- reminderDAL,
reminderService,
secretValidationRuleService
})
diff --cc backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
index 44a914b5e9,b25d441f06..7aea0a997e
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
@@@ -1628,9 -1622,9 +1621,8 @@@ export const fnSecretMove = async (dto
resourceMetadataDAL,
folderCommitService,
secretApprovalPolicyService,
- secretApprovalRequestDAL,
- secretApprovalRequestSecretDAL,
+ secretApprovalRequestCreationFns,
secretQueueService,
- reminderDAL,
reminderService,
secretValidationRuleService
} = dto;
diff --cc backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
index 1cf63678f7,516ae1a13a..99cc959085
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
@@@ -3264,9 -3272,9 +3269,8 @@@ export const secretV2BridgeServiceFacto
resourceMetadataDAL,
folderCommitService,
secretApprovalPolicyService,
- secretApprovalRequestDAL,
- secretApprovalRequestSecretDAL,
+ secretApprovalRequestCreationFns,
secretQueueService,
- reminderDAL,
reminderService,
secretValidationRuleService
})
diff --cc backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts
index 918d9f47c6,0412dd5741..14606fbf49
--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts
+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-types.ts
@@@ -307,13 -307,13 +306,12 @@@ export type TFnSecretMove =
resourceMetadataDAL: Pick<TResourceMetadataDALFactory, "insertMany" | "delete">;
folderCommitService: Pick<TFolderCommitServiceFactory, "createCommit">;
secretApprovalPolicyService: Pick<TSecretApprovalPolicyServiceFactory, "getSecretApprovalPolicy">;
- secretApprovalRequestDAL: Pick<TSecretApprovalRequestDALFactory, "create">;
- secretApprovalRequestSecretDAL: Pick<
- TSecretApprovalRequestSecretDALFactory,
- "insertV2Bridge" | "insertApprovalSecretV2Tags"
+ secretApprovalRequestCreationFns: Pick<
+ TSecretApprovalRequestCreationFnsFactory,
+ "createSecretApprovalRequestV2Bridge"
>;
secretQueueService: Pick<TSecretQueueFactory, "syncSecrets">;
- reminderDAL: Pick<TReminderDALFactory, "findSecretReminders" | "delete">;
- reminderService: Pick<TReminderServiceFactory, "batchCreateReminders">;
+ reminderService: Pick<TReminderServiceFactory, "moveReminders" | "copyReminders">;
secretValidationRuleService: Pick<TSecretValidationRuleServiceFactory, "validateSecrets">;
};