fix(identity/ldap): adjust ldap error handling (camunda#4536)

* thrown an error only if id is null, do nothing if an authorization is missing camunda#4293
dbenesj · Aug 15, 2024 · f1c8c60 · f1c8c60
1 parent 233c982
commit f1c8c60
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/...ty-ldap/src/main/java/org/camunda/bpm/identity/impl/ldap/LdapIdentityProviderSession.java b/...ty-ldap/src/main/java/org/camunda/bpm/identity/impl/ldap/LdapIdentityProviderSession.java
@@ -412,20 +412,21 @@ protected <E extends DbEntity, T> List<T> retrieveResults(String baseDn,
           E entity = transformEntity.apply(result);
 
           String id = entity.getId();
-          if (id != null && resultCountPredicate.test(id)) {
-            if (resultCount >= firstResult || ignorePagination) {
-              if (LdapPluginLogger.INSTANCE.isDebugEnabled()) {
-                resultLogger.append(entity);
-                resultLogger.append(" based on ");
-                resultLogger.append(result);
-                resultLogger.append(", ");
+          if (id == null) {
+            LdapPluginLogger.INSTANCE.invalidLdapEntityReturned(entity, result);
+          } else {
+            if (resultCountPredicate.test(id)) {
+              if (resultCount >= firstResult || ignorePagination) {
+                if (LdapPluginLogger.INSTANCE.isDebugEnabled()) {
+                  resultLogger.append(entity);
+                  resultLogger.append(" based on ");
+                  resultLogger.append(result);
+                  resultLogger.append(", ");
+                }
+                entities.add((T) entity);
               }
-              entities.add((T) entity);
+              resultCount++;
             }
-            resultCount++;
-          } else {
-            LdapPluginLogger.INSTANCE.invalidLdapEntityReturned(entity, result);
-
           }
         }
       }