inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

IDS - fixing sync LDAP accounts issues

Browse Source
This commit is contained in:
pksingh
2023-12-27 09:26:07 +05:30
parent a39e7e5391
commit 2e7655b356
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
View File

@@ -130,8 +130,6 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
/** The user id attribute name. */ /** The user id attribute name. */
private String userIdAttributeName = "uid"; private String userIdAttributeName = "uid";
private String userIdAttributeNames = "uid1";
/** The member attribute name. */ /** The member attribute name. */
private String memberAttributeName = "member"; private String memberAttributeName = "member";
@@ -1735,19 +1733,6 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
// this will serve as indicator where we should restart sync in case if sync retry occurs // this will serve as indicator where we should restart sync in case if sync retry occurs
this.lastProcessedPerson = uid; this.lastProcessedPerson = uid;
} }
Attribute uidAttributes = result.getAttributes().get(LDAPUserRegistry.this.userIdAttributeNames);
if(uidAttributes!=null){
LDAPUserRegistry.logger
.warn("User returned by user search mandatory user id attribute "
+ uidAttributes);
}
String uid1 = (String) uidAttributes.get(0);
if (!this.skipToLastProcessedPerson)
{
this.lastProcessedPerson = uid1;
}
if (this.uids.contains(uid)) if (this.uids.contains(uid))
{ {
if (this.skipToLastProcessedPerson) if (this.skipToLastProcessedPerson)
@@ -1772,6 +1757,13 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
} }
this.uids.add(uid); this.uids.add(uid);
Attribute uidAttributes = attributes.get(LDAPUserRegistry.this.userIdAttributeName);
System.out.println("#######################################"+uidAttributes);
if(uidAttributes!=null){
LDAPUserRegistry.logger
.warn("User returned by user search mandatory user id attribute "
+ uidAttributes);
}
if (LDAPUserRegistry.logger.isDebugEnabled()) if (LDAPUserRegistry.logger.isDebugEnabled())
{ {
@@ -1824,6 +1816,7 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
this.searchResults = this.ctx.search(LDAPUserRegistry.this.userSearchBase, this.searchResults = this.ctx.search(LDAPUserRegistry.this.userSearchBase,
PersonCollection.this.query, this.userSearchCtls); PersonCollection.this.query, this.userSearchCtls);
} }
} }
while (readyForNextPage); while (readyForNextPage);
this.searchResults.close(); this.searchResults.close();