Skip to content

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

Merge remote-tracking branch 'origin/main' into PAM-531

Andreya9a26d7d2855
diff --cc backend/e2e-test/routes/v1/user-folder-access.spec.ts
index 8ed4abaf98,e5a48f9688..bc53e4a302
--- a/backend/e2e-test/routes/v1/user-folder-access.spec.ts
+++ b/backend/e2e-test/routes/v1/user-folder-access.spec.ts
@@@ -1109,11 -1107,7 +1111,12 @@@ describe("User folder access CRUD", ()
projectKeyDAL: projectKeyDALFactory(testDb),
additionalPrivilegeDAL: additionalPrivilegeDALFactory(testDb),
alertChannelRecipientDAL: alertChannelRecipientDALFactory(testDb),
- eventEmitter: { emit: async () => {} }
++ eventEmitter: { emit: async () => {} },
+ 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 --cc backend/src/ee/services/group/group-fns.ts
index 0c2a442340,0a5e3d0b2a..177ec0ce9d
--- a/backend/src/ee/services/group/group-fns.ts
+++ b/backend/src/ee/services/group/group-fns.ts
@@@ -6,8 -6,8 +6,9 @@@ import { BadRequestError, ForbiddenRequ
import { logger } from "@app/lib/logger";
import { recordLegacyRootKeyUsageMetric } from "@app/lib/telemetry/metrics";
import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";
+ import { emitGroupMembershipRemoved, toOrgMembershipActors } from "@app/services/org/org-membership-events";
+import { terminatePamSessionsLosingGroupAccess } from "../pam-session/pam-session-access-fns";
import {
TAddIdentitiesToGroup,
TAddUsersToGroup,
@@@ -393,9 -402,9 +403,10 @@@ export const addIdentitiesToGroup = asy
* 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
+ * Cleans up projects in every org the group reaches, not just its home org.
*/
export const removeUsersFromGroupByUserIds = async ({
group,
@@@ -410,11 -419,7 +422,12 @@@
shouldFailOnMissingMembers = true,
usageMeteringService,
alertChannelRecipientDAL,
- eventEmitter
++ eventEmitter,
+ membershipDAL,
+ membershipRoleDAL,
+ pamAccountDAL,
+ pamSessionDAL,
+ gatewayV2Service
}: TRemoveUsersFromGroupByUserIds) => {
const processRemoval = async (tx: Knex) => {
if (userIds.length === 0) {
@@@ -588,18 -592,16 +600,28 @@@
await alertChannelRecipientDAL.pruneOutOfScopeRecipients({ userIds: foundMembers.map((m) => m.id) }, tx);
+ await emitGroupMembershipRemoved(
+ eventEmitter,
+ {
+ groupId: group.id,
+ orgIds: await groupDAL.findGroupOrgIds(group.id, tx),
+ actors: toOrgMembershipActors({ 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);
diff --cc backend/src/ee/services/group/group-service.ts
index d3f6b45025,26d9da5c70..08cd317feb
--- a/backend/src/ee/services/group/group-service.ts
+++ b/backend/src/ee/services/group/group-service.ts
@@@ -104,14 -97,13 +101,13 @@@ type TGroupServiceFactoryDep =
| "findAllGroupProjects"
| "listAvailableGroups"
| "getGroupsReferencingGroup"
+ | "findGroupActorsAndOrgs"
+ | "findGroupOrgIds"
>;
- membershipGroupDAL: Pick<
- TMembershipGroupDALFactory,
- "find" | "findOne" | "create" | "getGroupById" | "deleteById" | "delete" | "findEffectiveInOrg"
- >;
+ membershipGroupDAL: Pick<TMembershipGroupDALFactory, "find" | "findOne" | "create" | "getGroupById">;
- 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">;
+ orgDAL: Pick<TOrgDALFactory, "findMembership" | "countAllOrgMembers" | "findById" | "lockActorsForOrgAccess">;
userGroupMembershipDAL: Pick<
TUserGroupMembershipDALFactory,
"findOne" | "delete" | "filterProjectsByUserMembership" | "transaction" | "insertMany" | "find"
@@@ -126,9 -118,8 +122,11 @@@
usageMeteringService: Pick<TUsageMeteringServiceFactory, "emit">;
identityAccessTokenService: Pick<TIdentityAccessTokenServiceFactory, "bumpIdentityRevocationVersion">;
alertChannelRecipientDAL: Pick<TAlertChannelRecipientDALFactory, "deleteByPrincipals" | "pruneOutOfScopeRecipients">;
+ eventEmitter: TEventEmitter;
+ membershipGroupService: Pick<TMembershipGroupServiceFactory, "detachGroupFromOrg" | "bumpIdentityRevocationVersions">;
+ pamAccountDAL: Pick<TPamAccountDALFactory, "find">;
+ pamSessionDAL: Pick<TPamSessionDALFactory, "find" | "update">;
+ gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;
};
export type TGroupServiceFactory = ReturnType<typeof groupServiceFactory>;
@@@ -153,12 -144,9 +151,14 @@@ export const groupServiceFactory = (
usageMeteringService,
identityAccessTokenService,
alertChannelRecipientDAL,
+ eventEmitter,
- membershipGroupService
++ membershipGroupService,
+ 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" });
@@@ -389,318 -377,9 +389,17 @@@
/**
* Delete a group owned by the current organization.
* Ensures the group is not linked by any sub-organizations before deleting.
+ * Folder grant cleanup and the actor/org read run before the delete, the cascade wipes what they read.
*/
- 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(", ");
@@@ -729,8 -400,14 +422,14 @@@
groupId,
tx
);
+ const { orgIds, userIds, identityIds } = await groupDAL.findGroupActorsAndOrgs(groupId, tx);
+ await emitGroupRemoved(
+ eventEmitter,
+ { groupId, orgIds, members: toOrgMembershipActors({ userIds, identityIds }) },
+ tx
+ );
- const [deletedGroup] = await groupDAL.delete(
+ const [deleted] = await groupDAL.delete(
{
id: groupId,
orgId: actorOrgId
@@@ -740,20 -417,8 +439,20 @@@
await finalizeAlertRecipients();
- return deletedGroup;
+ sendPamCancellations = await terminatePamSessionsLosingGroupAccess({
- userIds: groupUsers.map((m) => m.userId),
- identityIds: groupIdentities.map((m) => m.identityId),
++ userIds,
++ identityIds,
+ actorId,
+ ...pamSessionDeps,
+ tx
+ });
+
+ return deleted;
});
+
+ sendPamCancellations();
+
+ return deletedGroup;
};
const deleteGroup = async ({ id, actor, actorId, actorAuthMethod, actorOrgId }: TDeleteGroupDTO) => {
@@@ -805,12 -470,14 +504,25 @@@
const isLinkedGroup = group.orgId !== actorOrgId;
if (isLinkedGroup) {
- const unlinkedGroup = await unlinkGroupFromSubOrg({
- groupId: id,
- groupMembershipId: groupMembership.id,
- actorId,
- actorOrgId
+ const unlinkedGroup = await groupDAL.findById(id);
- const { identityIdsLosingOrgAccess } = await groupDAL.transaction((tx) =>
- membershipGroupService.detachGroupFromOrg(
++ let sendPamCancellations = () => {};
++ const { identityIdsLosingOrgAccess } = await groupDAL.transaction(async (tx) => {
++ const detached = await membershipGroupService.detachGroupFromOrg(
+ { groupId: id, orgId: actorOrgId, orgMembershipId: groupMembership.id },
+ 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.
usageMeteringService.emit(actorOrgId, SecretIdentities.key);
usageMeteringService.emit(actorOrgId, PamIdentities.key);
@@@ -1353,25 -1021,19 +1066,21 @@@
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,
+ groupDAL,
projectKeyDAL,
additionalPrivilegeDAL,
alertChannelRecipientDAL,
- eventEmitter
++ eventEmitter,
+ ...pamSessionDeps
});
+ sendPamCancellations();
- await cleanUpSubOrgProjectMemberships({
- groupId: id,
- userIds: [user.id],
- identityIds: []
- });
-
// The user may have left a secret-manager or PAM project it only reached through this group.
usageMeteringService.emit(actorOrgId, SecretIdentities.key);
usageMeteringService.emit(actorOrgId, PamIdentities.key);
@@@ -1450,21 -1112,12 +1159,17 @@@
identityIds: [identityId],
identityDAL,
membershipDAL,
+ groupDAL,
identityGroupMembershipDAL,
- additionalPrivilegeDAL
+ additionalPrivilegeDAL,
+ eventEmitter
});
+ const sendPamCancellations = await groupDAL.transaction((tx) =>
+ terminatePamSessionsLosingGroupAccess({ userIds: [], identityIds: [identityId], actorId, ...pamSessionDeps, tx })
+ );
+ sendPamCancellations();
+
- await cleanUpSubOrgProjectMemberships({
- groupId: id,
- userIds: [],
- identityIds: [identityId]
- });
-
// Losing a group can remove the identity's effective org access. Skipped when
// the group granted no org the identity lacks directly
if (await groupMembershipAffectsIdentityOrgAccess(id, identityId)) {
diff --cc backend/src/ee/services/group/group-types.ts
index 756e26bbc1,151e87cfde..f3bb36bec3
--- a/backend/src/ee/services/group/group-types.ts
+++ b/backend/src/ee/services/group/group-types.ts
@@@ -146,22 -147,17 +151,24 @@@ type TGroupOrgIdsDAL = { findGroupOrgId
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">;
+ groupDAL: TGroupOrgIdsDAL;
projectKeyDAL: Pick<TProjectKeyDALFactory, "delete">;
additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "delete">;
tx?: Knex;
shouldFailOnMissingMembers?: boolean;
usageMeteringService?: Pick<TUsageMeteringServiceFactory, "emit">;
alertChannelRecipientDAL: Pick<TAlertChannelRecipientDALFactory, "pruneOutOfScopeRecipients">;
+ eventEmitter: TEventEmitter;
+ 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 --cc backend/src/ee/services/ldap-config/ldap-config-service.ts
index 7bf2a613d0,40efde062b..c3c61d990c
--- a/backend/src/ee/services/ldap-config/ldap-config-service.ts
+++ b/backend/src/ee/services/ldap-config/ldap-config-service.ts
@@@ -84,14 -81,20 +85,21 @@@ type TLdapConfigServiceFactoryDep =
ldapGroupMapDAL: Pick<TLdapGroupMapDALFactory, "find" | "create" | "delete" | "findLdapGroupMapsByLdapConfigId">;
orgDAL: Pick<
TOrgDALFactory,
- "createMembership" | "updateMembershipById" | "findMembership" | "findOrgById" | "findOne" | "updateById"
+ | "createMembership"
+ | "updateMembershipById"
+ | "findMembership"
+ | "findOrgById"
+ | "findOne"
+ | "updateById"
+ | "lockActorsForOrgAccess"
>;
- groupDAL: Pick<TGroupDALFactory, "find" | "findOne">;
+ groupDAL: Pick<TGroupDALFactory, "find" | "findOne" | "findGroupOrgIds">;
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">;
+ eventEmitter: TEventEmitter;
projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;
projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
userGroupMembershipDAL: Pick<
@@@ -744,14 -747,9 +761,15 @@@ export const ldapConfigServiceFactory
additionalPrivilegeDAL,
usageMeteringService,
alertChannelRecipientDAL,
+ eventEmitter,
+ membershipDAL,
+ membershipRoleDAL,
+ pamAccountDAL,
+ pamSessionDAL,
+ gatewayV2Service,
tx
});
+ pamCancellations.push(sendPamCancellations);
}
}
}
diff --cc backend/src/ee/services/oidc/oidc-config-service.ts
index a24bf1cd7c,427b2cfae5..fa1fe95fa3
--- a/backend/src/ee/services/oidc/oidc-config-service.ts
+++ b/backend/src/ee/services/oidc/oidc-config-service.ts
@@@ -98,11 -95,17 +99,18 @@@ type TOidcConfigServiceFactoryDep =
userAliasDAL: Pick<TUserAliasDALFactory, "create" | "findOne" | "updateById">;
orgDAL: Pick<
TOrgDALFactory,
- "createMembership" | "updateMembershipById" | "findMembership" | "findOrgById" | "findOne" | "find" | "updateById"
+ | "createMembership"
+ | "updateMembershipById"
+ | "findMembership"
+ | "findOrgById"
+ | "findOne"
+ | "find"
+ | "updateById"
+ | "lockActorsForOrgAccess"
>;
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">;
@@@ -517,13 -516,8 +528,14 @@@ export const oidcConfigServiceFactory
additionalPrivilegeDAL,
usageMeteringService,
alertChannelRecipientDAL,
- eventEmitter
++ eventEmitter,
+ membershipDAL,
+ membershipRoleDAL,
+ pamAccountDAL,
+ pamSessionDAL,
+ gatewayV2Service
});
+ sendPamCancellations();
}
if (groupsToRemoveUserFrom.length) {
diff --cc backend/src/ee/services/saml-config/saml-config-service.ts
index e008e30fa0,d5d0f8dbf7..e3e05fa3f2
--- a/backend/src/ee/services/saml-config/saml-config-service.ts
+++ b/backend/src/ee/services/saml-config/saml-config-service.ts
@@@ -83,11 -80,16 +84,17 @@@ type TSamlConfigServiceFactoryDep =
userAliasDAL: Pick<TUserAliasDALFactory, "create" | "findOne" | "updateById">;
orgDAL: Pick<
TOrgDALFactory,
- "createMembership" | "updateMembershipById" | "findMembership" | "findOrgById" | "findOne" | "updateById"
+ | "createMembership"
+ | "updateMembershipById"
+ | "findMembership"
+ | "findOrgById"
+ | "findOne"
+ | "updateById"
+ | "lockActorsForOrgAccess"
>;
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">;
@@@ -268,28 -260,21 +274,27 @@@ export const samlConfigServiceFactory
if (groupName) {
const group = orgGroupsMap.get(groupName);
if (group) {
- try {
- const { sendPamCancellations } = await removeUsersFromGroupByUserIds({
- userIds: [userId],
- group,
- userDAL,
- userGroupMembershipDAL,
- membershipGroupDAL,
- projectKeyDAL,
- additionalPrivilegeDAL,
- usageMeteringService,
- alertChannelRecipientDAL,
- membershipDAL,
- membershipRoleDAL,
- pamAccountDAL,
- pamSessionDAL,
- gatewayV2Service,
- tx: transaction
- });
- pamCancellations.push(sendPamCancellations);
- } catch (error) {
- // Continue if user not in group
- }
- await removeUsersFromGroupByUserIds({
++ const { sendPamCancellations } = await removeUsersFromGroupByUserIds({
+ userIds: [userId],
+ group,
+ userDAL,
+ userGroupMembershipDAL,
+ membershipGroupDAL,
+ groupDAL,
+ projectKeyDAL,
+ additionalPrivilegeDAL,
+ usageMeteringService,
+ alertChannelRecipientDAL,
+ eventEmitter,
++ membershipDAL,
++ membershipRoleDAL,
++ pamAccountDAL,
++ pamSessionDAL,
++ gatewayV2Service,
+ shouldFailOnMissingMembers: false,
+ tx: transaction
+ });
++ pamCancellations.push(sendPamCancellations);
}
}
}
diff --cc backend/src/ee/services/scim/scim-service.ts
index 08eea13a6c,7b897869dd..a9c224e9a0
--- a/backend/src/ee/services/scim/scim-service.ts
+++ b/backend/src/ee/services/scim/scim-service.ts
@@@ -48,8 -45,8 +49,9 @@@ import { TEventEmitter } from "@app/ser
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 { TProjectAccessRevokeServiceFactory } from "@app/services/membership/project-access-revoke-service";
import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
import { TMembershipUserDALFactory } from "@app/services/membership-user/membership-user-dal";
import { assertWillRetainOrgAdmin } from "@app/services/membership-user/membership-user-fns";
@@@ -159,10 -159,10 +165,11 @@@ type TScimServiceFactoryDep =
smtpService: Pick<TSmtpService, "sendMail">;
externalGroupOrgRoleMappingDAL: TExternalGroupOrgRoleMappingDALFactory;
additionalPrivilegeDAL: TAdditionalPrivilegeDALFactory;
- approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "deleteUserStepApproversInProjects">;
+ projectAccessRevokeService: Pick<TProjectAccessRevokeServiceFactory, "revokeActorsInOrgs">;
+ auditLogService: Pick<TAuditLogServiceFactory, "createAuditLog">;
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">;
@@@ -187,21 -188,19 +195,23 @@@ export const scimServiceFactory = (
membershipGroupDAL,
identityGroupMembershipDAL,
membershipUserDAL,
+ membershipDAL,
membershipRoleDAL,
additionalPrivilegeDAL,
- approvalPolicyDAL,
+ projectAccessRevokeService,
+ auditLogService,
alertChannelRecipientDAL,
scimEventsDAL,
emailDomainDAL,
telemetryService,
usageMeteringService,
pamSessionDAL,
+ pamAccountDAL,
- gatewayV2Service
+ gatewayV2Service,
+ eventEmitter
}: TScimServiceFactoryDep): TScimServiceFactory => {
+ const pamSessionDeps = { membershipDAL, membershipRoleDAL, pamAccountDAL, pamSessionDAL, userDAL, gatewayV2Service };
+
const createScimToken: TScimServiceFactory["createScimToken"] = async ({
actor,
actorId,
@@@ -1610,17 -1559,61 +1572,61 @@@
usageMeteringService,
group,
userIds: toRemoveUserIds,
- userDAL,
userGroupMembershipDAL,
membershipGroupDAL,
+ groupDAL,
projectKeyDAL,
additionalPrivilegeDAL,
alertChannelRecipientDAL,
+ eventEmitter,
+ ...pamSessionDeps,
tx,
shouldFailOnMissingMembers
- });
+ }));
}
+ if (group.name !== displayName) {
+ const previousName = group.name;
+ const [modifiedGroup] = await groupDAL
+ .update(
+ {
+ id: groupId,
+ orgId
+ },
+ {
+ name: displayName
+ },
+ tx
+ )
+ .catch((err: unknown) => {
+ if (
+ err instanceof DatabaseError &&
+ (err.error as { code?: string })?.code === DatabaseErrorCode.UniqueViolation
+ ) {
+ throw new ScimRequestError({
+ detail: `Group with name '${displayName}' already exists in the organization`,
+ status: 409,
+ scimType: "uniqueness",
+ error: err
+ });
+ }
+ throw err;
+ });
+
+ await externalGroupOrgRoleMappingDAL.update(
+ {
+ groupName: previousName,
+ orgId
+ },
+ {
+ groupName: displayName
+ },
+ tx
+ );
+
+ group = modifiedGroup;
+ }
+
return group;
};
@@@ -1807,10 -1798,9 +1815,11 @@@
status: 403
});
+ let sendPamCancellations = () => {};
+
const [group] = await groupDAL.transaction(async (tx) => {
if (!isUuidV4(groupId)) return [];
+ if (!(await groupDAL.findOne({ id: groupId, orgId }, tx))) return [];
const finalizeAlertRecipients = await prepareDeletedGroupAlertRecipientCleanup(
{ userGroupMembershipDAL, alertChannelRecipientDAL },
@@@ -1834,13 -1825,6 +1844,13 @@@
await finalizeAlertRecipients();
+ sendPamCancellations = await terminatePamSessionsLosingGroupAccess({
- userIds: groupUsers.map((m) => m.userId),
- identityIds: groupIdentities.map((m) => m.identityId),
++ userIds,
++ identityIds,
+ ...pamSessionDeps,
+ tx
+ });
+
return deleted;
});
diff --cc backend/src/server/routes/index.ts
index 0b78ced0c2,fefd2b60a5..3b995c1d23
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@@ -1398,9 -1423,8 +1423,11 @@@ export const registerRoutes = async
usageMeteringService,
identityAccessTokenService,
alertChannelRecipientDAL,
+ eventEmitter: eventOutboxService,
- membershipGroupService
++ membershipGroupService,
+ pamAccountDAL,
+ pamSessionDAL,
+ gatewayV2Service: deferredGatewayV2Service
});
const groupProjectService = groupProjectServiceFactory({
groupDAL,
@@@ -1488,8 -1513,8 +1517,9 @@@
telemetryService,
usageMeteringService,
pamSessionDAL,
- pamAccountDAL,
- gatewayV2Service: deferredGatewayV2Service
+ gatewayV2Service: deferredGatewayV2Service,
- eventEmitter: eventOutboxService
++ eventEmitter: eventOutboxService,
++ pamAccountDAL
});
const githubOrgSyncConfigService = githubOrgSyncServiceFactory({
@@@ -1615,9 -1641,7 +1647,10 @@@
telemetryService,
usageMeteringService,
alertChannelRecipientDAL,
- eventEmitter: eventOutboxService
++ eventEmitter: eventOutboxService,
+ pamAccountDAL,
+ pamSessionDAL,
+ gatewayV2Service: deferredGatewayV2Service
});
const ldapService = ldapConfigServiceFactory({
@@@ -1646,9 -1669,7 +1679,10 @@@
telemetryService,
usageMeteringService,
alertChannelRecipientDAL,
- eventEmitter: eventOutboxService
++ eventEmitter: eventOutboxService,
+ pamAccountDAL,
+ pamSessionDAL,
+ gatewayV2Service: deferredGatewayV2Service
});
const passwordService = authPaswordServiceFactory({
tokenService,
@@@ -3244,9 -3324,7 +3338,10 @@@
telemetryService,
usageMeteringService,
alertChannelRecipientDAL,
- eventEmitter: eventOutboxService
++ eventEmitter: eventOutboxService,
+ pamAccountDAL,
+ pamSessionDAL,
+ gatewayV2Service
});
const userActivationService = userActivationServiceFactory({