CB-5954. Fixed if bind DN not filled

dbeaver · Dec 23, 2024 · 7f26c4b · 7f26c4b
1 parent ea3221b
commit 7f26c4b
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/....cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapAuthProvider.java b/....cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapAuthProvider.java
@@ -37,10 +37,7 @@
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
+import javax.naming.directory.*;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
@@ -75,10 +72,7 @@ public Map<String, Object> authExternalUser(
         Hashtable<String, String> environment = creteAuthEnvironment(ldapSettings);
 
         Map<String, Object> userData = null;
-        if (isFullDN(userName) && CommonUtils.isNotEmpty(ldapSettings.getLoginAttribute())) {
-            if (CommonUtils.isEmpty(ldapSettings.getBaseDN())) {
-                throw new DBException("Base DN doesnt configure");
-            }
+        if (!isFullDN(userName) && CommonUtils.isNotEmpty(ldapSettings.getLoginAttribute())) {
             userData = validateAndLoginUserAccessByUsername(userName, password, ldapSettings);
 
         }
@@ -217,8 +211,12 @@ private String findUserDN(DirContext adminContext, LdapSettings ldapSettings, St
             SearchControls searchControls = new SearchControls();
             searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
             searchControls.setReturningAttributes(new String[]{"distinguishedName"});
+            String baseDN = ldapSettings.getBaseDN();
+            if (CommonUtils.isEmpty(baseDN)) {
+                baseDN = getRootDN(adminContext);
+            }
 
-            NamingEnumeration<SearchResult> results = adminContext.search(ldapSettings.getBaseDN(), searchFilter, searchControls);
+            NamingEnumeration<SearchResult> results = adminContext.search(baseDN, searchFilter, searchControls);
 
             if (results.hasMore()) {
                 SearchResult result = results.next();
@@ -231,6 +229,19 @@ private String findUserDN(DirContext adminContext, LdapSettings ldapSettings, St
         }
     }
 
+    private String getRootDN(DirContext adminContext) throws DBException {
+        try {
+            Attributes attributes = adminContext.getAttributes("", new String[]{"namingContexts"});
+            Attribute namingContexts = attributes.get("namingContexts");
+            if (namingContexts != null && namingContexts.size() > 0) {
+                return (String) namingContexts.get(0);
+            }
+            throw new DBException("Root DN not found in namingContexts");
+        } catch (Exception e) {
+            throw new DBException("Error retrieving root DN: " + e.getMessage(), e);
+        }
+    }
+
     private Map<String, Object> authenticateWithUserLogin(String userDN, String password, LdapSettings ldapSettings, String login) throws DBException {
         Hashtable<String, String> userEnvironment = creteAuthEnvironment(ldapSettings);
         userEnvironment.put(Context.SECURITY_PRINCIPAL, userDN);