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): PAM sessions keep running after group removal and past a temporary membership's end
Andrey249e282a2eea
diff --git a/backend/e2e-test/routes/v1/user-folder-access.spec.ts b/backend/e2e-test/routes/v1/user-folder-access.spec.tsindex ad6fb57657..8ed4abaf98 100644--- a/backend/e2e-test/routes/v1/user-folder-access.spec.ts+++ b/backend/e2e-test/routes/v1/user-folder-access.spec.ts@@ -16,6 +16,8 @@ import { removeUsersFromGroupByUserIds } 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 { KeyStorePrefixes } from "@app/keystore/keystore";import { getConfig, initEnvConfig } from "@app/lib/config/env";import { initLogger, logger } from "@app/lib/logger";@@ -24,6 +26,8 @@ import { alphaNumericNanoId } from "@app/lib/nanoid";import { additionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";import { alertChannelRecipientDALFactory } from "@app/services/alert/alert-channel-recipient-dal";import { ActorType, AuthMethod, AuthTokenType } from "@app/services/auth/auth-type";+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 { projectKeyDALFactory } from "@app/services/project-key/project-key-dal";import { userDALFactory } from "@app/services/user/user-dal";@@ -1104,7 +1108,12 @@ describe("User folder access CRUD", () => {membershipGroupDAL: membershipGroupDALFactory(testDb),projectKeyDAL: projectKeyDALFactory(testDb),additionalPrivilegeDAL: additionalPrivilegeDALFactory(testDb),- alertChannelRecipientDAL: alertChannelRecipientDALFactory(testDb)+ alertChannelRecipientDAL: alertChannelRecipientDALFactory(testDb),+ membershipDAL: membershipDALFactory(testDb),+ membershipRoleDAL: membershipRoleDALFactory(testDb),+ pamAccountDAL: pamAccountDALFactory(testDb),+ pamSessionDAL: pamSessionDALFactory(testDb),+ gatewayV2Service: { getPAMConnectionDetails: () => Promise.reject(new Error("unexpected gateway call")) }};const username = `folder-reap-${alphaNumericNanoId(8)}@example.com`;diff --git a/backend/src/ee/services/group/group-fns.ts b/backend/src/ee/services/group/group-fns.tsindex 80c7c6ccfd..0c2a442340 100644--- a/backend/src/ee/services/group/group-fns.ts+++ b/backend/src/ee/services/group/group-fns.ts@@ -7,6 +7,7 @@ import { logger } from "@app/lib/logger";import { recordLegacyRootKeyUsageMetric } from "@app/lib/telemetry/metrics";import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";+import { terminatePamSessionsLosingGroupAccess } from "../pam-session/pam-session-access-fns";import {TAddIdentitiesToGroup,TAddUsersToGroup,@@ -392,12 +393,14 @@ export const addIdentitiesToGroup = async ({* Remove users with user ids [userIds] from group [group].* - Users may be part of the group (non-pending + pending);* this function will handle both cases.+ * - Fire the returned sendPamCancellations once the transaction holding the removal commits.* @param {group} group - group to remove user(s) from* @param {string[]} userIds - id(s) of user(s) to remove from group*/export const removeUsersFromGroupByUserIds = async ({group,userIds,+ actorId,userDAL,userGroupMembershipDAL,projectKeyDAL,@@ -406,11 +409,16 @@ export const removeUsersFromGroupByUserIds = async ({membershipGroupDAL,shouldFailOnMissingMembers = true,usageMeteringService,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ membershipDAL,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service}: TRemoveUsersFromGroupByUserIds) => {const processRemoval = async (tx: Knex) => {if (userIds.length === 0) {- return [];+ return { users: [], sendPamCancellations: () => {} };}const foundMembers = await userDAL.find(@@ -457,7 +465,7 @@ export const removeUsersFromGroupByUserIds = async ({// filter out users not in group for idempotent operationconst filteredFoundMembers = foundMembers.filter((m) => existingUserGroupMembershipsUserIdsSet.has(m.id));if (filteredFoundMembers.length === 0) {- return [];+ return { users: [], sendPamCancellations: () => {} };}// continue with filtered listfoundMembers.length = 0;@@ -580,11 +588,23 @@ export const removeUsersFromGroupByUserIds = async ({await alertChannelRecipientDAL.pruneOutOfScopeRecipients({ userIds: foundMembers.map((m) => m.id) }, tx);+ const sendPamCancellations = await terminatePamSessionsLosingGroupAccess({+ userIds: foundMembers.map((m) => m.id),+ actorId,+ membershipDAL,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ userDAL,+ gatewayV2Service,+ tx+ });+// These users 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 membersToRemoveFromGroupNonPending.concat(membersToRemoveFromGroupPending);+ return { users: membersToRemoveFromGroupNonPending.concat(membersToRemoveFromGroupPending), sendPamCancellations };};if (outerTx) {diff --git a/backend/src/ee/services/group/group-service.ts b/backend/src/ee/services/group/group-service.tsindex dda8a153cc..1f83d2b57f 100644--- a/backend/src/ee/services/group/group-service.ts+++ b/backend/src/ee/services/group/group-service.ts@@ -7,10 +7,15 @@ import {OrganizationActionScope,OrgMembershipRole,OrgMembershipStatus,+ RESOURCE_SCOPE,TGroups,TRoles} from "@app/db/schemas";+import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";import { TOidcConfigDALFactory } from "@app/ee/services/oidc/oidc-config-dal";+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 { DatabaseErrorCode } from "@app/lib/error-codes";import {BadRequestError,@@ -79,7 +84,7 @@ import { TIdentityGroupMembershipDALFactory } from "./identity-group-membership-import { TUserGroupMembershipDALFactory } from "./user-group-membership-dal";type TGroupServiceFactoryDep = {- userDAL: Pick<TUserDALFactory, "find" | "findOne" | "findUserEncKeyByUserIdsBatch" | "transaction">;+ userDAL: Pick<TUserDALFactory, "find" | "findOne" | "findById" | "findUserEncKeyByUserIdsBatch" | "transaction">;identityDAL: Pick<TIdentityDALFactory, "findOne" | "find" | "transaction">;identityGroupMembershipDAL: Pick<TIdentityGroupMembershipDALFactory,@@ -104,8 +109,8 @@ type TGroupServiceFactoryDep = {TMembershipGroupDALFactory,"find" | "findOne" | "create" | "getGroupById" | "deleteById" | "delete" | "findEffectiveInOrg">;- membershipDAL: Pick<TMembershipDALFactory, "find" | "findOne">;- membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "delete">;+ membershipDAL: Pick<TMembershipDALFactory, "find" | "findOne" | "findResourceMembershipsForActors">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "delete" | "find">;orgDAL: Pick<TOrgDALFactory, "findMembership" | "countAllOrgMembers" | "findById">;userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory,@@ -121,6 +126,9 @@ type TGroupServiceFactoryDep = {usageMeteringService: Pick<TUsageMeteringServiceFactory, "emit">;identityAccessTokenService: Pick<TIdentityAccessTokenServiceFactory, "bumpIdentityRevocationVersion">;alertChannelRecipientDAL: Pick<TAlertChannelRecipientDALFactory, "deleteByPrincipals" | "pruneOutOfScopeRecipients">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export type TGroupServiceFactory = ReturnType<typeof groupServiceFactory>;@@ -144,8 +152,13 @@ export const groupServiceFactory = ({membershipRoleDAL,usageMeteringService,identityAccessTokenService,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service}: TGroupServiceFactoryDep) => {+ const pamSessionDeps = { membershipDAL, membershipRoleDAL, pamAccountDAL, pamSessionDAL, userDAL, gatewayV2Service };+const createGroup = async ({ name, slug, role, actor, actorId, actorAuthMethod, actorOrgId }: TCreateGroupDTO) => {if (!actorOrgId) throw new UnauthorizedError({ message: "No organization ID provided in request" });@@ -517,14 +530,18 @@ export const groupServiceFactory = ({const unlinkGroupFromSubOrg = async ({groupId,groupMembershipId,+ actorId,actorOrgId}: {groupId: string;groupMembershipId: string;+ actorId: string;actorOrgId: string;}) => {const group = await groupDAL.findById(groupId);+ let sendPamCancellations = () => {};+await groupDAL.transaction(async (tx) => {// Fetch all group members (users and identities) in parallelconst [groupUsers, groupIdentities] = await Promise.all([@@ -537,7 +554,16 @@ export const groupServiceFactory = ({{ actorGroupId: groupId, scopeOrgId: actorOrgId, scope: AccessScope.Project },{ tx });- const membershipIdsToDelete = [...groupProjectMemberships.map((pm) => pm.id), groupMembershipId];+ // Resource memberships (PAM folders and accounts, applications) keep granting access unless removed with them.+ const groupResourceMemberships = await membershipGroupDAL.find(+ { actorGroupId: groupId, scopeOrgId: actorOrgId, scope: RESOURCE_SCOPE },+ { tx }+ );+ const membershipIdsToDelete = [+ ...groupProjectMemberships.map((pm) => pm.id),+ ...groupResourceMemberships.map((rm) => rm.id),+ groupMembershipId+ ];// Remaining linked groups in this sub-org (excluding the one we're unlinking)const remainingOrgGroupMemberships = await membershipGroupDAL.find(@@ -647,8 +673,18 @@ export const groupServiceFactory = ({);await alertChannelRecipientDAL.pruneOutOfScopeRecipients({ groupIds: [groupId] }, tx);++ sendPamCancellations = await terminatePamSessionsLosingGroupAccess({+ userIds: groupUserIds,+ identityIds: groupIdentityIds,+ actorId,+ ...pamSessionDeps,+ tx+ });});+ sendPamCancellations();+return group;};@@ -656,7 +692,15 @@ export const groupServiceFactory = ({* Delete a group owned by the current organization.* Ensures the group is not linked by any sub-organizations before deleting.*/- const deleteOwnedGroup = async ({ groupId, actorOrgId }: { groupId: string; actorOrgId: string }) => {+ const deleteOwnedGroup = async ({+ groupId,+ actorId,+ actorOrgId+ }: {+ groupId: string;+ actorId: string;+ actorOrgId: string;+ }) => {const referencingSubOrgs = await groupDAL.getGroupsReferencingGroup(groupId);if (referencingSubOrgs.length > 0) {const orgList = referencingSubOrgs.map((o) => `"${o.orgName}"`).join(", ");@@ -665,13 +709,20 @@ export const groupServiceFactory = ({});}- return groupDAL.transaction(async (tx) => {+ let sendPamCancellations = () => {};++ const deletedGroup = await groupDAL.transaction(async (tx) => {const finalizeAlertRecipients = await prepareDeletedGroupAlertRecipientCleanup({ userGroupMembershipDAL, alertChannelRecipientDAL },groupId,tx);+ const [groupUsers, groupIdentities] = await Promise.all([+ userGroupMembershipDAL.find({ groupId }, { tx }),+ identityGroupMembershipDAL.find({ groupId }, { tx })+ ]);+// must precede the delete: it cascades away the memberships the reap readsawait reapDeletedGroupFolderGrants({ userGroupMembershipDAL, identityGroupMembershipDAL, membershipGroupDAL, additionalPrivilegeDAL },@@ -679,7 +730,7 @@ export const groupServiceFactory = ({tx);- const [deletedGroup] = await groupDAL.delete(+ const [deleted] = await groupDAL.delete({id: groupId,orgId: actorOrgId@@ -689,8 +740,20 @@ export const groupServiceFactory = ({await finalizeAlertRecipients();- return deletedGroup;+ sendPamCancellations = await terminatePamSessionsLosingGroupAccess({+ userIds: groupUsers.map((m) => m.userId),+ identityIds: groupIdentities.map((m) => m.identityId),+ actorId,+ ...pamSessionDeps,+ tx+ });++ return deleted;});++ sendPamCancellations();++ return deletedGroup;};const deleteGroup = async ({ id, actor, actorId, actorAuthMethod, actorOrgId }: TDeleteGroupDTO) => {@@ -745,6 +808,7 @@ export const groupServiceFactory = ({const unlinkedGroup = await unlinkGroupFromSubOrg({groupId: id,groupMembershipId: groupMembership.id,+ actorId,actorOrgId});// Removing the group drops its members from any project it was on.@@ -754,7 +818,7 @@ export const groupServiceFactory = ({return { group: unlinkedGroup, isUnlinked: true };}- const deletedGroup = await deleteOwnedGroup({ groupId: id, actorOrgId });+ const deletedGroup = await deleteOwnedGroup({ groupId: id, actorId, actorOrgId });// Deleting the group drops its members from any project it was on.usageMeteringService.emit(actorOrgId, SecretIdentities.key);usageMeteringService.emit(actorOrgId, PamIdentities.key);@@ -1289,16 +1353,18 @@ export const groupServiceFactory = ({const user = await userDAL.findOne({ username });if (!user) throw new NotFoundError({ message: `Failed to find user with username ${username}` });- const users = await removeUsersFromGroupByUserIds({+ const { users, sendPamCancellations } = await removeUsersFromGroupByUserIds({group: groupMembership.group,userIds: [user.id],- userDAL,+ actorId,userGroupMembershipDAL,membershipGroupDAL,projectKeyDAL,additionalPrivilegeDAL,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ ...pamSessionDeps});+ sendPamCancellations();await cleanUpSubOrgProjectMemberships({groupId: id,diff --git a/backend/src/ee/services/group/group-types.ts b/backend/src/ee/services/group/group-types.tsindex b03bae842a..756e26bbc1 100644--- a/backend/src/ee/services/group/group-types.ts+++ b/backend/src/ee/services/group/group-types.ts@@ -1,12 +1,16 @@import { Knex } from "knex";+import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";+import { TPamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";+import { TPamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";import { OrderByDirection, TGenericPermission } from "@app/lib/types";import { TAdditionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";import { TAlertChannelRecipientDALFactory } from "@app/services/alert/alert-channel-recipient-dal";import { TIdentityDALFactory } from "@app/services/identity/identity-dal";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";import { TMembershipDALFactory } from "@app/services/membership/membership-dal";+import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";import { TOrgDALFactory } from "@app/services/org/org-dal";import { TProjectDALFactory } from "@app/services/project/project-dal";@@ -142,7 +146,9 @@ export type TAddIdentitiesToGroup = {export type TRemoveUsersFromGroupByUserIds = {group: { id: string; name: string; slug: string; orgId: string };userIds: string[];- userDAL: Pick<TUserDALFactory, "find" | "transaction">;+ // The admin removing them, if any; SCIM and IdP group sync have none.+ actorId?: string;+ userDAL: Pick<TUserDALFactory, "find" | "findById" | "transaction">;userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "filterProjectsByUserMembership" | "delete">;membershipGroupDAL: Pick<TMembershipGroupDALFactory, "find">;projectKeyDAL: Pick<TProjectKeyDALFactory, "delete">;@@ -151,6 +157,11 @@ export type TRemoveUsersFromGroupByUserIds = {shouldFailOnMissingMembers?: boolean;usageMeteringService?: Pick<TUsageMeteringServiceFactory, "emit">;alertChannelRecipientDAL: Pick<TAlertChannelRecipientDALFactory, "pruneOutOfScopeRecipients">;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "find">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export type TRemoveIdentitiesFromGroup = {diff --git a/backend/src/ee/services/ldap-config/ldap-config-service.ts b/backend/src/ee/services/ldap-config/ldap-config-service.tsindex 7970566929..7bf2a613d0 100644--- a/backend/src/ee/services/ldap-config/ldap-config-service.ts+++ b/backend/src/ee/services/ldap-config/ldap-config-service.ts@@ -10,10 +10,13 @@ import {TUsers} from "@app/db/schemas";import { TAuditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-types";+import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";import { TGroupDALFactory } from "@app/ee/services/group/group-dal";import { addUsersToGroupByUserIds, removeUsersFromGroupByUserIds } from "@app/ee/services/group/group-fns";import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";import { getEnforcedIdentityLimit, throwOnPlanSeatLimitReached } from "@app/ee/services/license/license-fns";+import { TPamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";+import { TPamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";import { getConfig } from "@app/lib/config/env";import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";import { requestMemoKeys } from "@app/lib/request-context/memo-keys";@@ -38,6 +41,7 @@ import { TokenType } from "@app/services/auth-token/auth-token-types";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";import { TOrgDALFactory } from "@app/services/org/org-dal";@@ -84,7 +88,8 @@ type TLdapConfigServiceFactoryDep = {>;groupDAL: Pick<TGroupDALFactory, "find" | "findOne">;membershipGroupDAL: Pick<TMembershipGroupDALFactory, "find">;- membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create">;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "find">;projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany" | "delete">;alertChannelRecipientDAL: Pick<TAlertChannelRecipientDALFactory, "pruneOutOfScopeRecipients">;projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;@@ -97,6 +102,7 @@ type TLdapConfigServiceFactoryDep = {TUserDALFactory,| "create"| "findOne"+ | "findById"| "transaction"| "updateById"| "findUserEncKeyByUserIdsBatch"@@ -114,6 +120,9 @@ type TLdapConfigServiceFactoryDep = {emailDomainDAL: Pick<TEmailDomainDALFactory, "findOne">;telemetryService: Pick<TTelemetryServiceFactory, "sendPostHogEvents">;usageMeteringService: Pick<TUsageMeteringServiceFactory, "emit">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export type TLdapConfigServiceFactory = ReturnType<typeof ldapConfigServiceFactory>;@@ -125,6 +134,7 @@ export const ldapConfigServiceFactory = ({orgDAL,groupDAL,membershipGroupDAL,+ membershipDAL,membershipRoleDAL,projectKeyDAL,alertChannelRecipientDAL,@@ -142,7 +152,10 @@ export const ldapConfigServiceFactory = ({loginService,emailDomainDAL,telemetryService,- usageMeteringService+ usageMeteringService,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service}: TLdapConfigServiceFactoryDep) => {const createLdapCfg = async ({actor,@@ -659,6 +672,7 @@ export const ldapConfigServiceFactory = ({}await licenseService.updateSubscriptionOrgMemberCount(organization.id);+ const pamCancellations: (() => void)[] = [];let user = await userDAL.transaction(async (tx) => {const newUser = await userDAL.findOne({ id: userAlias.userId }, tx);if (groups && !isStaleAlias) {@@ -720,7 +734,7 @@ export const ldapConfigServiceFactory = ({for await (const group of groupsCurrentlyPartOf) {if (!toBePartOfGroupIdsSet.has(group.id)) {// remove user from group that they should no longer be part of- await removeUsersFromGroupByUserIds({+ const { sendPamCancellations } = await removeUsersFromGroupByUserIds({group,userIds: [newUser.id],userDAL,@@ -730,14 +744,21 @@ export const ldapConfigServiceFactory = ({additionalPrivilegeDAL,usageMeteringService,alertChannelRecipientDAL,+ membershipDAL,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service,tx});+ pamCancellations.push(sendPamCancellations);}}}return newUser;});+ pamCancellations.forEach((send) => send());// When SSO is enforced, mark the user + alias as verified/accepted before issuing a session.if (skipEmailVerification) {diff --git a/backend/src/ee/services/oidc/oidc-config-service.ts b/backend/src/ee/services/oidc/oidc-config-service.tsindex fb6c5a2c5a..a24bf1cd7c 100644--- a/backend/src/ee/services/oidc/oidc-config-service.ts+++ b/backend/src/ee/services/oidc/oidc-config-service.ts@@ -6,11 +6,14 @@ import { Issuer, Issuer as OpenIdIssuer, Strategy as OpenIdStrategy, TokenSet }import { AccessScope, OrganizationActionScope, OrgMembershipStatus, TableName, TUsers } from "@app/db/schemas";import { TOidcConfigsUpdate } from "@app/db/schemas/oidc-configs";import { EventType, TAuditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-types";+import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";import { TGroupDALFactory } from "@app/ee/services/group/group-dal";import { addUsersToGroupByUserIds, removeUsersFromGroupByUserIds } from "@app/ee/services/group/group-fns";import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";import { getEnforcedIdentityLimit, throwOnPlanSeatLimitReached } from "@app/ee/services/license/license-fns";import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";+import { TPamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";+import { TPamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";import { OrgPermissionSsoActions, OrgPermissionSubjects } from "@app/ee/services/permission/org-permission";import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";import { getConfig } from "@app/lib/config/env";@@ -44,6 +47,7 @@ import { TokenType } from "@app/services/auth-token/auth-token-types";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";import { TOrgDALFactory } from "@app/services/org/org-dal";@@ -97,7 +101,8 @@ type TOidcConfigServiceFactoryDep = {"createMembership" | "updateMembershipById" | "findMembership" | "findOrgById" | "findOne" | "find" | "updateById">;membershipGroupDAL: Pick<TMembershipGroupDALFactory, "find">;- membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create">;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "find">;licenseService: Pick<TLicenseServiceFactory, "getPlan" | "getOrgSeatUsage" | "updateSubscriptionOrgMemberCount">;tokenService: Pick<TAuthTokenServiceFactory, "createTokenForUser">;smtpService: Pick<TSmtpService, "sendMail" | "verify">;@@ -124,6 +129,9 @@ type TOidcConfigServiceFactoryDep = {emailDomainDAL: Pick<TEmailDomainDALFactory, "findOne">;telemetryService: Pick<TTelemetryServiceFactory, "sendPostHogEvents">;usageMeteringService: Pick<TUsageMeteringServiceFactory, "emit">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export type TOidcConfigServiceFactory = ReturnType<typeof oidcConfigServiceFactory>;@@ -141,6 +149,7 @@ export const oidcConfigServiceFactory = ({userGroupMembershipDAL,groupDAL,membershipGroupDAL,+ membershipDAL,membershipRoleDAL,projectKeyDAL,alertChannelRecipientDAL,@@ -151,7 +160,10 @@ export const oidcConfigServiceFactory = ({loginService,emailDomainDAL,telemetryService,- usageMeteringService+ usageMeteringService,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service}: TOidcConfigServiceFactoryDep) => {const getOidc = async (dto: TGetOidcCfgDTO) => {const oidcCfg = await oidcConfigDAL.findOne({@@ -495,7 +507,7 @@ export const oidcConfigServiceFactory = ({}for await (const group of groupsToRemoveUserFrom) {- await removeUsersFromGroupByUserIds({+ const { sendPamCancellations } = await removeUsersFromGroupByUserIds({userIds: [user.id],group,userDAL,@@ -504,8 +516,14 @@ export const oidcConfigServiceFactory = ({projectKeyDAL,additionalPrivilegeDAL,usageMeteringService,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ membershipDAL,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service});+ sendPamCancellations();}if (groupsToRemoveUserFrom.length) {diff --git a/backend/src/ee/services/pam-session/pam-session-access-fns.ts b/backend/src/ee/services/pam-session/pam-session-access-fns.tsindex 4f7fa8a0c0..0cafd03e81 100644--- a/backend/src/ee/services/pam-session/pam-session-access-fns.ts+++ b/backend/src/ee/services/pam-session/pam-session-access-fns.ts@@ -47,8 +47,9 @@ type TTerminatePamSessionsWithoutLaunchAccessDTO = {projectId: string;// The actors whose access just changed, users and machine identities alike.actors: TPamSessionActor[];- // The admin who made the access change; named as the terminating actor on the gateway signal.- actorId: string;+ // The admin who made the access change; named as the terminating actor on the gateway signal. Absent when+ // SCIM or an IdP group sync made it.+ actorId?: string;membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;membershipRoleDAL: Pick<TMembershipRoleDALFactory, "find">;pamAccountDAL: Pick<TPamAccountDALFactory, "find">;@@ -145,10 +146,10 @@ export const terminatePamSessionsWithoutLaunchAccess = async ({});if (revoked.length === 0) return noop;- const actor = await userDAL.findById(actorId, tx);+ const actor = actorId ? await userDAL.findById(actorId, tx) : undefined;return terminatePamSessions({sessions: revoked,- actorId,+ actorId: actorId ?? "",actorEmail: actor?.email ?? "",pamSessionDAL,gatewayV2Service,@@ -156,6 +157,57 @@ export const terminatePamSessionsWithoutLaunchAccess = async ({});};+type TTerminatePamSessionsLosingGroupAccessDTO = Omit<+ TTerminatePamSessionsWithoutLaunchAccessDTO,+ "projectId" | "actors"+> & {+ userIds: string[];+ identityIds?: string[];+};++// A group can reach PAM projects in sub-orgs it is linked into, so this re-checks every project the actors hold a+// live session in. Same transaction contract as terminatePamSessionsWithoutLaunchAccess.+export const terminatePamSessionsLosingGroupAccess = async ({+ userIds,+ identityIds = [],+ pamSessionDAL,+ tx,+ ...deps+}: TTerminatePamSessionsLosingGroupAccessDTO): Promise<() => void> => {+ const userSessions = userIds.length+ ? await pamSessionDAL.find({ $in: { userId: userIds, status: LIVE_PAM_SESSION_STATUSES } }, { tx })+ : [];+ const identitySessions = identityIds.length+ ? await pamSessionDAL.find({ $in: { identityId: identityIds, status: LIVE_PAM_SESSION_STATUSES } }, { tx })+ : [];++ const actorsByProject = new Map<string, Map<string, TPamSessionActor>>();+ for (const session of [...userSessions, ...identitySessions]) {+ const sessionActor = resolveSessionActor(session);+ if (sessionActor) {+ const projectActors = actorsByProject.get(session.projectId) ?? new Map<string, TPamSessionActor>();+ projectActors.set(pamActorKey(sessionActor), sessionActor);+ actorsByProject.set(session.projectId, projectActors);+ }+ }++ const sendCancellations: (() => void)[] = [];+ for (const [projectId, projectActors] of actorsByProject) {+ sendCancellations.push(+ // eslint-disable-next-line no-await-in-loop+ await terminatePamSessionsWithoutLaunchAccess({+ ...deps,+ projectId,+ actors: [...projectActors.values()],+ pamSessionDAL,+ tx+ })+ );+ }++ return () => sendCancellations.forEach((send) => send());+};+type TTerminatePamSessionsForUsersDTO = {orgIds: string[];userIds: string[];diff --git a/backend/src/ee/services/pam-session/pam-session-service.ts b/backend/src/ee/services/pam-session/pam-session-service.tsindex 580007e367..9aa6fa9818 100644--- a/backend/src/ee/services/pam-session/pam-session-service.ts+++ b/backend/src/ee/services/pam-session/pam-session-service.ts@@ -32,6 +32,7 @@ import { resolveAccountByPath as resolveAccountByPathFn } from "../pam/pam-fns";import { enforceMfa } from "../pam/pam-mfa";import {checkAccountAccess,+ getLaunchAccessRemainingMs,getResourceIdsWithActions,TActorContext,verifyProductMembership@@ -527,6 +528,20 @@ export const pamSessionServiceFactory = ({sessionDurationMs = Math.min(parsed, maxDurationMs);}+ const launchAccessRemainingMs = await getLaunchAccessRemainingMs(+ membershipDAL,+ membershipRoleDAL,+ projectId,+ account,+ actor+ );+ if (launchAccessRemainingMs !== null) {+ if (launchAccessRemainingMs <= 0) {+ throw new ForbiddenRequestError({ message: "Your access to this account is no longer active" });+ }+ sessionDurationMs = Math.min(sessionDurationMs, launchAccessRemainingMs);+ }+// The approval gate comes before the launch-reason check: a user without a grant should be// guided into requesting access (where the request reason is collected) rather than being// blocked on a launch reason for a session they cannot start yet.diff --git a/backend/src/ee/services/pam-web-access/pam-web-access-service.ts b/backend/src/ee/services/pam-web-access/pam-web-access-service.tsindex db9ec4f0e9..152762ce50 100644--- a/backend/src/ee/services/pam-web-access/pam-web-access-service.ts+++ b/backend/src/ee/services/pam-web-access/pam-web-access-service.ts@@ -21,6 +21,7 @@ import { TokenType } from "@app/services/auth-token/auth-token-types";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";import { TMembershipDALFactory } from "@app/services/membership/membership-dal";+import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TMfaSessionServiceFactory } from "@app/services/mfa-session/mfa-session-service";import { TOrgDALFactory } from "@app/services/org/org-dal";import { TTelemetryServiceFactory } from "@app/services/telemetry/telemetry-service";@@ -32,7 +33,7 @@ import {PamSessionEndReason,PamSessionStatus} from "../pam/pam-enums";-import { checkAccountAccess } from "../pam/pam-permission";+import { checkAccountAccess, getLaunchAccessRemainingMs } from "../pam/pam-permission";import { TPamAccessRequestServiceFactory } from "../pam-access-request/pam-access-request-service";import { TPamAccountDALFactory } from "../pam-account/pam-account-dal";import {@@ -78,7 +79,8 @@ type TPamWebAccessServiceFactoryDep = {| "updateById"| "transaction">;- membershipDAL: Pick<TMembershipDALFactory, "lockOrgMembershipForUser">;+ membershipDAL: Pick<TMembershipDALFactory, "lockOrgMembershipForUser" | "findResourceMembershipsForActor">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "find">;gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;gatewayPoolService: Pick<TGatewayPoolServiceFactory, "resolveEffectiveGatewayId" | "runWithPoolFailover">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;@@ -126,6 +128,7 @@ export const pamWebAccessServiceFactory = ({mfaSessionService,orgDAL,membershipDAL,+ membershipRoleDAL,telemetryService}: TPamWebAccessServiceFactoryDep) => {const decrypt = async (projectId: string, blob: Buffer): Promise<Record<string, unknown>> => {@@ -232,6 +235,20 @@ export const pamWebAccessServiceFactory = ({}}+ const launchAccessRemainingMs = await getLaunchAccessRemainingMs(+ membershipDAL,+ membershipRoleDAL,+ projectId,+ account,+ {+ actor: actor.type,+ actorId: actor.id+ }+ );+ if (launchAccessRemainingMs !== null && launchAccessRemainingMs <= 0) {+ throw new ForbiddenRequestError({ message: "Your access to this account is no longer active" });+ }+enforceRecordingConfig(account);const connectionDetails = await decrypt(projectId, account.encryptedConnectionDetails);@@ -272,6 +289,9 @@ export const pamWebAccessServiceFactory = ({if (grantRemainingMs !== null) {maxSessionDurationMs = Math.min(maxSessionDurationMs, grantRemainingMs);}+ if (launchAccessRemainingMs !== null) {+ maxSessionDurationMs = Math.min(maxSessionDurationMs, launchAccessRemainingMs);+ }await pamSessionDAL.endExpiredWebSessions(actor.id, projectId);const activeCount = await pamSessionDAL.countActiveWebSessions(actor.id, projectId);@@ -492,6 +512,28 @@ export const pamWebAccessServiceFactory = ({}}+ const launchAccessRemainingMs = await getLaunchAccessRemainingMs(+ membershipDAL,+ membershipRoleDAL,+ projectId,+ account,+ {+ actor: ActorType.USER,+ actorId: userId+ }+ );+ if (launchAccessRemainingMs !== null) {+ if (launchAccessRemainingMs <= 0) {+ sendMessage(socket, {+ type: TerminalServerMessageType.Output,+ data: `${SessionEndReason.AccessRevoked}\n`+ });+ sendSessionEndAndClose(socket, SessionEndReason.AccessRevoked);+ return;+ }+ sessionDurationCapMs = Math.min(sessionDurationCapMs, launchAccessRemainingMs);+ }+const effectiveGatewayId = await gatewayPoolService.resolveEffectiveGatewayId({gatewayId: account.gatewayId ?? account.templateGatewayId,gatewayPoolId: account.gatewayPoolId ?? account.templateGatewayPoolIddiff --git a/backend/src/ee/services/pam-web-access/pam-web-access-types.ts b/backend/src/ee/services/pam-web-access/pam-web-access-types.tsindex 55dafce42f..a114e87afc 100644--- a/backend/src/ee/services/pam-web-access/pam-web-access-types.ts+++ b/backend/src/ee/services/pam-web-access/pam-web-access-types.ts@@ -12,6 +12,7 @@ export enum SessionEndReason {IdleTimeout = "Session closed due to inactivity",SessionLimitReached = "Maximum concurrent sessions reached",ApprovalRevoked = "Your approved access is no longer active",+ AccessRevoked = "Your access to this account is no longer active",Terminated = "This session was terminated",ReplyTooLarge = "The reply was too large to read safely. Use the Infisical CLI for data this size"}diff --git a/backend/src/ee/services/pam/CLAUDE.md b/backend/src/ee/services/pam/CLAUDE.mdindex c0be99f60b..be8caf969e 100644--- a/backend/src/ee/services/pam/CLAUDE.md+++ b/backend/src/ee/services/pam/CLAUDE.md@@ -234,15 +234,17 @@ are reused from `app-connection/shared/sql`, and rotation is brokered through th## Sessions`pam-session/` + `pam-web-access/`. Sessions reference accounts via nullable `accountId` (history survives-account deletion). Duration is capped at the template max; expiration is enforced by a delayed BullMQ job-scheduled at session creation.+account deletion). Duration is capped at the template max, the approval grant's expiry and the end of a+temporary folder or account membership (`getLaunchAccessRemainingMs`), since nothing ends a session when a+membership lapses on its own; expiration is enforced by a delayed BullMQ job scheduled at session creation.**Nothing re-checks the actor mid-session**, so every path that takes access away has to close sessions-itself. `pam-session-access-fns.ts` holds the two: `terminatePamSessionsWithoutLaunchAccess` re-derives-`LaunchSessions` after a membership or role change, and `terminatePamSessionsForUsers` drops everything a-user holds when they leave the org (SCIM deactivate/delete, org deactivate/remove). Both run inside the-caller's transaction and hand back a callback to fire after COMMIT — the row flip rolls back, the gateway-signal does not.+itself. `pam-session-access-fns.ts` holds the helpers: `terminatePamSessionsWithoutLaunchAccess` re-derives+`LaunchSessions` after a membership or role change, `terminatePamSessionsLosingGroupAccess` runs it for group+changes made outside PAM (removal from a group, group delete or sub-org unlink, including SCIM and IdP sync),+and `terminatePamSessionsForUsers` drops everything a user holds when they leave the org (SCIM+deactivate/delete, org deactivate/remove). All run inside the caller's transaction and hand back a callback+to fire after COMMIT — the row flip rolls back, the gateway signal does not.**An orphaned session (null `accountId`) is scoped to product admin.** Everyresource-scoped predicate is false once the FK is nulled, so `PamProductRole.Admin` stands in on thediff --git a/backend/src/ee/services/pam/pam-permission.ts b/backend/src/ee/services/pam/pam-permission.tsindex 29b40dfffb..2f977d7847 100644--- a/backend/src/ee/services/pam/pam-permission.ts+++ b/backend/src/ee/services/pam/pam-permission.ts@@ -9,6 +9,7 @@ import { ActorAuthMethod, ActorType } from "@app/services/auth/auth-type";import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";+import { isActiveRole } from "../permission/permission-fns";import { resolveResourceRoleRules } from "../permission/permission-service";import {ResourcePermissionPamResourceActions,@@ -128,6 +129,48 @@ export const checkAccountAccess = async (ForbiddenError.from(permission).throwUnlessCan(action, ResourcePermissionSub.PamResource);};+// 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 (+ membershipDAL: TMembershipDep,+ membershipRoleDAL: TMembershipRoleDep,+ projectId: string,+ 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 roles = await membershipRoleDAL.find({ $in: { membershipId: memberships.map((m) => m.id) } });+ const grantingRoles = roles.filter(+ (r) => isActiveRole(r) && pamRoleHasAction(r.role, ResourcePermissionPamResourceActions.LaunchSessions)+ );+ if (grantingRoles.some((r) => !r.isTemporary)) return null;++ const endsAt = Math.max(0, ...grantingRoles.map((r) => new Date(r.temporaryAccessEndTime ?? 0).getTime()));+ return Math.max(0, endsAt - Date.now());+};+// Non-throwing counterpart to checkAccountAccess, for deciding what a caller may do.export const accountAccessAllows = async (permissionService: TPermissionDep,diff --git a/backend/src/ee/services/saml-config/saml-config-service.ts b/backend/src/ee/services/saml-config/saml-config-service.tsindex 8b513b69c7..e008e30fa0 100644--- a/backend/src/ee/services/saml-config/saml-config-service.ts+++ b/backend/src/ee/services/saml-config/saml-config-service.ts@@ -31,6 +31,7 @@ import { TIdentityMetadataDALFactory } from "@app/services/identity/identity-metimport { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";import { TOrgDALFactory } from "@app/services/org/org-dal";@@ -50,10 +51,13 @@ import { UserAliasType } from "@app/services/user-alias/user-alias-types";import { TEmailDomainDALFactory } from "../email-domain/email-domain-dal";import { findOrgIdByVerifiedDomain, verifyEmailDomainOwnership } from "../email-domain/email-domain-fns";+import { TGatewayV2ServiceFactory } from "../gateway-v2/gateway-v2-service";import { TGroupDALFactory } from "../group/group-dal";import { addUsersToGroupByUserIds, removeUsersFromGroupByUserIds } from "../group/group-fns";import { TUserGroupMembershipDALFactory } from "../group/user-group-membership-dal";import { TLicenseServiceFactory } from "../license/license-service";+import { TPamAccountDALFactory } from "../pam-account/pam-account-dal";+import { TPamSessionDALFactory } from "../pam-session/pam-session-dal";import { OrgPermissionSsoActions, OrgPermissionSubjects } from "../permission/org-permission";import { TPermissionServiceFactory } from "../permission/permission-service-types";import { TSamlConfigDALFactory } from "./saml-config-dal";@@ -82,7 +86,8 @@ type TSamlConfigServiceFactoryDep = {"createMembership" | "updateMembershipById" | "findMembership" | "findOrgById" | "findOne" | "updateById">;identityMetadataDAL: Pick<TIdentityMetadataDALFactory, "delete" | "insertMany" | "transaction">;- membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create">;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "find">;permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;licenseService: Pick<TLicenseServiceFactory, "getPlan" | "getOrgSeatUsage" | "updateSubscriptionOrgMemberCount">;@@ -103,6 +108,9 @@ type TSamlConfigServiceFactoryDep = {emailDomainDAL: Pick<TEmailDomainDALFactory, "findOne">;telemetryService: Pick<TTelemetryServiceFactory, "sendPostHogEvents">;usageMeteringService: Pick<TUsageMeteringServiceFactory, "emit">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;};export const samlConfigServiceFactory = ({@@ -124,12 +132,16 @@ export const samlConfigServiceFactory = ({smtpService,identityMetadataDAL,kmsService,+ membershipDAL,membershipRoleDAL,membershipGroupDAL,loginService,emailDomainDAL,telemetryService,- usageMeteringService+ usageMeteringService,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service}: TSamlConfigServiceFactoryDep): TSamlConfigServiceFactory => {const parseSamlGroups = (groupsValue: string): string[] => {let samlGroups: string[] = [];@@ -167,6 +179,8 @@ export const samlConfigServiceFactory = ({samlGroups: string[];tx?: Knex;}) => {+ const pamCancellations: (() => void)[] = [];+const processGroupSync = async (transaction: Knex) => {const currentGroupMemberships = await userGroupMembershipDAL.find({@@ -255,7 +269,7 @@ export const samlConfigServiceFactory = ({const group = orgGroupsMap.get(groupName);if (group) {try {- await removeUsersFromGroupByUserIds({+ const { sendPamCancellations } = await removeUsersFromGroupByUserIds({userIds: [userId],group,userDAL,@@ -265,8 +279,14 @@ export const samlConfigServiceFactory = ({additionalPrivilegeDAL,usageMeteringService,alertChannelRecipientDAL,+ membershipDAL,+ membershipRoleDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service,tx: transaction});+ pamCancellations.push(sendPamCancellations);} catch (error) {// Continue if user not in group}@@ -280,6 +300,8 @@ export const samlConfigServiceFactory = ({} else {await userDAL.transaction(processGroupSync);}++ return () => pamCancellations.forEach((send) => send());};const createSamlCfg: TSamlConfigServiceFactory["createSamlCfg"] = async ({@@ -580,6 +602,7 @@ export const samlConfigServiceFactory = ({const identityLimit = getEnforcedIdentityLimit(plan);let user: TUsers;+ let sendPamCancellations = () => {};if (userAlias) {const foundUser = await userDAL.findById(userAlias.userId);// Verify the existing user's stored email domain + cross-org check@@ -651,7 +674,7 @@ export const samlConfigServiceFactory = ({if (shouldSyncGroups && metadata && foundUser.id) {const samlGroups = groupsMetadata?.value ? parseSamlGroups(groupsMetadata.value) : [];- await syncUserGroupMemberships({+ sendPamCancellations = await syncUserGroupMemberships({userId: foundUser.id,orgId,samlGroups,@@ -758,7 +781,7 @@ export const samlConfigServiceFactory = ({if (shouldSyncGroups && metadata && newUser.id) {const samlGroups = groupsMetadata?.value ? parseSamlGroups(groupsMetadata.value) : [];- await syncUserGroupMemberships({+ sendPamCancellations = await syncUserGroupMemberships({userId: newUser.id,orgId,samlGroups,@@ -782,6 +805,8 @@ export const samlConfigServiceFactory = ({});}}+ sendPamCancellations();+await licenseService.updateSubscriptionOrgMemberCount(organization.id);await samlConfigDAL.update({ orgId }, { lastUsed: new Date() });diff --git a/backend/src/ee/services/scim/scim-service.ts b/backend/src/ee/services/scim/scim-service.tsindex 488dc2651f..08eea13a6c 100644--- a/backend/src/ee/services/scim/scim-service.ts+++ b/backend/src/ee/services/scim/scim-service.ts@@ -19,7 +19,11 @@ import { addUsersToGroupByUserIds, removeUsersFromGroupByUserIds } from "@app/eeimport { reapDeletedGroupFolderGrants } 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 { terminatePamSessionsForUsers } from "@app/ee/services/pam-session/pam-session-access-fns";+import { TPamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";+import {+ terminatePamSessionsForUsers,+ terminatePamSessionsLosingGroupAccess+} from "@app/ee/services/pam-session/pam-session-access-fns";import { TPamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";import { TScimDALFactory } from "@app/ee/services/scim/scim-dal";import { PgSqlLock } from "@app/keystore/keystore";@@ -44,6 +48,7 @@ import { AuthTokenType } from "@app/services/auth/auth-type";import { TExternalGroupOrgRoleMappingDALFactory } from "@app/services/external-group-org-role-mapping/external-group-org-role-mapping-dal";import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";import { TMembershipUserDALFactory } from "@app/services/membership-user/membership-user-dal";@@ -135,6 +140,7 @@ type TScimServiceFactoryDep = {>;membershipGroupDAL: Pick<TMembershipGroupDALFactory, "find" | "create">;identityGroupMembershipDAL: Pick<TIdentityGroupMembershipDALFactory, "find" | "filterProjectsByIdentityMembership">;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActors">;membershipRoleDAL: TMembershipRoleDALFactory;userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory,@@ -155,7 +161,8 @@ type TScimServiceFactoryDep = {additionalPrivilegeDAL: TAdditionalPrivilegeDALFactory;approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "deleteUserStepApproversInProjects">;alertChannelRecipientDAL: Pick<TAlertChannelRecipientDALFactory, "pruneOutOfScopeRecipients" | "deleteByPrincipals">;- pamSessionDAL: Pick<TPamSessionDALFactory, "findLiveByOrgAndUserIds" | "update">;+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "findLiveByOrgAndUserIds" | "update">;+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;scimEventsDAL: Pick<TScimEventsDALFactory, "create" | "findEventsByOrgId">;emailDomainDAL: Pick<TEmailDomainDALFactory, "findOne">;@@ -180,6 +187,7 @@ export const scimServiceFactory = ({membershipGroupDAL,identityGroupMembershipDAL,membershipUserDAL,+ membershipDAL,membershipRoleDAL,additionalPrivilegeDAL,approvalPolicyDAL,@@ -189,8 +197,11 @@ export const scimServiceFactory = ({telemetryService,usageMeteringService,pamSessionDAL,+ pamAccountDAL,gatewayV2Service}: TScimServiceFactoryDep): TScimServiceFactory => {+ const pamSessionDeps = { membershipDAL, membershipRoleDAL, pamAccountDAL, pamSessionDAL, userDAL, gatewayV2Service };+const createScimToken: TScimServiceFactory["createScimToken"] = async ({actor,actorId,@@ -1479,6 +1490,8 @@ export const scimServiceFactory = ({tx: outerTx}: { displayName: string; members: { value: string }[]; shouldFailOnMissingMembers?: boolean; tx?: Knex }) => {+ let sendPamCancellations = () => {};+const processReplacement = async (tx: Knex) => {let group = isUuidV4(groupId)? await groupDAL.findOne(@@ -1593,19 +1606,19 @@ export const scimServiceFactory = ({}if (toRemoveUserIds.length) {- await removeUsersFromGroupByUserIds({+ ({ sendPamCancellations } = await removeUsersFromGroupByUserIds({usageMeteringService,group,userIds: toRemoveUserIds,- userDAL,userGroupMembershipDAL,membershipGroupDAL,projectKeyDAL,additionalPrivilegeDAL,alertChannelRecipientDAL,+ ...pamSessionDeps,tx,shouldFailOnMissingMembers- });+ }));}return group;@@ -1623,7 +1636,7 @@ export const scimServiceFactory = ({});}- return updatedGroup;+ return { group: updatedGroup, sendPamCancellations };};const replaceScimGroup: TScimServiceFactory["replaceScimGroup"] = async ({@@ -1652,20 +1665,22 @@ export const scimServiceFactory = ({status: 403});- const { updatedGroup, appliedMembers } = await groupDAL.transaction(async (tx) => {+ const { updatedGroup, appliedMembers, sendPamCancellations } = await groupDAL.transaction(async (tx) => {// Acquire advisory lock to serialize concurrent SCIM PUT requests for the same groupawait tx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.ScimGroupUpdate(groupId)]);- const group = await $replaceGroupDAL(groupId, orgId, {+ const { group, sendPamCancellations: sendCancellations } = await $replaceGroupDAL(groupId, orgId, {displayName,members,shouldFailOnMissingMembers: false,tx});const groupMembers = await userGroupMembershipDAL.findGroupMembershipsByGroupIdInOrg(group.id, orgId, tx);- return { updatedGroup: group, appliedMembers: groupMembers };+ return { updatedGroup: group, appliedMembers: groupMembers, sendPamCancellations: sendCancellations };});+ sendPamCancellations();+await scimEventsDAL.create({orgId,eventType: ScimEvent.REPLACE_GROUP,@@ -1711,7 +1726,7 @@ export const scimServiceFactory = ({status: 403});- const { scimGroup, updatedScimMembers } = await groupDAL.transaction(async (tx) => {+ const { scimGroup, updatedScimMembers, sendPamCancellations } = await groupDAL.transaction(async (tx) => {// Acquire advisory lock to serialize concurrent SCIM PATCH requests for the same groupawait tx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.ScimGroupUpdate(groupId)]);@@ -1745,7 +1760,7 @@ export const scimServiceFactory = ({applyScimPatch(patchedScimGroup, operations);// Apply the patched state with idempotent operations- await $replaceGroupDAL(groupId, orgId, {+ const { sendPamCancellations: sendCancellations } = await $replaceGroupDAL(groupId, orgId, {displayName: patchedScimGroup.displayName,members: patchedScimGroup.members,shouldFailOnMissingMembers: false,@@ -1754,9 +1769,11 @@ export const scimServiceFactory = ({const finalMembers = await userGroupMembershipDAL.findGroupMembershipsByGroupIdInOrg(group.id, orgId, tx);- return { scimGroup: patchedScimGroup, updatedScimMembers: finalMembers };+ return { scimGroup: patchedScimGroup, updatedScimMembers: finalMembers, sendPamCancellations: sendCancellations };});+ sendPamCancellations();+await scimEventsDAL.create({orgId,eventType: ScimEvent.UPDATE_GROUP,@@ -1790,6 +1807,8 @@ export const scimServiceFactory = ({status: 403});+ let sendPamCancellations = () => {};+const [group] = await groupDAL.transaction(async (tx) => {if (!isUuidV4(groupId)) return [];@@ -1799,6 +1818,11 @@ export const scimServiceFactory = ({tx);+ const [groupUsers, groupIdentities] = await Promise.all([+ userGroupMembershipDAL.find({ groupId }, { tx }),+ identityGroupMembershipDAL.find({ groupId }, { tx })+ ]);+await reapDeletedGroupFolderGrants({ userGroupMembershipDAL, identityGroupMembershipDAL, membershipGroupDAL, additionalPrivilegeDAL },groupId,@@ -1810,9 +1834,18 @@ export const scimServiceFactory = ({await finalizeAlertRecipients();+ sendPamCancellations = await terminatePamSessionsLosingGroupAccess({+ userIds: groupUsers.map((m) => m.userId),+ identityIds: groupIdentities.map((m) => m.identityId),+ ...pamSessionDeps,+ tx+ });+return deleted;});+ sendPamCancellations();+if (!group) {await scimEventsDAL.create({orgId,diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 9a33acae17..9b6d05bd53 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -1395,7 +1395,10 @@ export const registerRoutes = async (membershipRoleDAL,usageMeteringService,identityAccessTokenService,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service: deferredGatewayV2Service});const groupProjectService = groupProjectServiceFactory({groupDAL,@@ -1473,6 +1476,7 @@ export const registerRoutes = async (externalGroupOrgRoleMappingDAL,groupDAL,membershipGroupDAL,+ membershipDAL,membershipRoleDAL,membershipUserDAL,additionalPrivilegeDAL,@@ -1482,6 +1486,7 @@ export const registerRoutes = async (telemetryService,usageMeteringService,pamSessionDAL,+ pamAccountDAL,gatewayV2Service: deferredGatewayV2Service});@@ -1600,13 +1605,17 @@ export const registerRoutes = async (tokenService,smtpService,kmsService,+ membershipDAL,membershipRoleDAL,membershipGroupDAL,loginService,emailDomainDAL,telemetryService,usageMeteringService,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service: deferredGatewayV2Service});const ldapService = ldapConfigServiceFactory({@@ -1628,12 +1637,16 @@ export const registerRoutes = async (smtpService,kmsService,membershipGroupDAL,+ membershipDAL,membershipRoleDAL,loginService,emailDomainDAL,telemetryService,usageMeteringService,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service: deferredGatewayV2Service});const passwordService = authPaswordServiceFactory({tokenService,@@ -3222,12 +3235,16 @@ export const registerRoutes = async (groupDAL,auditLogService,membershipGroupDAL,+ membershipDAL,membershipRoleDAL,loginService,emailDomainDAL,telemetryService,usageMeteringService,- alertChannelRecipientDAL+ alertChannelRecipientDAL,+ pamAccountDAL,+ pamSessionDAL,+ gatewayV2Service});const userActivationService = userActivationServiceFactory({@@ -4119,6 +4136,7 @@ export const registerRoutes = async (mfaSessionService,orgDAL,membershipDAL,+ membershipRoleDAL,telemetryService});