Skip to content

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

fix merge conflicts

adilsonb88d2cd293fa
diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
index 310e4ff464..308e16a667 100644
--- a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
+++ b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
@@ -16,9 +16,7 @@ import { triggerWorkflowIntegrationNotification } from "@app/lib/workflow-integr
import { TriggerFeature } from "@app/lib/workflow-integrations/types";
import { QueueJobs, QueueName, TQueueServiceFactory } from "@app/queue";
import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
-import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";
-import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";
-import { secretAccessPolicyFactory } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";
+import { TSecretAccessApprovalResource } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";
import {
TSecretAccessPolicy,
TSecretAccessPolicyInputs
@@ -78,7 +76,7 @@ type TSecretApprovalRequestServiceFactoryDep = {
| "getCount"
>;
accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findOne" | "find" | "findLastValidPolicy">;
- approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findSecretAccessPolicyByEnvIdAndSecretPath">;
+ secretAccessApprovalResource: Pick<TSecretAccessApprovalResource, "matchPolicy">;
secretAccessApprovalBridge: Pick<
TSecretAccessApprovalBridgeServiceFactory,
| "createAccessApprovalRequest"
@@ -122,7 +120,7 @@ export const accessApprovalRequestServiceFactory = ({
accessApprovalRequestReviewerDAL,
accessApprovalPolicyDAL,
accessApprovalPolicyApproverDAL,
- approvalPolicyDAL,
+ secretAccessApprovalResource,
secretAccessApprovalBridge,
additionalPrivilegeDAL,
smtpService,
@@ -134,8 +132,6 @@ export const accessApprovalRequestServiceFactory = ({
notificationService,
queueService
}: TSecretApprovalRequestServiceFactoryDep): TAccessApprovalRequestServiceFactory => {
- const secretAccessPolicy = secretAccessPolicyFactory(ApprovalPolicyType.SecretAccess);
-
const $queueAccessRequestWebhook = async ({
action,
accessApprovalRequest,
@@ -254,7 +250,7 @@ export const accessApprovalRequestServiceFactory = ({
}: TSecretAccessPolicyInputs & { projectId: string }): Promise<TApprovalPolicyRouting> => {
const [legacyPolicy, globalPolicy] = await Promise.all([
accessApprovalPolicyDAL.findLastValidPolicy({ envId: inputs.envId, secretPath: inputs.secretPath }),
- secretAccessPolicy.matchPolicy(approvalPolicyDAL as TApprovalPolicyDALFactory, projectId, inputs)
+ secretAccessApprovalResource.matchPolicy(projectId, inputs)
]);
if (globalPolicy) {
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index 3f698ec774..16128d5982 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -278,6 +278,7 @@ import {
} from "@app/services/approval-policy/approval-request-dal";
import { certRequestApprovalResourceFactory } from "@app/services/approval-policy/cert-request/cert-request-policy-factory";
import { codeSigningApprovalResourceFactory } from "@app/services/approval-policy/code-signing/code-signing-policy-factory";
+import { secretAccessApprovalResourceFactory } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";
import { authDALFactory } from "@app/services/auth/auth-dal";
import { authLoginServiceFactory } from "@app/services/auth/auth-login-service";
import { authPaswordServiceFactory } from "@app/services/auth/auth-password-service";
@@ -2467,6 +2468,12 @@ export const registerRoutes = async (
licenseService
});
+ const secretAccessApprovalResource = secretAccessApprovalResourceFactory({
+ approvalPolicyDAL,
+ approvalRequestGrantsDAL,
+ additionalPrivilegeDAL
+ });
+
const secretAccessApprovalBridgeService = secretAccessApprovalBridgeServiceFactory({
projectDAL,
permissionService,
@@ -2493,7 +2500,8 @@ export const registerRoutes = async (
projectSlackConfigDAL,
microsoftTeamsService,
projectMicrosoftTeamsConfigDAL,
- queueService
+ queueService,
+ secretAccessApprovalResource
});
const accessApprovalPolicyService = accessApprovalPolicyServiceFactory({
@@ -2519,7 +2527,7 @@ export const registerRoutes = async (
permissionService,
accessApprovalRequestReviewerDAL,
accessApprovalPolicyDAL,
- approvalPolicyDAL,
+ secretAccessApprovalResource,
secretAccessApprovalBridge: secretAccessApprovalBridgeService,
accessApprovalRequestDAL,
projectEnvDAL,
diff --git a/backend/src/services/approval-policy/approval-policy-types.ts b/backend/src/services/approval-policy/approval-policy-types.ts
index 4897e9ec25..24c73ea822 100644
--- a/backend/src/services/approval-policy/approval-policy-types.ts
+++ b/backend/src/services/approval-policy/approval-policy-types.ts
@@ -1,12 +1,5 @@
import { Knex } from "knex";
-import { TApprovalPolicies, TApprovalRequestGrants } from "@app/db/schemas";
-import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
-import { TApprovalPolicyDALFactory } from "@app/services/approval-policy/approval-policy-dal";
-import { TApprovalRequestGrantsDALFactory } from "@app/services/approval-policy/approval-request-dal";
-import { ActorAuthMethod, ActorType } from "@app/services/auth/auth-type";
-import { TCertificateRequestDALFactory } from "@app/services/certificate-request/certificate-request-dal";
-import { TCertificateApprovalService } from "@app/services/certificate-v3/certificate-approval-fns";
import { TApprovalPolicies, TApprovalRequestGrants, TApprovalRequests } from "@app/db/schemas";
import { Event } from "@app/ee/services/audit-log/audit-log-types";
import { ResourcePermissionApprovalPolicyActions } from "@app/ee/services/permission/resource-permission";
@@ -58,18 +51,16 @@ import {
TSecretAccessRequestData
} from "./secret-access/secret-access-policy-types";
+export type TApprovalActor = Pick<OrgServiceActor, "id" | "type" | "authMethod" | "orgId">;
+
+export type TApprovalSubjectActor = Pick<TApprovalActor, "id" | "type">;
+
export type TApprovalPolicy = TPamAccessPolicy | TCertRequestPolicy | TCodeSigningPolicy | TSecretAccessPolicy;
export type TApprovalPolicyInputs =
| TPamAccessPolicyInputs
| TCertRequestPolicyInputs
| TCodeSigningPolicyInputs
| TSecretAccessPolicyInputs;
-export type TApprovalActor = Pick<OrgServiceActor, "id" | "type" | "authMethod" | "orgId">;
-
-export type TApprovalSubjectActor = Pick<TApprovalActor, "id" | "type">;
-
-export type TApprovalPolicy = TPamAccessPolicy | TCertRequestPolicy | TCodeSigningPolicy;
-export type TApprovalPolicyInputs = TPamAccessPolicyInputs | TCertRequestPolicyInputs | TCodeSigningPolicyInputs;
export type TApprovalPolicyConditions =
| TPamAccessPolicyConditions
| TCertRequestPolicyConditions
@@ -175,33 +166,6 @@ export interface TCreateRequestFromPolicyDTO {
tx?: Knex;
}
-// Factory
-export type TApprovalRequestFactoryMatchPolicy<I extends TApprovalPolicyInputs, P extends TApprovalPolicy> = (
- approvalPolicyDAL: TApprovalPolicyDALFactory,
- projectId: string,
- inputs: I
-) => Promise<P | null>;
-export type TApprovalRequestFactoryCanAccess<I extends TApprovalPolicyInputs> = (
- approvalRequestGrantsDAL: TApprovalRequestGrantsDALFactory,
- projectId: string,
- userId: string,
- inputs: I
-) => Promise<TApprovalRequestGrants | null>;
-export type TApprovalRequestFactoryValidateConstraints<P extends TApprovalPolicy, R extends TApprovalRequestData> = (
- policy: P,
- inputs: R
-) => { valid: boolean; errors?: string[] };
-
-export type TPostApprovalContext = {
- actor?: {
- type: ActorType;
- id: string;
- authMethod: ActorAuthMethod;
- orgId: string;
- };
- certificateApprovalService?: TCertificateApprovalService;
- certificateRequestDAL?: Pick<TCertificateRequestDALFactory, "updateById" | "findById">;
- additionalPrivilegeDAL?: Pick<TAdditionalPrivilegeDALFactory, "create">;
export type TApprovalNotification = {
inApp?: { type: NotificationType; title: string; body: string; link?: string };
email?: { subjectLine: string; template: SmtpTemplates; substitutions: Record<string, unknown> };
diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts
index b6b25688fc..342730054d 100644
--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts
+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts
@@ -1,14 +1,10 @@
import { NotFoundError } from "@app/lib/errors";
+import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
-import { ApprovalRequestGrantStatus } from "../approval-policy-enums";
-import {
- TApprovalRequestFactoryCanAccess,
- TApprovalRequestFactoryMatchPolicy,
- TApprovalRequestFactoryPostApprovalRoutine,
- TApprovalRequestFactoryPostRejectionRoutine,
- TApprovalRequestFactoryValidateConstraints,
- TApprovalResourceFactory
-} from "../approval-policy-types";
+import { TApprovalPolicyDALFactory } from "../approval-policy-dal";
+import { ApprovalPolicyType, ApprovalRequestGrantStatus } from "../approval-policy-enums";
+import { TApprovalResource } from "../approval-policy-types";
+import { TApprovalRequestGrantsDALFactory } from "../approval-request-dal";
import {
createSecretAccessGrantWithPrivilege,
getSecretAccessRequestData,
@@ -16,94 +12,72 @@ import {
validateSecretAccessConstraints
} from "./secret-access-policy-fns";
import { SecretAccessPolicyRequestDataSchema } from "./secret-access-policy-schemas";
-import {
- TSecretAccessApprovalContext,
- TSecretAccessPolicy,
- TSecretAccessPolicyInputs,
- TSecretAccessRequestData
-} from "./secret-access-policy-types";
+import { TSecretAccessPolicy, TSecretAccessPolicyInputs, TSecretAccessRequestData } from "./secret-access-policy-types";
-export const secretAccessPolicyFactory: TApprovalResourceFactory<
- TSecretAccessPolicyInputs,
- TSecretAccessPolicy,
- TSecretAccessRequestData,
- TSecretAccessApprovalContext
-> = (policyType) => {
- const matchPolicy: TApprovalRequestFactoryMatchPolicy<TSecretAccessPolicyInputs, TSecretAccessPolicy> = async (
- approvalPolicyDAL,
- projectId,
- inputs
- ) => {
- const policy = await approvalPolicyDAL.findSecretAccessPolicyByEnvIdAndSecretPath({
- projectId,
- envId: inputs.envId,
- secretPath: inputs.secretPath
- });
+type TSecretAccessApprovalResourceDep = {
+ approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findSecretAccessPolicyByEnvIdAndSecretPath">;
+ approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "find" | "create">;
+ additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create">;
+};
- return policy as TSecretAccessPolicy | null;
- };
+export type TSecretAccessApprovalResource = ReturnType<typeof secretAccessApprovalResourceFactory>;
- const canAccess: TApprovalRequestFactoryCanAccess<TSecretAccessPolicyInputs> = async (
- approvalRequestGrantsDAL,
- projectId,
- userId,
- inputs
- ) => {
- const grants = await approvalRequestGrantsDAL.find({
- granteeUserId: userId,
- type: policyType,
- status: ApprovalRequestGrantStatus.Active,
- projectId,
- revokedAt: null
- });
+export const secretAccessApprovalResourceFactory = ({
+ approvalPolicyDAL,
+ approvalRequestGrantsDAL,
+ additionalPrivilegeDAL
+}: TSecretAccessApprovalResourceDep) =>
+ ({
+ matchPolicy: async (projectId, inputs) => {
+ const policy = await approvalPolicyDAL.findSecretAccessPolicyByEnvIdAndSecretPath({
+ projectId,
+ envId: inputs.envId,
+ secretPath: inputs.secretPath
+ });
- const now = new Date();
+ return policy as TSecretAccessPolicy | null;
+ },
- return (
- grants.find(
- (grant) =>
- (!grant.expiresAt || new Date(grant.expiresAt) > now) &&
- hasSameAccessCriteria(SecretAccessPolicyRequestDataSchema.safeParse(grant.attributes).data ?? null, inputs)
- ) ?? null
- );
- };
+ canAccess: async (projectId, actorId, inputs) => {
+ const grants = await approvalRequestGrantsDAL.find({
+ granteeUserId: actorId,
+ type: ApprovalPolicyType.SecretAccess,
+ status: ApprovalRequestGrantStatus.Active,
+ projectId,
+ revokedAt: null
+ });
- const validateConstraints: TApprovalRequestFactoryValidateConstraints<
- TSecretAccessPolicy,
- TSecretAccessRequestData
- > = (policy, inputs) => validateSecretAccessConstraints(policy.constraints.constraints, inputs);
+ const now = new Date();
- const postApprovalRoutine: TApprovalRequestFactoryPostApprovalRoutine<TSecretAccessApprovalContext> = async (
- approvalRequestGrantsDAL,
- request,
- { additionalPrivilegeDAL, tx }
- ) => {
- const { requesterId } = request;
- if (!requesterId) {
- throw new NotFoundError({ message: "The user who created this access request no longer exists" });
- }
+ return (
+ grants.find(
+ (grant) =>
+ (!grant.expiresAt || new Date(grant.expiresAt) > now) &&
+ hasSameAccessCriteria(SecretAccessPolicyRequestDataSchema.safeParse(grant.attributes).data ?? null, inputs)
+ ) ?? null
+ );
+ },
- await createSecretAccessGrantWithPrivilege(
- {
- projectId: request.projectId,
- requestId: request.id,
- granteeUserId: requesterId,
- data: getSecretAccessRequestData(request)
- },
- { approvalRequestGrantsDAL, additionalPrivilegeDAL },
- tx
- );
- };
+ validateConstraints: (policy, requestData) =>
+ validateSecretAccessConstraints(policy.constraints.constraints, requestData),
- const postRejectionRoutine: TApprovalRequestFactoryPostRejectionRoutine<
- TSecretAccessApprovalContext
- > = async () => {};
+ postApprovalTxRoutine: async (request, tx) => {
+ const { requesterId } = request;
+ if (!requesterId) {
+ throw new NotFoundError({ message: "The user who created this access request no longer exists" });
+ }
- return {
- matchPolicy,
- canAccess,
- validateConstraints,
- postApprovalRoutine,
- postRejectionRoutine
- };
-};
+ const grant = await createSecretAccessGrantWithPrivilege(
+ {
+ projectId: request.projectId,
+ requestId: request.id,
+ granteeUserId: requesterId,
+ data: getSecretAccessRequestData(request)
+ },
+ { approvalRequestGrantsDAL, additionalPrivilegeDAL },
+ tx
+ );
+
+ return { grantId: grant.id };
+ }
+ }) satisfies TApprovalResource<TSecretAccessPolicyInputs, TSecretAccessPolicy, TSecretAccessRequestData>;
diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts
index 02a45c3209..02e0a355d8 100644
--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts
+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-fns.ts
@@ -137,4 +137,6 @@ export const createSecretAccessGrantWithPrivilege = async (
},
tx
);
+
+ return grant;
};
diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-types.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-types.ts
index e815266690..aaa9c80762 100644
--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-types.ts
+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-types.ts
@@ -1,8 +1,5 @@
-import { Knex } from "knex";
import { z } from "zod";
-import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
-
import {
SecretAccessPolicyConditionsSchema,
SecretAccessPolicyConstraintsSchema,
@@ -19,8 +16,3 @@ export type TSecretAccessPolicyConstraints = z.infer<typeof SecretAccessPolicyCo
export type TSecretAccessRequest = z.infer<typeof SecretAccessRequestSchema>;
export type TSecretAccessRequestData = z.infer<typeof SecretAccessPolicyRequestDataSchema>;
-
-export type TSecretAccessApprovalContext = {
- additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create">;
- tx: Knex;
-};
diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts
index 4ab830071d..8bb8aed255 100644
--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts
+++ b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-service.ts
@@ -32,7 +32,6 @@ import {
} from "@app/services/approval-policy/approval-policy-enums";
import { TApprovalRequest } from "@app/services/approval-policy/approval-policy-types";
import { createApprovalRequestWithSteps } from "@app/services/approval-policy/approval-request-fns";
-import { secretAccessPolicyFactory } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";
import {
getSecretAccessRequestData,
hasSameAccessCriteria,
@@ -106,10 +105,10 @@ export const secretAccessApprovalBridgeServiceFactory = ({
projectSlackConfigDAL,
microsoftTeamsService,
projectMicrosoftTeamsConfigDAL,
- queueService
+ queueService,
+ secretAccessApprovalResource
}: TSecretAccessApprovalBridgeServiceFactoryDep) => {
const { verifyProjectSubjectsMembership } = approvalPolicyMembershipVerifierFactory({ projectDAL });
- const secretAccessPolicy = secretAccessPolicyFactory(ApprovalPolicyType.SecretAccess);
const $splitApprovers = (approvers: TApproverInput) => ({
groupApprovers: approvers.filter((approver) => approver.type === ApproverType.Group) as TSequencedSubject[],
@@ -797,7 +796,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({
temporaryRange: temporaryRange || null
};
- const constraintValidation = secretAccessPolicy.validateConstraints(policy, requestData);
+ const constraintValidation = secretAccessApprovalResource.validateConstraints(policy, requestData);
if (!constraintValidation.valid) {
throw new BadRequestError({ message: constraintValidation.errors?.join("; ") ?? "Policy constraints not met" });
}
@@ -812,7 +811,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({
throw new BadRequestError({ message: `Policy '${policy.name}' has no approvers configured` });
}
- const activeGrant = await secretAccessPolicy.canAccess(approvalRequestGrantsDAL, projectId, requestedByUserId, {
+ const activeGrant = await secretAccessApprovalResource.canAccess(projectId, requestedByUserId, {
envId,
secretPath,
permissions,
@@ -1040,10 +1039,7 @@ export const secretAccessApprovalBridgeServiceFactory = ({
}
await approvalRequestDAL.updateById(requestId, { status: ApprovalRequestStatus.Approved }, tx);
- await secretAccessPolicy.postApprovalRoutine(approvalRequestGrantsDAL, locked as TApprovalRequest, {
- additionalPrivilegeDAL,
- tx
- });
+ await secretAccessApprovalResource.postApprovalTxRoutine(locked as TApprovalRequest, tx);
return { approval: createdApproval, nextStep: null };
});
diff --git a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts
index b5c2e006d2..c18ca4678a 100644
--- a/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts
+++ b/backend/src/services/secret-access-approval-bridge/secret-access-approval-bridge-types.ts
@@ -28,6 +28,7 @@ import {
TApprovalRequestStepEligibleApproversDALFactory,
TApprovalRequestStepsDALFactory
} from "@app/services/approval-policy/approval-request-dal";
+import { TSecretAccessApprovalResource } from "@app/services/approval-policy/secret-access/secret-access-policy-factory";
import { TSecretAccessPolicy } from "@app/services/approval-policy/secret-access/secret-access-policy-types";
import { TKmsServiceFactory } from "@app/services/kms/kms-service";
import { TMicrosoftTeamsServiceFactory } from "@app/services/microsoft-teams/microsoft-teams-service";
@@ -64,8 +65,8 @@ export type TSecretAccessApprovalBridgeServiceFactoryDep = {
approvalRequestStepsDAL: Pick<TApprovalRequestStepsDALFactory, "create" | "find" | "updateById">;
approvalRequestStepEligibleApproversDAL: Pick<TApprovalRequestStepEligibleApproversDALFactory, "create" | "find">;
approvalRequestApprovalsDAL: Pick<TApprovalRequestApprovalsDALFactory, "create" | "find">;
- approvalRequestGrantsDAL: TApprovalRequestGrantsDALFactory;
- additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create" | "delete">;
+ approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "updateById" | "findByIdForUpdate">;
+ additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;
secretAccessApprovalBridgeDAL: Pick<
TSecretAccessApprovalBridgeDALFactory,
| "findSecretAccessPolicies"
@@ -86,6 +87,10 @@ export type TSecretAccessApprovalBridgeServiceFactoryDep = {
microsoftTeamsService: Pick<TMicrosoftTeamsServiceFactory, "sendNotification">;
projectMicrosoftTeamsConfigDAL: Pick<TProjectMicrosoftTeamsConfigDALFactory, "getIntegrationDetailsByProject">;
queueService: Pick<TQueueServiceFactory, "queue">;
+ secretAccessApprovalResource: Pick<
+ TSecretAccessApprovalResource,
+ "canAccess" | "validateConstraints" | "postApprovalTxRoutine"
+ >;
};
export type TCreateSecretAccessApprovalPolicyDTO = TCreateAccessApprovalPolicy;