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
feat: add bridge mechanism for policy
adilson996a26345a34
diff --git a/backend/src/@types/fastify.d.ts b/backend/src/@types/fastify.d.tsindex 9c0efc4678..15bdd6874b 100644--- a/backend/src/@types/fastify.d.ts+++ b/backend/src/@types/fastify.d.ts@@ -69,6 +69,7 @@ import { TSamlConfigServiceFactory } from "@app/ee/services/saml-config/saml-conimport { TScimServiceFactory } from "@app/ee/services/scim/scim-types";import { TSecretApprovalPolicyServiceFactory } from "@app/ee/services/secret-approval-policy/secret-approval-policy-service";import { TSecretApprovalRequestServiceFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-service";+import { TSecretChangePolicyBridgeServiceFactory } from "@app/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service";import { TSecretRotationV2ServiceFactory } from "@app/ee/services/secret-rotation-v2/secret-rotation-v2-service";import { TSecretScanningServiceFactory } from "@app/ee/services/secret-scanning/secret-scanning-service";import { TSecretScanningV2ServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-service";@@ -347,6 +348,7 @@ declare module "fastify" {accessApprovalPolicy: TAccessApprovalPolicyServiceFactory;accessApprovalRequest: TAccessApprovalRequestServiceFactory;secretApprovalPolicy: TSecretApprovalPolicyServiceFactory;+ secretChangePolicyBridge: TSecretChangePolicyBridgeServiceFactory;secretApprovalRequest: TSecretApprovalRequestServiceFactory;saml: TSamlConfigServiceFactory;scim: TScimServiceFactory;diff --git a/backend/src/ee/routes/v2/secret-approval-policy-router.ts b/backend/src/ee/routes/v2/secret-approval-policy-router.tsindex 954f21bdd9..942796614a 100644--- a/backend/src/ee/routes/v2/secret-approval-policy-router.ts+++ b/backend/src/ee/routes/v2/secret-approval-policy-router.ts@@ -68,7 +68,7 @@ export const registerSecretApprovalPolicyRouter = async (server: FastifyZodProvi},onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),handler: async (req) => {- const approval = await server.services.secretApprovalPolicy.createSecretApprovalPolicy({+ const approval = await server.services.secretChangePolicyBridge.createSecretChangePolicy({actor: req.permission.type,actorId: req.permission.id,actorAuthMethod: req.permission.authMethod,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.tsindex c269624dc1..bc478081ba 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@@ -17,6 +17,7 @@ import { ApproverType, BypasserType } from "../access-approval-policy/access-appimport { TLicenseServiceFactory } from "../license/license-service";import { TSecretApprovalRequestDALFactory } from "../secret-approval-request/secret-approval-request-dal";import { RequestState } from "../secret-approval-request/secret-approval-request-types";+import { TSecretChangePolicyBridgeServiceFactory } from "../secret-change-policy-bridge/secret-change-policy-bridge-service";import {TSecretApprovalPolicyApproverDALFactory,TSecretApprovalPolicyBypasserDALFactory@@ -59,6 +60,10 @@ type TSecretApprovalPolicyServiceFactoryDep = {licenseService: Pick<TLicenseServiceFactory, "getPlan">;secretApprovalRequestDAL: Pick<TSecretApprovalRequestDALFactory, "update">;secretApprovalPolicyEnvironmentDAL: TSecretApprovalPolicyEnvironmentDALFactory;+ secretChangePolicyBridgeService: Pick<+ TSecretChangePolicyBridgeServiceFactory,+ "findSecretChangePolicy" | "updateSecretChangePolicy" | "deleteSecretChangePolicy"+ >;};export type TSecretApprovalPolicyServiceFactory = ReturnType<typeof secretApprovalPolicyServiceFactory>;@@ -73,7 +78,8 @@ export const secretApprovalPolicyServiceFactory = ({projectDAL,userDAL,licenseService,- secretApprovalRequestDAL+ secretApprovalRequestDAL,+ secretChangePolicyBridgeService}: TSecretApprovalPolicyServiceFactoryDep) => {const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });@@ -99,6 +105,9 @@ export const secretApprovalPolicyServiceFactory = ({return policyId ? policy && policy.id !== policyId : Boolean(policy);};+ const $useSecretChangePolicyBridge = async (policyId: string) =>+ Boolean(await secretChangePolicyBridgeService.findSecretChangePolicy(policyId));+const createSecretApprovalPolicy = async ({name,actor,@@ -319,22 +328,28 @@ export const secretApprovalPolicyServiceFactory = ({return { ...secretApproval, environments: envs, projectId, environment: envs[0] };};- const updateSecretApprovalPolicy = async ({- approvers,- bypassers,- environments,- secretPath,- name,- actorId,- actor,- actorOrgId,- actorAuthMethod,- approvals,- secretPolicyId,- enforcementLevel,- allowedSelfApprovals,- bypassForMachineIdentities- }: TUpdateSapDTO) => {+ const updateSecretApprovalPolicy = async (dto: TUpdateSapDTO) => {+ if (await $useSecretChangePolicyBridge(dto.secretPolicyId)) {+ return secretChangePolicyBridgeService.updateSecretChangePolicy(dto);+ }++ const {+ approvers,+ bypassers,+ environments,+ secretPath,+ name,+ actorId,+ actor,+ actorOrgId,+ actorAuthMethod,+ approvals,+ secretPolicyId,+ enforcementLevel,+ allowedSelfApprovals,+ bypassForMachineIdentities+ } = dto;+const groupApprovers = approvers?.filter((approver) => approver.type === ApproverType.Group).map((approver) => approver.id)@@ -555,13 +570,13 @@ export const secretApprovalPolicyServiceFactory = ({};};- const deleteSecretApprovalPolicy = async ({- secretPolicyId,- actor,- actorId,- actorAuthMethod,- actorOrgId- }: TDeleteSapDTO) => {+ const deleteSecretApprovalPolicy = async (dto: TDeleteSapDTO) => {+ if (await $useSecretChangePolicyBridge(dto.secretPolicyId)) {+ return secretChangePolicyBridgeService.deleteSecretChangePolicy(dto);+ }++ const { secretPolicyId, actor, actorId, actorAuthMethod, actorOrgId } = dto;+const sapPolicy = await secretApprovalPolicyDAL.findById(secretPolicyId);if (!sapPolicy)throw new NotFoundError({ message: `Secret approval policy with ID '${secretPolicyId}' not found` });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.tsnew file mode 100644index 0000000000..4e8083ec7f--- /dev/null+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service.ts@@ -0,0 +1,66 @@+import { Knex } from "knex";++import { BadRequestError } from "@app/lib/errors";+import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";++import { TSecretChangePolicyBridgeMethods } from "./secret-change-policy-bridge-types";++type TSecretChangePolicyBridgeServiceFactoryDep = {+ approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findById">;+};++export type TSecretChangePolicyBridgeServiceFactory = ReturnType<typeof secretChangePolicyBridgeServiceFactory>;++const notAvailable = () =>+ new BadRequestError({ message: "Secret change policies on the approval system are not available yet." });++export const secretChangePolicyBridgeServiceFactory = ({+ approvalPolicyDAL+}: TSecretChangePolicyBridgeServiceFactoryDep) => {+ const findSecretChangePolicy = (policyId: string, tx?: Knex) => approvalPolicyDAL.findById(policyId, tx);++ const createSecretChangePolicy: TSecretChangePolicyBridgeMethods["createSecretChangePolicy"] = async () => {+ throw notAvailable();+ };++ const updateSecretChangePolicy: TSecretChangePolicyBridgeMethods["updateSecretChangePolicy"] = async () => {+ throw notAvailable();+ };++ const deleteSecretChangePolicy: TSecretChangePolicyBridgeMethods["deleteSecretChangePolicy"] = async () => {+ throw notAvailable();+ };++ const getSecretChangePolicy: TSecretChangePolicyBridgeMethods["getSecretChangePolicy"] = async () => {+ throw notAvailable();+ };++ const getSecretChangePolicyByPaths: TSecretChangePolicyBridgeMethods["getSecretChangePolicyByPaths"] = async () => {+ throw notAvailable();+ };++ const getSecretChangePolicyByProjectId: TSecretChangePolicyBridgeMethods["getSecretChangePolicyByProjectId"] =+ async () => {+ throw notAvailable();+ };++ const getSecretChangePolicyOfFolder: TSecretChangePolicyBridgeMethods["getSecretChangePolicyOfFolder"] = async () => {+ throw notAvailable();+ };++ const getSecretChangePolicyById: TSecretChangePolicyBridgeMethods["getSecretChangePolicyById"] = async () => {+ throw notAvailable();+ };++ return {+ findSecretChangePolicy,+ createSecretChangePolicy,+ updateSecretChangePolicy,+ deleteSecretChangePolicy,+ getSecretChangePolicy,+ getSecretChangePolicyByPaths,+ getSecretChangePolicyByProjectId,+ getSecretChangePolicyOfFolder,+ getSecretChangePolicyById+ };+};diff --git a/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-types.ts b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-types.tsnew file mode 100644index 0000000000..c17fb6a46a--- /dev/null+++ b/backend/src/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-types.ts@@ -0,0 +1,39 @@+import { Knex } from "knex";++import { TProjectEnvironments, TSecretApprovalPolicies } from "@app/db/schemas";++import {+ TCreateSapDTO,+ TDeleteSapDTO,+ TGetBoardSapDTO,+ TGetSapByIdDTO,+ TListSapDTO,+ TUpdateSapDTO+} from "../secret-approval-policy/secret-approval-policy-types";++export type TSecretChangePolicy = TSecretApprovalPolicies & {+ projectId: string;+ environments: TProjectEnvironments[];+ environment: TProjectEnvironments;+};++export type TSecretChangePolicyBridgeMethods = {+ createSecretChangePolicy: (dto: TCreateSapDTO) => Promise<TSecretChangePolicy>;+ updateSecretChangePolicy: (dto: TUpdateSapDTO) => Promise<TSecretChangePolicy>;+ deleteSecretChangePolicy: (dto: TDeleteSapDTO) => Promise<TSecretChangePolicy>;+ getSecretChangePolicy: (+ projectId: string,+ environment: string,+ path: string,+ tx?: Knex+ ) => Promise<TSecretChangePolicy | undefined>;+ getSecretChangePolicyByPaths: (+ projectId: string,+ environment: string,+ secretPaths: string[],+ tx?: Knex+ ) => Promise<Map<string, TSecretChangePolicy>>;+ getSecretChangePolicyByProjectId: (dto: TListSapDTO) => Promise<TSecretChangePolicy[]>;+ getSecretChangePolicyOfFolder: (dto: TGetBoardSapDTO) => Promise<TSecretChangePolicy | undefined>;+ getSecretChangePolicyById: (dto: TGetSapByIdDTO) => Promise<TSecretChangePolicy>;+};diff --git a/backend/src/ee/services/secret-change-policy/secret-change-policy-bridge-service.ts b/backend/src/ee/services/secret-change-policy/secret-change-policy-bridge-service.tsdeleted file mode 100644index e69de29bb2..0000000000diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 919a560901..99ff7c542f 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -201,6 +201,7 @@ import { secretApprovalRequestDALFactory } from "@app/ee/services/secret-approvaimport { secretApprovalRequestReviewerDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-reviewer-dal";import { secretApprovalRequestSecretDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-secret-dal";import { secretApprovalRequestServiceFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-service";+import { secretChangePolicyBridgeServiceFactory } from "@app/ee/services/secret-change-policy-bridge/secret-change-policy-bridge-service";import { secretReplicationServiceFactory } from "@app/ee/services/secret-replication/secret-replication-service";import { secretRotationV2DALFactory } from "@app/ee/services/secret-rotation-v2/secret-rotation-v2-dal";import { secretRotationV2QueueServiceFactory } from "@app/ee/services/secret-rotation-v2/secret-rotation-v2-queue";@@ -1254,6 +1255,8 @@ export const registerRoutes = async (auditLogService});+ const secretChangePolicyBridgeService = secretChangePolicyBridgeServiceFactory({ approvalPolicyDAL });+const secretApprovalPolicyService = secretApprovalPolicyServiceFactory({projectEnvDAL,secretApprovalPolicyApproverDAL: sapApproverDAL,@@ -1264,7 +1267,8 @@ export const registerRoutes = async (licenseService,projectDAL,userDAL,- secretApprovalRequestDAL+ secretApprovalRequestDAL,+ secretChangePolicyBridgeService});// samlService is created after loginService (below) due to dependency on processProviderCallback@@ -4396,6 +4400,7 @@ export const registerRoutes = async (accessApprovalPolicy: accessApprovalPolicyService,accessApprovalRequest: accessApprovalRequestService,secretApprovalPolicy: secretApprovalPolicyService,+ secretChangePolicyBridge: secretChangePolicyBridgeService,secretApprovalRequest: secretApprovalRequestService,dynamicSecret: dynamicSecretService,dynamicSecretLease: dynamicSecretLeaseService,