nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1024: Add base dn to dn if it does not exist.

This commit is contained in:
Holger Hagen 2020-03-04 13:53:43 +01:00
parent d68f33ab72
commit 22b1db4a23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapClient.java
View File

@ -8,6 +8,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.naming.directory.SearchControls; import javax.naming.directory.SearchControls;
import javax.naming.ldap.LdapName;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -19,6 +20,7 @@ import org.springframework.ldap.filter.AndFilter;
import org.springframework.ldap.filter.EqualsFilter; import org.springframework.ldap.filter.EqualsFilter;
import org.springframework.ldap.filter.OrFilter; import org.springframework.ldap.filter.OrFilter;
import org.springframework.ldap.filter.WhitespaceWildcardsFilter; import org.springframework.ldap.filter.WhitespaceWildcardsFilter;
import org.springframework.ldap.support.LdapNameBuilder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.LoggerUtils;
@ -351,7 +353,11 @@ public class LdapClient {
@Override @Override
public AccessIdResource doMapFromContext(final DirContextOperations context) { public AccessIdResource doMapFromContext(final DirContextOperations context) {
final AccessIdResource accessId = new AccessIdResource(); final AccessIdResource accessId = new AccessIdResource();
accessId.setAccessId(context.getNameInNamespace()); // fully qualified dn LdapName dn = (LdapName) context.getDn();
if (!dn.getRdn(0).toString().equalsIgnoreCase(getBaseDn())) {
dn = LdapNameBuilder.newInstance(getBaseDn()).add(dn).build();
}
accessId.setAccessId(dn.toString()); // fully qualified dn
accessId.setName(context.getStringAttribute(getGroupNameAttribute())); accessId.setName(context.getStringAttribute(getGroupNameAttribute()));
return accessId; return accessId;
} }