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
fix pam resource cleanup
Thiago Araujo da Silva9f226b18990e
diff --git a/backend/e2e-test/routes/v1/org-access-reconcile.spec.ts b/backend/e2e-test/routes/v1/org-access-reconcile.spec.tsindex 5d192217be..1c593a0f12 100644--- a/backend/e2e-test/routes/v1/org-access-reconcile.spec.ts+++ b/backend/e2e-test/routes/v1/org-access-reconcile.spec.ts@@ -297,6 +297,33 @@ describe("Org access reconcile", () => {});});+ // Resource reads match a group's folder rows without checking the group still reaches the org, so the+ // unlink itself has to drop them; the consumer only handles users and identities.+ test("unlinking a group from the sub-org drops its PAM membership and folder grant there", async () => {+ const groupId = await createLinkedGroup("pam-unlink-grp");+ const pamProjectId = await implicitProjectId("pam");+ const join = await asSubOrg("POST", `/api/v1/organization-admin/projects/${pamProjectId}/grant-admin-access`);+ expect(join.statusCode, join.payload).toBe(200);++ const memberRes = await asSubOrg("POST", `/api/v1/pam/memberships/groups/${groupId}`, { role: "member" });+ expect(memberRes.statusCode, memberRes.payload).toBe(200);+ const folderRes = await asSubOrg("POST", "/api/v1/pam/folders", { name: `pam-unlink-${randomUUID().slice(0, 8)}` });+ expect(folderRes.statusCode, folderRes.payload).toBe(200);+ const folderId = folderRes.json().folder.id as string;+ const grantRes = await asSubOrg("POST", `/api/v1/pam/folders/${folderId}/groups/${groupId}`, { role: "operator" });+ expect(grantRes.statusCode, grantRes.payload).toBe(200);++ const groupRows = () => testDb(TableName.Membership).where({ scopeOrgId: subOrgId, actorGroupId: groupId });+ expect(await groupRows()).toHaveLength(3);++ await unlinkGroupFromOrg({ groupId, authToken: subOrgToken });++ expect(await groupRows()).toHaveLength(0);+ const listRes = await asSubOrg("GET", `/api/v1/pam/folders/${folderId}/groups`);+ expect(listRes.statusCode, listRes.payload).toBe(200);+ expect((listRes.json().members as { groupId?: string }[]).map((m) => m.groupId)).not.toContain(groupId);+ });+// A lazily created Agent Vault project starts empty, so an org admin has to join it first.test("Agent Vault offers and takes a user who reaches the sub-org only through a group", async () => {const groupId = await createLinkedGroup("av-grp");diff --git a/backend/src/services/membership-group/membership-group-service.ts b/backend/src/services/membership-group/membership-group-service.tsindex 32eba1e9ad..7b44735bc4 100644--- a/backend/src/services/membership-group/membership-group-service.ts+++ b/backend/src/services/membership-group/membership-group-service.ts@@ -3,6 +3,7 @@ import { Knex } from "knex";import {AccessScope,ProjectMembershipRole,+ RESOURCE_SCOPE,TableName,TemporaryPermissionMode,TMembershipRolesInsert@@ -21,7 +22,7 @@ import { BadRequestError, NotFoundError } from "@app/lib/errors";import { groupBy } from "@app/lib/fn";import { ms } from "@app/lib/ms";import { SearchResourceOperators } from "@app/lib/search-resource/search";-import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";+import { ApprovalPolicyScope, ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";import { TEventEmitter } from "@app/services/event-outbox/event-outbox-types";import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";@@ -56,7 +57,10 @@ type TMembershipGroupServiceFactoryDep = {accessApprovalPolicyApproverDAL: Pick<TAccessApprovalPolicyApproverDALFactory, "find">;secretApprovalPolicyDAL: Pick<TSecretApprovalPolicyDALFactory, "find">;secretApprovalPolicyApproverDAL: Pick<TSecretApprovalPolicyApproverDALFactory, "find">;- approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findPoliciesWhereSubjectIsApprover">;+ approvalPolicyDAL: Pick<+ TApprovalPolicyDALFactory,+ "findPoliciesWhereSubjectIsApprover" | "deleteStepApproversBySubject" | "deleteBypassersBySubject"+ >;approvalRequestDAL: Pick<TApprovalRequestDALFactory, "findOpenSecretChangeRequestsWhereSubjectIsApprover">;roleDAL: Pick<TRoleDALFactory, "find">;permissionService: TPermissionServiceFactory;@@ -378,8 +382,9 @@ export const membershipGroupServiceFactory = ({return { membership: membershipDoc, group };};- // Unlinks a group from an org plus its project rows there (or they'd keep granting access) and folder grants- // members only had through it. Members' own project rows are left to the reconcile consumer.+ // Unlinks a group from an org plus its project and resource rows there (or they'd keep granting access: resource+ // reads match group rows without checking the group still reaches the org) and folder grants members only had+ // through it. Members' own project rows are left to the reconcile consumer.const detachGroupFromOrg = async ({ groupId, orgId, orgMembershipId }: { groupId: string; orgId: string; orgMembershipId?: string },tx: Knex@@ -390,12 +395,23 @@ export const membershipGroupServiceFactory = ({{ actorGroupId: groupId, scopeOrgId: orgId, scope: AccessScope.Project },{ tx });+ const groupResourceMemberships = await membershipGroupDAL.find(+ { actorGroupId: groupId, scopeOrgId: orgId, scope: RESOURCE_SCOPE },+ { tx }+ );const userIds = groupUsers.map((membership) => membership.userId);const identityIds = groupIdentities.map((membership) => membership.identityId);const groupProjectIds = Array.from(new Set(groupProjectMemberships.map((membership) => membership.scopeProjectId).filter(Boolean) as string[]));+ const groupResourceProjectIds = Array.from(+ new Set(+ [...groupProjectMemberships, ...groupResourceMemberships]+ .map((membership) => membership.scopeProjectId)+ .filter(Boolean) as string[]+ )+ );const membershipIds = [...groupProjectMemberships.map((membership) => membership.id)];if (orgMembershipId) membershipIds.push(orgMembershipId);@@ -404,6 +420,21 @@ export const membershipGroupServiceFactory = ({await membershipGroupDAL.delete({ $in: { id: membershipIds } }, tx);}+ for await (const projectId of groupResourceProjectIds) {+ await applicationMembershipCleanupService.cleanupActorApplicationMemberships(+ { projectId, actorKind: ApplicationMemberKind.Group, actorId: groupId },+ tx+ );+ await approvalPolicyDAL.deleteStepApproversBySubject(+ { projectId, scopeType: ApprovalPolicyScope.PamFolder, groupId },+ tx+ );+ await approvalPolicyDAL.deleteBypassersBySubject(+ { projectId, scopeType: ApprovalPolicyScope.PamFolder, groupId },+ tx+ );+ }+await reapOrphanedFolderGrants({ userGroupMembershipDAL, identityGroupMembershipDAL, additionalPrivilegeDAL },{