From 0f072a4d4eaed2408c4b49b1dfa3f10be88d6346 Mon Sep 17 00:00:00 2001 From: mjeremym2 <93650360+mjeremym2@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:37:58 +0100 Subject: [PATCH] Update LdapService.java remove redundant security.authentication.ldap.filter property. Not required. --- .../api/security/impl/ldap/LdapService.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java index f192ee9afc..438c52bbf8 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java @@ -60,9 +60,6 @@ public class LdapService { @Value("${security.authentication.ldap.base-dn:#{null}}") private String ldapBaseDn; - @Value("${security.authentication.ldap.filter:#{null}}") - private String ldapFilter; - @Value("${security.authentication.ldap.username:#{null}}") private String ldapSecurityPrincipal; @@ -124,15 +121,8 @@ public class LdapService { SearchControls sc = new SearchControls(); sc.setReturningAttributes(new String[]{ldapEmailAttribute}); sc.setSearchScope(SearchControls.SUBTREE_SCOPE); - - NamingEnumeration results = null; - - if (ldapFilter != null) { - results = ctx.search(ldapBaseDn, ldapFilter, new Object[]{userId}, sc); - } else { - EqualsFilter filter = new EqualsFilter(ldapUserIdentifyingAttribute, userId); - results = ctx.search(ldapBaseDn, filter.toString(), sc); - } + EqualsFilter filter = new EqualsFilter(ldapUserIdentifyingAttribute, userId); + NamingEnumeration results = ctx.search(ldapBaseDn, filter.toString(), sc); // Get all requested attributes if (results.hasMore()) {