IDS - fixing sync LDAP accounts issues

2025-09-10 14:11:58 +00:00 · 2024-01-02 18:59:55 +05:30
1 changed files with 19 additions and 1 deletions
--- a/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
+++ b/repository/src/main/java/org/alfresco/repo/security/sync/ldap/LDAPUserRegistry.java
@@ -1727,7 +1727,25 @@ public class LDAPUserRegistry implements UserRegistry, LDAPNameResolver, Initial
                                continue;
                            }
                        }
-                        String uid = (String) uidAttribute.get(0);
+                        result = searchResults.next();
+                        Attributes ldapAttributes = result.getAttributes();
+                        Attribute ldapUidAttributes = ldapAttributes.get(userIdAttributeName);
+                        if (ldapUidAttributes == null)
+                        {
+                            if (!LDAPUserRegistry.this.errorOnMissingUID)
+                            {
+                                Object[] params = {result.getNameInNamespace(),LDAPUserRegistry.this.userIdAttributeName};
+                                throw new AlfrescoRuntimeException("synchronization.err.ldap.get.user.id not.missing", params);
+                            }
+                            else
+                            {
+                                LDAPUserRegistry.logger
+                                        .warn("User returned by user search does not have mandatory user id attribute "
+                                                + ldapUidAttributes);
+                            }
+
+                        }
+                        String uid = (String) ldapUidAttributes.get(0);

                        if (!this.skipToLastProcessedPerson)
                        {