amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-03 15:54:18 +00:00
Code Issues Projects Releases Wiki Activity

fix(calendar): prevent to return the same user twice in ldap groups

Browse Source
This commit is contained in:
Hivert Quentin
2024-10-29 17:14:25 +01:00
parent 1c611a0a4a
commit f1257088f2
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/LDAPSource.m
+14 -1
View File
@@ -2306,7 +2306,7 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
- (NSArray *) membersForGroupWithUID: (NSString *) uid - (NSArray *) membersForGroupWithUID: (NSString *) uid
{ {
NSMutableArray *dns, *uids; NSMutableArray *dns, *uids, *userLogins;
NSString *dn, *login; NSString *dn, *login;
SOGoUserManager *um; SOGoUserManager *um;
NSDictionary *d, *contactInfos; NSDictionary *d, *contactInfos;
@@ -2327,6 +2327,7 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
members = [NSMutableArray new]; members = [NSMutableArray new];
uids = [NSMutableArray array]; uids = [NSMutableArray array];
dns = [NSMutableArray array]; dns = [NSMutableArray array];
userLogins = [NSMutableArray array];
// We check if it's a static group // We check if it's a static group
// Fetch "members" - we get DNs // Fetch "members" - we get DNs
@@ -2358,6 +2359,12 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
pool = [NSAutoreleasePool new]; pool = [NSAutoreleasePool new];
dn = [dns objectAtIndex: i]; dn = [dns objectAtIndex: i];
login = [um getLoginForDN: [dn lowercaseString]]; login = [um getLoginForDN: [dn lowercaseString]];
if([userLogins containsObject: login])
{
[pool release];
continue; //user alrady fetch
}
[userLogins addObject: login];
user = [SOGoUser userWithLogin: login roles: nil]; user = [SOGoUser userWithLogin: login roles: nil];
if (user) if (user)
{ {
@@ -2385,6 +2392,12 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
{ {
pool = [NSAutoreleasePool new]; pool = [NSAutoreleasePool new];
login = [uids objectAtIndex: i]; login = [uids objectAtIndex: i];
if([userLogins containsObject: login])
{
[pool release];
continue; //user alrady fetch
}
[userLogins addObject: login];
user = [SOGoUser userWithLogin: login roles: nil]; user = [SOGoUser userWithLogin: login roles: nil];
if (user) if (user)
{ {