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
refac: move revoke into fns for better readability
adilson6c2610f48bf4
diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.tsindex 3f6fa8d2ad..8f3570f701 100644--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-fns.ts@@ -3,8 +3,10 @@ import { Knex } from "knex";import { TAccessApprovalPolicyDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-dal";import { BadRequestError } from "@app/lib/errors";import { groupBy } from "@app/lib/fn";+import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";import { TApprovalPolicySecretEnvironmentDALFactory } from "@app/services/approval-policy/approval-policy-dal";-import { ApproverType } from "@app/services/approval-policy/approval-policy-enums";+import { ApprovalRequestGrantStatus, ApproverType } from "@app/services/approval-policy/approval-policy-enums";+import { TApprovalRequestGrantsDALFactory } from "@app/services/approval-policy/approval-request-dal";type TSecretAccessApprovalPolicyExistsDep = {accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "findPolicyByEnvIdAndSecretPath">;@@ -67,3 +69,31 @@ export const buildSecretAccessPolicySteps = <T extends { type: ApproverType; id:return { requiredApprovals, approvers: stepApprovers };});};++type TRevokeActiveSecretAccessGrantsDep = {+ approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "update">;+ additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;+};++// additional_privileges.grantId is ON DELETE SET NULL, so deleting the policy would leave the temporary access in place.+export const revokeActiveSecretAccessGrants = async (+ { requestIds, revokedByUserId }: { requestIds: string[]; revokedByUserId: string | null },+ { approvalRequestGrantsDAL, additionalPrivilegeDAL }: TRevokeActiveSecretAccessGrantsDep,+ tx: Knex+) => {+ if (!requestIds.length) return;++ const revokedGrants = await approvalRequestGrantsDAL.update(+ { $in: { requestId: requestIds }, status: ApprovalRequestGrantStatus.Active },+ {+ status: ApprovalRequestGrantStatus.Revoked,+ revokedAt: new Date(),+ revokedByUserId+ },+ tx+ );++ if (!revokedGrants.length) return;++ await additionalPrivilegeDAL.delete({ $in: { grantId: revokedGrants.map((grant) => grant.id) } }, tx);+};diff --git a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.tsindex b40cf80e44..90420cf8df 100644--- a/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts+++ b/backend/src/services/secret-access-approval-policy-bridge/secret-access-approval-policy-bridge-service.ts@@ -11,16 +11,13 @@ import {import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";import { BadRequestError, NotFoundError } from "@app/lib/errors";import { groupBy } from "@app/lib/fn";-import {- ApprovalPolicyType,- ApprovalRequestGrantStatus,- ApprovalRequestStatus-} from "@app/services/approval-policy/approval-policy-enums";+import { ApprovalPolicyType, ApprovalRequestStatus } from "@app/services/approval-policy/approval-policy-enums";import { insertApprovalRequestSteps } from "@app/services/approval-policy/approval-request-fns";import { ActorType } from "@app/services/auth/auth-type";import {buildSecretAccessPolicySteps,+ revokeActiveSecretAccessGrants,secretAccessApprovalPolicyExists} from "./secret-access-approval-policy-bridge-fns";import {@@ -555,21 +552,14 @@ export const secretAccessApprovalPolicyBridgeServiceFactory = ({);const requests = await approvalRequestDAL.find({ policyId: policy.id }, { tx });- if (requests.length) {- const revokedGrants = await approvalRequestGrantsDAL.update(- { $in: { requestId: requests.map((request) => request.id) }, status: ApprovalRequestGrantStatus.Active },- {- status: ApprovalRequestGrantStatus.Revoked,- revokedAt: new Date(),- revokedByUserId: actor === ActorType.USER ? actorId : null- },- tx- );-- if (revokedGrants.length) {- await additionalPrivilegeDAL.delete({ $in: { grantId: revokedGrants.map((grant) => grant.id) } }, tx);- }- }+ await revokeActiveSecretAccessGrants(+ {+ requestIds: requests.map((request) => request.id),+ revokedByUserId: actor === ActorType.USER ? actorId : null+ },+ { approvalRequestGrantsDAL, additionalPrivilegeDAL },+ tx+ );await approvalPolicyDAL.deleteById(policy.id, tx);});