Skip to content

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

Merge remote-tracking branch 'origin/main' into feat/ENG-5688

Carlos Monastyrskifbadba2cd296
diff --cc backend/src/server/routes/index.ts
index 1823629bd1,1cc0022577..919a560901
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@@ -3777,10 -3632,41 +3656,42 @@@ export const registerRoutes = async
pkiApplicationProfileDAL,
apiEnrollmentConfigDAL,
pkiSyncQueue,
- pkiAlertV2Queue
+ pkiAlertV2Queue,
+ certificateAlertEventEmitter
});
+ const pamAccessApprovalResource = pamAccessApprovalResourceFactory({
+ licenseService,
+ pamFolderNotificationConfigDAL,
+ approvalPolicyDAL,
+ userGroupMembershipDAL,
+ approvalRequestDAL,
+ approvalRequestGrantsDAL,
+ pamAccountDAL,
+ pamAccountTemplateDAL,
+ pamFolderDAL,
+ pamSessionDAL,
+ membershipDAL,
+ membershipRoleDAL,
+ permissionService,
+ userDAL,
+ gatewayV2Service,
+ kmsService
+ });
+
+ const approvalResources: TApprovalResourceRegistry = {
+ [ApprovalPolicyType.PamAccess]: pamAccessApprovalResource as TApprovalResourceRegistry[ApprovalPolicyType],
+ [ApprovalPolicyType.CertRequest]: certRequestApprovalResourceFactory({
+ approvalPolicyDAL,
+ certificateApprovalService,
+ certificateRequestDAL
+ }) as TApprovalResourceRegistry[ApprovalPolicyType],
+ [ApprovalPolicyType.CertCodeSigning]: codeSigningApprovalResourceFactory({
+ approvalPolicyDAL,
+ approvalRequestGrantsDAL
+ }) as TApprovalResourceRegistry[ApprovalPolicyType]
+ };
+
const approvalPolicyService = approvalPolicyServiceFactory({
approvalPolicyDAL,
approvalPolicyStepsDAL,
diff --cc backend/src/services/certificate-v3/certificate-v3-service.ts
index 1fd8abe929,e89088ed00..b0c3244230
--- a/backend/src/services/certificate-v3/certificate-v3-service.ts
+++ b/backend/src/services/certificate-v3/certificate-v3-service.ts
@@@ -183,10 -176,9 +182,10 @@@ type TCertificateV3ServiceFactoryDep =
>;
userDAL: Pick<TUserDALFactory, "findById">;
identityDAL: Pick<TIdentityDALFactory, "findById">;
- approvalPolicyService: Pick<TApprovalPolicyServiceFactory, "createRequestFromPolicy">;
+ approvalPolicyService: Pick<TApprovalPolicyServiceFactory, "createRequestFromPolicy" | "matchPolicy">;
resourceMetadataDAL: Pick<TResourceMetadataDALFactory, "insertMany" | "delete" | "find">;
pkiAlertV2Queue?: Pick<TPkiAlertV2QueueServiceFactory, "queueCertificateEvent">;
+ certificateAlertEventEmitter: Pick<TCertificateAlertEventEmitter, "emit">;
pkiApplicationProfileDAL: Pick<
TPkiApplicationProfileDALFactory,
"findAllByProfileId" | "findOneByApplicationAndProfile"