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 Roles" option doesn't work for custom roles #26842

Merged
merged 8 commits into from
Nov 19, 2022
Merged

[FIX] LDAP "Sync Roles" option doesn't work for custom roles #26842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2459945
send only ids when sync roles
LucianoPierdona Sep 9, 2022
1e3f4cb
Merge branch 'develop' into fix/custom-roles-sync
matheusbsilva137 Nov 7, 2022
9aad0a2
update projection
LucianoPierdona Nov 16, 2022
abaf26d
Merge remote-tracking branch 'origin/develop' into fix/custom-roles-sync
LucianoPierdona Nov 18, 2022
ca8f375
fix query for sync roles
LucianoPierdona Nov 18, 2022
77b15f1
add check for ids
LucianoPierdona Nov 18, 2022
1a73c8d
updated check to search by id first
LucianoPierdona Nov 18, 2022
f1cb52b
Merge branch 'develop' into fix/custom-roles-sync
kodiakhq[bot] Nov 19, 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
16 changes: 12 additions & 4 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 @@ -196,7 +196,8 @@ export class LDAPEEManager extends LDAPManager {
{},
{
projection: {
_updatedAt: 0,
_id: 1,
name: 1,
},
},
).toArray()) as Array<IRole>;
Expand All @@ -223,11 +224,18 @@ export class LDAPEEManager extends LDAPManager {
const userFields = ensureArray<string>(fieldMap[ldapField]);

for await (const userField of userFields) {
const [roleId] = userField.split(/\.(.+)/);
allowedRoles.push(roleId);
const [roleIdOrName] = userField.split(/\.(.+)/);

const role = roles.find((role) => role._id === roleIdOrName) ?? roles.find((role) => role.name === roleIdOrName);

if (role) {
allowedRoles.push(role._id);
}

if (await this.isUserInGroup(ldap, syncUserRolesBaseDN, syncUserRolesFilter, { dn, username }, ldapField)) {
roleList.push(roleId);
if (role) {
roleList.push(role._id);
}
continue;
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/server/models/raw/Roles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export class RolesRaw extends BaseRaw<IRole> implements IRolesModel {

findInIds<P>(ids: IRole['_id'][], options?: FindOptions<IRole>): P extends Pick<IRole, '_id'> ? FindCursor<P> : FindCursor<IRole> {
const query: Filter<IRole> = {
name: {
_id: {
$in: ids,
},
};
Expand Down