opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-19 02:20:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver/pro#10048 fix ldap groups matching (#4508)

Browse Source 
Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com>
This commit is contained in:
Ruslan Musaev
2026-08-03 15:11:21 +02:00
committed by GitHub
co-authored by Evgenia
parent 6bfe58506f
commit 57cc6e4808
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapAuthProvider.java
+22 -6
View File
@@ -48,6 +48,7 @@ import java.util.*;
import javax.naming.Context;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.PartialResultException;
import javax.naming.directory.*;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
@@ -562,12 +563,22 @@ public class LdapAuthProvider implements SMAuthProviderExternal<SMSession>, SMBr
}
context = initConnection(environment);
List<String> groupsByMemberOfAttribute = findGroupsByMemberOfAttribute(fullDN, context);
log.debug("Found " + groupsByMemberOfAttribute.size() + " groups by memberOf attribute");
result.addAll(groupsByMemberOfAttribute);
List<String> groupsByMemberAttribute = findGroupsByMemberAttribute(fullDN, ldapSettings, context);
log.debug("Found " + groupsByMemberAttribute.size() + " groups by member attribute");
result.addAll(groupsByMemberAttribute);
// Run both lookups independently: a failure in one must not discard the groups
// already collected by the other.
try {
List<String> groupsByMemberOfAttribute = findGroupsByMemberOfAttribute(fullDN, context);
log.debug("Found " + groupsByMemberOfAttribute.size() + " groups by memberOf attribute");
result.addAll(groupsByMemberOfAttribute);
} catch (Exception e) {
log.error("Failed to fetch groups by memberOf attribute. " + e.getMessage());
}
try {
List<String> groupsByMemberAttribute = findGroupsByMemberAttribute(fullDN, ldapSettings, context);
log.debug("Found " + groupsByMemberAttribute.size() + " groups by member attribute");
result.addAll(groupsByMemberAttribute);
} catch (Exception e) {
log.error("Failed to fetch groups by member attribute. " + e.getMessage());
}
} catch (Exception e) {
log.error("Group not found. " + e.getMessage());
} finally {
@@ -579,6 +590,7 @@ public class LdapAuthProvider implements SMAuthProviderExternal<SMSession>, SMBr
log.error("Close resource of ldap group search failed", e);
}
}
log.debug("Resolved " + result.size() + " external group id(s) for member '" + fullDN + "': " + result);
return new ArrayList<>(result);
}
@@ -602,6 +614,8 @@ public class LdapAuthProvider implements SMAuthProviderExternal<SMSession>, SMBr
}
}
}
} catch (PartialResultException e) {
log.debug("Ignoring LDAP continuation references while reading memberOf for '" + fullDN + "'");
} finally {
if (userRecord != null) {
userRecord.close();
@@ -634,6 +648,8 @@ public class LdapAuthProvider implements SMAuthProviderExternal<SMSession>, SMBr
log.error("Failed fetch user group. " + e.getMessage());
}
}
} catch (PartialResultException e) {
log.debug("Ignoring LDAP continuation references during member group search for '" + fullDN + "'");
} finally {
if (searchResults != null) {
searchResults.close();