natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update LdapService.java 

remove redundant security.authentication.ldap.filter property. Not required.
This commit is contained in:
mjeremym2 2024-06-10 09:37:58 +01:00
parent 81417e6ceb
commit 0f072a4d4e
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java
View File

@ -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<SearchResult> 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<SearchResult> results = ctx.search(ldapBaseDn, filter.toString(), sc);
// Get all requested attributes
if (results.hasMore()) {