Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] LDAP sync removing users from channels when multiple groups are mapped to it #25434

Merged
merged 2 commits into from
May 13, 2022
Merged

[FIX] LDAP sync removing users from channels when multiple groups are mapped to it #25434

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea5685d
[FIX] LDAP sync removing users from channels when multiple groups are…
pierre-lehnen-rc May 9, 2022
242af85
for await
pierre-lehnen-rc May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions apps/meteor/ee/server/lib/ldap/Manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@ export class LDAPEEManager extends LDAPManager {

logger.debug('syncing user channels');
const ldapFields = Object.keys(fieldMap);
const channelsToAdd = new Set<string>();
const channelsToRemove = new Set<string>();

for await (const ldapField of ldapFields) {
if (!fieldMap[ldapField]) {
Expand All @@ -299,21 +301,34 @@ export class LDAPEEManager extends LDAPManager {
if (room.teamMain) {
logger.error(`Can't add user to channel ${channel} because it is a team.`);
} else {
addUserToRoom(room._id, user);
logger.debug(`Synced user channel ${room._id} from LDAP for ${username}`);
channelsToAdd.add(room._id);
}
} else if (syncUserChannelsRemove && !room.teamMain) {
const subscription = await SubscriptionsRaw.findOneByRoomIdAndUserId(room._id, user._id);
if (subscription) {
await removeUserFromRoom(room._id, user);
}
channelsToRemove.add(room._id);
}
} catch (e) {
logger.debug(`Failed to sync user room, user = ${username}, channel = ${channel}`);
logger.error(e);
}
}
}

for (const rid of channelsToAdd) {
addUserToRoom(rid, user);
logger.debug(`Synced user channel ${rid} from LDAP for ${username}`);
}

for await (const rid of channelsToRemove) {
if (channelsToAdd.has(rid)) {
return;
}

const subscription = await SubscriptionsRaw.findOneByRoomIdAndUserId(rid, user._id);
if (subscription) {
await removeUserFromRoom(rid, user);
logger.debug(`Removed user ${username} from channel ${rid}`);
}
}
}

private static async syncUserTeams(ldap: LDAPConnection, user: IUser, dn: string, isNewRecord: boolean): Promise<void> {
Expand Down