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
address reviews
Andreye751dcf34e55
diff --git a/backend/e2e-test/routes/v1/identity-folder-access.spec.ts b/backend/e2e-test/routes/v1/identity-folder-access.spec.tsindex f8a2ab8aff..0d33176112 100644--- a/backend/e2e-test/routes/v1/identity-folder-access.spec.ts+++ b/backend/e2e-test/routes/v1/identity-folder-access.spec.ts@@ -13,12 +13,16 @@ import { removeIdentitiesFromGroup } from "@app/ee/services/group/group-fns";import { reapDeletedGroupFolderGrants } from "@app/ee/services/group/group-folder-grant-fns";import { identityGroupMembershipDALFactory } from "@app/ee/services/group/identity-group-membership-dal";import { userGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";+import { pamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";+import { pamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";import { ms } from "@app/lib/ms";import { alphaNumericNanoId } from "@app/lib/nanoid";import { additionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";import { identityDALFactory } from "@app/services/identity/identity-dal";import { membershipDALFactory } from "@app/services/membership/membership-dal";+import { membershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { membershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";+import { userDALFactory } from "@app/services/user/user-dal";const projectId = seedData1.project.id;const orgId = seedData1.organization.id;@@ -222,7 +226,12 @@ describe("Identity folder access CRUD", () => {groupDAL: groupDALFactory(testDb),identityGroupMembershipDAL: identityGroupMembershipDALFactory(testDb),additionalPrivilegeDAL: additionalPrivilegeDALFactory(testDb),- eventEmitter: { emit: async () => {} }+ eventEmitter: { emit: async () => {} },+ membershipRoleDAL: membershipRoleDALFactory(testDb),+ pamAccountDAL: pamAccountDALFactory(testDb),+ pamSessionDAL: pamSessionDALFactory(testDb),+ userDAL: userDALFactory(testDb),+ gatewayV2Service: { getPAMConnectionDetails: () => Promise.reject(new Error("unexpected gateway call")) }};const [identity] = await testDb(TableName.Identity)diff --git a/backend/src/ee/services/github-org-sync/github-org-sync-reconcile.test.ts b/backend/src/ee/services/github-org-sync/github-org-sync-reconcile.test.tsindex c4708c4c89..2fd748eda7 100644--- a/backend/src/ee/services/github-org-sync/github-org-sync-reconcile.test.ts+++ b/backend/src/ee/services/github-org-sync/github-org-sync-reconcile.test.ts@@ -118,6 +118,11 @@ const createService = () => {usageMeteringService: { emit: vi.fn() } as never,alertChannelRecipientDAL: { pruneOutOfScopeRecipients: vi.fn().mockResolvedValue(undefined) } as never,auditLogService: { createAuditLog: vi.fn().mockResolvedValue(undefined) } as never,+ membershipDAL: {} as never,+ pamAccountDAL: {} as never,+ pamSessionDAL: { find: vi.fn().mockResolvedValue([]), update: vi.fn() } as never,+ userDAL: {} as never,+ gatewayV2Service: {} as never,orgDAL: { lockActorsForOrgAccess },eventEmitter: { emit }});diff --git a/backend/src/ee/services/github-org-sync/github-org-sync-service.ts b/backend/src/ee/services/github-org-sync/github-org-sync-service.tsindex 1c26c57f5c..0738175e14 100644--- a/backend/src/ee/services/github-org-sync/github-org-sync-service.ts+++ b/backend/src/ee/services/github-org-sync/github-org-sync-service.ts@@ -7,6 +7,10 @@ import { Octokit as OctokitRest } from "@octokit/rest";import { AccessScope, OrganizationActionScope, OrgMembershipRole } from "@app/db/schemas";import { AuditLogInfo, EventType, TAuditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-types";+import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";+import { TPamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";+import { terminatePamSessionsLosingGroupAccess } from "@app/ee/services/pam-session/pam-session-access-fns";+import { TPamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";import { BadRequestError, NotFoundError } from "@app/lib/errors";import { groupBy } from "@app/lib/fn";import { logger } from "@app/lib/logger";@@ -18,12 +22,14 @@ import { KmsDataKey } from "@app/services/kms/kms-types";import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TOrgMembershipDALFactory } from "@app/services/org-membership/org-membership-dal";import { TOrgDALFactory } from "@app/services/org/org-dal";import { emitGroupMembershipRemoved, toOrgMembershipActors } from "@app/services/org/org-membership-events";import { TUserAliasDALFactory } from "@app/services/user-alias/user-alias-dal";import { UserAliasType } from "@app/services/user-alias/user-alias-types";+import { TUserDALFactory } from "@app/services/user/user-dal";import { TGroupDALFactory } from "../group/group-dal";import { TUserGroupMembershipDALFactory } from "../group/user-group-membership-dal";@@ -373,7 +379,7 @@ type TGithubOrgSyncServiceFactoryDep = {"find" | "findGroupMembershipsByUserIdInOrg" | "findGroupMembershipsByGroupIdInOrg" | "insertMany" | "delete">;groupDAL: Pick<TGroupDALFactory, "insertMany" | "transaction" | "find" | "findGroupOrgIds">;- membershipRoleDAL: Pick<TMembershipRoleDALFactory, "insertMany">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "insertMany" | "find">;membershipGroupDAL: Pick<TMembershipGroupDALFactory, "insertMany">;licenseService: Pick<TLicenseServiceFactory, "getPlan">;orgMembershipDAL: Pick<TOrgMembershipDALFactory, "findOrgMembershipById" | "findOrgMembershipsWithUsersByOrgId">;@@ -383,6 +389,11 @@ type TGithubOrgSyncServiceFactoryDep = {auditLogService: Pick<TAuditLogServiceFactory, "createAuditLog">;orgDAL: Pick<TOrgDALFactory, "lockActorsForOrgAccess">;eventEmitter: TEventEmitter;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ userDAL: Pick<TUserDALFactory, "findById">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export type TGithubOrgSyncServiceFactory = ReturnType<typeof githubOrgSyncServiceFactory>;@@ -402,8 +413,15 @@ export const githubOrgSyncServiceFactory = ({alertChannelRecipientDAL,auditLogService,orgDAL,- eventEmitter+ eventEmitter,+ membershipDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service}: TGithubOrgSyncServiceFactoryDep) => {+ const pamSessionDeps = { membershipDAL, membershipRoleDAL, pamAccountDAL, pamSessionDAL, userDAL, gatewayV2Service };+const createGithubOrgSync = async ({githubOrgName,orgPermission,@@ -762,7 +780,7 @@ export const githubOrgSyncServiceFactory = ({}if (removeFromTeams.length) {- await groupDAL.transaction(async (tx) => {+ const sendPamCancellations = await groupDAL.transaction(async (tx) => {await userGroupMembershipDAL.delete({ userId, $in: { groupId: removeFromTeams.map((el) => el.groupId) } },tx@@ -781,7 +799,10 @@ export const githubOrgSyncServiceFactory = ({tx);}++ return terminatePamSessionsLosingGroupAccess({ userIds: [userId], ...pamSessionDeps, tx });});+ sendPamCancellations();await createGithubOrgSyncAuditLogs({auditLogService,@@ -1179,7 +1200,17 @@ export const githubOrgSyncServiceFactory = ({updatedTeams.add(teamName);}+ const sendPamCancellations = await terminatePamSessionsLosingGroupAccess({+ userIds: membershipsToRemove+ .map((membership) => activeMembersById.get(membership.orgMembershipId)?.user?.id)+ .filter(Boolean) as string[],+ actorId: orgPermission.id,+ ...pamSessionDeps,+ tx+ });+return {+ sendPamCancellations,usersToAdd,removedUserIds: membershipsToRemove.map((membership) => activeMembersById.get(membership.orgMembershipId)?.user?.id)@@ -1187,6 +1218,7 @@ export const githubOrgSyncServiceFactory = ({removedMembershipCount: membershipsToRemove.length};});+ membershipChanges.sendPamCancellations();totalRemovedMemberships += membershipChanges.removedMembershipCount;await createGithubOrgSyncAuditLogs({diff --git a/backend/src/ee/services/group/group-fns.ts b/backend/src/ee/services/group/group-fns.tsindex e26a615104..9c91ce7911 100644--- a/backend/src/ee/services/group/group-fns.ts+++ b/backend/src/ee/services/group/group-fns.ts@@ -660,13 +660,19 @@ export const removeUsersFromGroupByUserIds = async ({export const removeIdentitiesFromGroup = async ({group,identityIds,+ actorId,identityDAL,membershipDAL,groupDAL,identityGroupMembershipDAL,additionalPrivilegeDAL,usageMeteringService,- eventEmitter+ eventEmitter,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service}: TRemoveIdentitiesFromGroup) => {const identityIdsSet = new Set(identityIds);const identityIdsArray = Array.from(identityIdsSet);@@ -771,11 +777,24 @@ export const removeIdentitiesFromGroup = async ({tx);+ const sendPamCancellations = await terminatePamSessionsLosingGroupAccess({+ userIds: [],+ identityIds: identityIdsArray,+ actorId,+ membershipDAL,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service,+ tx+ });+// These identities may have left a secret-manager or PAM project they only reached through this group.usageMeteringService?.emit(group.orgId, SecretIdentities.key);usageMeteringService?.emit(group.orgId, PamIdentities.key);usageMeteringService?.emit(group.orgId, AgentVaultIdentities.key);- return identityIdsArray.map((identityId) => ({ id: identityId }));+ return { identities: identityIdsArray.map((identityId) => ({ id: identityId })), sendPamCancellations };});};diff --git a/backend/src/ee/services/group/group-service.ts b/backend/src/ee/services/group/group-service.tsindex 5e6730b864..4e32167bfb 100644--- a/backend/src/ee/services/group/group-service.ts+++ b/backend/src/ee/services/group/group-service.ts@@ -505,22 +505,12 @@ export const groupServiceFactory = ({if (isLinkedGroup) {const unlinkedGroup = await groupDAL.findById(id);- let sendPamCancellations = () => {};- const { identityIdsLosingOrgAccess } = await groupDAL.transaction(async (tx) => {- const detached = await membershipGroupService.detachGroupFromOrg(- { groupId: id, orgId: actorOrgId, orgMembershipId: groupMembership.id },+ const { identityIdsLosingOrgAccess, sendPamCancellations } = await groupDAL.transaction((tx) =>+ membershipGroupService.detachGroupFromOrg(+ { groupId: id, orgId: actorOrgId, orgMembershipId: groupMembership.id, actorId },tx- );- const { userIds, identityIds } = await groupDAL.findGroupActorsAndOrgs(id, tx);- sendPamCancellations = await terminatePamSessionsLosingGroupAccess({- userIds,- identityIds,- actorId,- ...pamSessionDeps,- tx- });- return detached;- });+ )+ );sendPamCancellations();await membershipGroupService.bumpIdentityRevocationVersions(identityIdsLosingOrgAccess);// Removing the group drops its members from any project it was on.@@ -1154,20 +1144,17 @@ export const groupServiceFactory = ({throw new NotFoundError({ message: `Identity with id ${identityId} is not part of the organization` });}- const identities = await removeIdentitiesFromGroup({+ const { identities, sendPamCancellations } = await removeIdentitiesFromGroup({group: groupMembership.group,identityIds: [identityId],+ actorId,identityDAL,- membershipDAL,groupDAL,identityGroupMembershipDAL,additionalPrivilegeDAL,- eventEmitter+ eventEmitter,+ ...pamSessionDeps});-- const sendPamCancellations = await groupDAL.transaction((tx) =>- terminatePamSessionsLosingGroupAccess({ userIds: [], identityIds: [identityId], actorId, ...pamSessionDeps, tx })- );sendPamCancellations();// Losing a group can remove the identity's effective org access. Skipped whendiff --git a/backend/src/ee/services/group/group-types.ts b/backend/src/ee/services/group/group-types.tsindex 386d041360..f4ba0bfd38 100644--- a/backend/src/ee/services/group/group-types.ts+++ b/backend/src/ee/services/group/group-types.ts@@ -174,8 +174,9 @@ export type TRemoveUsersFromGroupByUserIds = {export type TRemoveIdentitiesFromGroup = {group: { id: string; name: string; slug: string; orgId: string };identityIds: string[];+ actorId?: string;identityDAL: Pick<TIdentityDALFactory, "find" | "transaction">;- membershipDAL: Pick<TMembershipDALFactory, "find">;+ membershipDAL: Pick<TMembershipDALFactory, "find" | "findResourceMembershipsForActors">;groupDAL: TGroupOrgIdsDAL;identityGroupMembershipDAL: Pick<TIdentityGroupMembershipDALFactory,@@ -184,6 +185,11 @@ export type TRemoveIdentitiesFromGroup = {additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;usageMeteringService?: Pick<TUsageMeteringServiceFactory, "emit">;eventEmitter: TEventEmitter;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "find">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ userDAL: Pick<TUserDALFactory, "findById">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export type TConvertPendingGroupAdditionsToGroupMemberships = {diff --git a/backend/src/ee/services/pam/pam-permission.ts b/backend/src/ee/services/pam/pam-permission.tsindex 2f977d7847..5d52ff68df 100644--- a/backend/src/ee/services/pam/pam-permission.ts+++ b/backend/src/ee/services/pam/pam-permission.ts@@ -129,6 +129,45 @@ export const checkAccountAccess = async (ForbiddenError.from(permission).throwUnlessCan(action, ResourcePermissionSub.PamResource);};+const findActivePamMemberships = async (+ membershipDAL: TMembershipDep,+ membershipRoleDAL: TMembershipRoleDep,+ projectId: string,+ ctx: Pick<TActorContext, "actor" | "actorId">,+ tx?: Knex+) => {+ const [folderMemberships, accountMemberships] = await Promise.all([+ membershipDAL.findResourceMembershipsForActor(+ {+ projectId,+ resourceType: ResourceType.PamFolder,+ actorType: ctx.actor,+ actorId: ctx.actorId+ },+ tx+ ),+ membershipDAL.findResourceMembershipsForActor(+ {+ projectId,+ resourceType: ResourceType.PamAccount,+ actorType: ctx.actor,+ actorId: ctx.actorId+ },+ tx+ )+ ]);++ const activeFolderMemberships = folderMemberships.filter((m) => m.isActive);+ const activeAccountMemberships = accountMemberships.filter((m) => m.isActive);++ const allMemberships = [...activeFolderMemberships, ...activeAccountMemberships];+ const roles = allMemberships.length+ ? await membershipRoleDAL.find({ $in: { membershipId: allMemberships.map((m) => m.id) } }, { tx })+ : [];++ return { folderMemberships: activeFolderMemberships, accountMemberships: activeAccountMemberships, roles };+};+// How long the actor keeps LaunchSessions on the account: null while a granting role is permanent, 0 once none// grants it.export const getLaunchAccessRemainingMs = async (@@ -138,30 +177,20 @@ export const getLaunchAccessRemainingMs = async (account: { id: string; folderId?: string | null },ctx: Pick<TActorContext, "actor" | "actorId">): Promise<number | null> => {- const [folderMemberships, accountMemberships] = await Promise.all([- account.folderId- ? membershipDAL.findResourceMembershipsForActor({- projectId,- resourceType: ResourceType.PamFolder,- actorType: ctx.actor,- actorId: ctx.actorId- })- : [],- membershipDAL.findResourceMembershipsForActor({- projectId,- resourceType: ResourceType.PamAccount,- actorType: ctx.actor,- actorId: ctx.actorId- })- ]);-- const memberships = [- ...folderMemberships.filter((m) => m.scopeResourceId === account.folderId),- ...accountMemberships.filter((m) => m.scopeResourceId === account.id)- ].filter((m) => m.isActive);- if (memberships.length === 0) return 0;+ const {+ folderMemberships,+ accountMemberships,+ roles: allRoles+ } = await findActivePamMemberships(membershipDAL, membershipRoleDAL, projectId, ctx);+ const membershipIds = new Set(+ [+ ...folderMemberships.filter((m) => m.scopeResourceId === account.folderId),+ ...accountMemberships.filter((m) => m.scopeResourceId === account.id)+ ].map((m) => m.id)+ );+ if (membershipIds.size === 0) return 0;- const roles = await membershipRoleDAL.find({ $in: { membershipId: memberships.map((m) => m.id) } });+ const roles = allRoles.filter((r) => membershipIds.has(r.membershipId));const grantingRoles = roles.filter((r) => isActiveRole(r) && pamRoleHasAction(r.role, ResourcePermissionPamResourceActions.LaunchSessions));@@ -199,41 +228,11 @@ export const getResourceIdsWithActions = async (ctx: TActorContext,tx?: Knex) => {- const [folderMemberships, accountMemberships] = await Promise.all([- membershipDAL.findResourceMembershipsForActor(- {- projectId,- resourceType: ResourceType.PamFolder,- actorType: ctx.actor,- actorId: ctx.actorId- },- tx- ),- membershipDAL.findResourceMembershipsForActor(- {- projectId,- resourceType: ResourceType.PamAccount,- actorType: ctx.actor,- actorId: ctx.actorId- },- tx- )- ]);-- const activeFolderMemberships = folderMemberships.filter((m) => m.isActive);- const activeAccountMemberships = accountMemberships.filter((m) => m.isActive);-- const allMemberships = [...activeFolderMemberships, ...activeAccountMemberships];- if (allMemberships.length === 0) {- return { folderIds: [], accountIds: [] };- }-- const roles = await membershipRoleDAL.find(- {- $in: { membershipId: allMemberships.map((m) => m.id) }- },- { tx }- );+ const {+ folderMemberships: activeFolderMemberships,+ accountMemberships: activeAccountMemberships,+ roles+ } = await findActivePamMemberships(membershipDAL, membershipRoleDAL, projectId, ctx, tx);const roleByMembershipId = activeRoleByMembershipId(roles);const folderIds = activeFolderMembershipsdiff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex d6f3d47954..27dfe0ba37 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -790,6 +790,7 @@ export const registerRoutes = async (const secretSyncDAL = secretSyncDALFactory(db, folderDAL);const userNotificationDAL = userNotificationDALFactory(db);const pamSessionDAL = pamSessionDALFactory(db);+ const pamAccountDAL = pamAccountDALFactory(db);const deferredGatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails"> = {// eslint-disable-next-line @typescript-eslint/no-use-before-define@@ -1051,7 +1052,12 @@ export const registerRoutes = async (identityGroupMembershipDAL,userGroupMembershipDAL,identityAccessTokenService,- eventEmitter: eventOutboxService+ eventEmitter: eventOutboxService,+ membershipDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service: deferredGatewayV2Service});const roleService = roleServiceFactory({@@ -1333,7 +1339,6 @@ export const registerRoutes = async (? clickhouseAuditLogDALFactory(clickhouse, db, envConfig.CLICKHOUSE_AUDIT_LOG_TABLE_NAME): undefined;- const pamAccountDAL = pamAccountDALFactory(db);const auditLogService = auditLogServiceFactory({auditLogDAL,clickhouseAuditLogDAL,@@ -1558,7 +1563,12 @@ export const registerRoutes = async (alertChannelRecipientDAL,auditLogService,orgDAL,- eventEmitter: eventOutboxService+ eventEmitter: eventOutboxService,+ membershipDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service: deferredGatewayV2Service});// gitHubAppService is created after gatewayPoolService (below) due to dependency on gateway servicesdiff --git a/backend/src/services/membership-group/membership-group-service.ts b/backend/src/services/membership-group/membership-group-service.tsindex 38c29e2e23..9a82067444 100644--- a/backend/src/services/membership-group/membership-group-service.ts+++ b/backend/src/services/membership-group/membership-group-service.ts@@ -10,11 +10,15 @@ import {} from "@app/db/schemas";import { TAccessApprovalPolicyApproverDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-approver-dal";import { TAccessApprovalPolicyDALFactory } from "@app/ee/services/access-approval-policy/access-approval-policy-dal";+import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";import { TGroupDALFactory } from "@app/ee/services/group/group-dal";import { reapOrphanedFolderGrants } from "@app/ee/services/group/group-folder-grant-fns";import { TIdentityGroupMembershipDALFactory } from "@app/ee/services/group/identity-group-membership-dal";import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";+import { TPamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";+import { terminatePamSessionsLosingGroupAccess } from "@app/ee/services/pam-session/pam-session-access-fns";+import { TPamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";import { TSecretApprovalPolicyApproverDALFactory } from "@app/ee/services/secret-approval-policy/secret-approval-policy-approver-dal";import { TSecretApprovalPolicyDALFactory } from "@app/ee/services/secret-approval-policy/secret-approval-policy-dal";@@ -34,13 +38,14 @@ import { TAlertChannelRecipientDALFactory } from "../alert/alert-channel-recipieimport { TApprovalPolicyDALFactory } from "../approval-policy/approval-policy-dal";import { TApprovalRequestDALFactory } from "../approval-policy/approval-request-dal";import { TApplicationMembershipCleanupServiceFactory } from "../membership/application-membership-cleanup-service";-import { lockMembershipsById } from "../membership/membership-dal";+import { lockMembershipsById, TMembershipDALFactory } from "../membership/membership-dal";import { assertProductWillRetainAdmin, assertSecretsTemporaryAccessAllowed } from "../membership/membership-fns";import { TMembershipRoleDALFactory } from "../membership/membership-role-dal";import { TOrgDALFactory } from "../org/org-dal";import { ApplicationMemberKind } from "../pki-application/pki-application-types";import { TProjectDALFactory } from "../project/project-dal";import { TRoleDALFactory } from "../role/role-dal";+import { TUserDALFactory } from "../user/user-dal";import { TMembershipGroupDALFactory } from "./membership-group-dal";import {TCreateMembershipGroupDTO,@@ -54,7 +59,7 @@ import { newProjectMembershipGroupFactory } from "./project/project-membership-gtype TMembershipGroupServiceFactoryDep = {membershipGroupDAL: TMembershipGroupDALFactory;- membershipRoleDAL: Pick<TMembershipRoleDALFactory, "insertMany" | "delete">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "insertMany" | "delete" | "find">;accessApprovalPolicyDAL: Pick<TAccessApprovalPolicyDALFactory, "find">;accessApprovalPolicyApproverDAL: Pick<TAccessApprovalPolicyApproverDALFactory, "find">;secretApprovalPolicyDAL: Pick<TSecretApprovalPolicyDALFactory, "find">;@@ -81,6 +86,11 @@ type TMembershipGroupServiceFactoryDep = {userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "filterProjectsByUserMembership">;identityAccessTokenService: Pick<TIdentityAccessTokenServiceFactory, "bumpIdentityRevocationVersion">;eventEmitter: TEventEmitter;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ userDAL: Pick<TUserDALFactory, "findById">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export type TMembershipGroupServiceFactory = ReturnType<typeof membershipGroupServiceFactory>;@@ -107,7 +117,12 @@ export const membershipGroupServiceFactory = ({identityGroupMembershipDAL,userGroupMembershipDAL,identityAccessTokenService,- eventEmitter+ eventEmitter,+ membershipDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service}: TMembershipGroupServiceFactoryDep) => {const scopeFactory = {[AccessScope.Organization]: newOrgMembershipGroupFactory({@@ -390,7 +405,12 @@ export const membershipGroupServiceFactory = ({// 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 },+ {+ groupId,+ orgId,+ orgMembershipId,+ actorId+ }: { groupId: string; orgId: string; orgMembershipId?: string; actorId?: string },tx: Knex) => {const groupUsers = await userGroupMembershipDAL.find({ groupId }, { tx });@@ -457,10 +477,26 @@ export const membershipGroupServiceFactory = ({tx);+ const sendPamCancellations = await terminatePamSessionsLosingGroupAccess({+ userIds,+ identityIds,+ actorId,+ membershipDAL,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service,+ tx+ });+const stillReaching = identityIds.length? await orgDAL.findActorsWithOrgAccess({ orgId, userIds: [], identityIds }, tx): null;- return { identityIdsLosingOrgAccess: identityIds.filter((id) => !stillReaching?.identityIds.has(id)) };+ return {+ identityIdsLosingOrgAccess: identityIds.filter((id) => !stillReaching?.identityIds.has(id)),+ sendPamCancellations+ };};const bumpIdentityRevocationVersions = async (identityIds: string[]) => {@@ -575,6 +611,7 @@ export const membershipGroupServiceFactory = ({}let identityIdsLosingOrgAccess: string[] = [];+ let sendPamCancellations = () => {};const performDelete = async (tx: Knex) => {if (scopeData.scope === AccessScope.Project && existingMembership.scopeProjectId) {await assertProductWillRetainAdmin({@@ -635,11 +672,12 @@ export const membershipGroupServiceFactory = ({}if (scopeData.scope === AccessScope.Organization) {- ({ identityIdsLosingOrgAccess } = await detachGroupFromOrg(+ ({ identityIdsLosingOrgAccess, sendPamCancellations } = await detachGroupFromOrg({groupId: dto.selector.groupId,orgId: existingMembership.scopeOrgId,- orgMembershipId: existingMembership.id+ orgMembershipId: existingMembership.id,+ actorId: dto.permission.id},tx));@@ -657,6 +695,7 @@ export const membershipGroupServiceFactory = ({const membershipDoc = externalTx? await performDelete(externalTx): await membershipGroupDAL.transaction(performDelete);+ sendPamCancellations();await bumpIdentityRevocationVersions(identityIdsLosingOrgAccess);// Removing a group from a project drops its users + identities from it, changing the meters.