|
|
|
@ -35,11 +35,13 @@ import org.slf4j.Logger;
|
|
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
|
import org.springframework.context.annotation.Configuration; |
|
|
|
|
import org.springframework.ldap.support.filter.EqualsFilter; |
|
|
|
|
import org.springframework.stereotype.Component; |
|
|
|
|
|
|
|
|
|
@Component |
|
|
|
|
@Configuration |
|
|
|
|
public class LdapService { |
|
|
|
|
|
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(LdapService.class); |
|
|
|
|
|
|
|
|
|
@Value("${security.authentication.ldap.user.admin:#{null}}") |
|
|
|
@ -87,15 +89,14 @@ public class LdapService {
|
|
|
|
|
SearchControls sc = new SearchControls(); |
|
|
|
|
sc.setReturningAttributes(new String[]{ldapEmailAttribute}); |
|
|
|
|
sc.setSearchScope(SearchControls.SUBTREE_SCOPE); |
|
|
|
|
String searchFilter = String.format("(%s=%s)", ldapUserIdentifyingAttribute, userId); |
|
|
|
|
//Search for the user you want to authenticate, search him with some attribute
|
|
|
|
|
NamingEnumeration<SearchResult> results = ctx.search(ldapBaseDn, searchFilter, sc); |
|
|
|
|
EqualsFilter filter = new EqualsFilter(ldapUserIdentifyingAttribute, userId); |
|
|
|
|
NamingEnumeration<SearchResult> results = ctx.search(ldapBaseDn, filter.toString(), sc); |
|
|
|
|
if (results.hasMore()) { |
|
|
|
|
// get the users DN (distinguishedName) from the result
|
|
|
|
|
SearchResult result = results.next(); |
|
|
|
|
NamingEnumeration attrs = result.getAttributes().getAll(); |
|
|
|
|
while (attrs.hasMore()) { |
|
|
|
|
//Open another connection to the LDAP server with the found DN and the password
|
|
|
|
|
// Open another connection to the LDAP server with the found DN and the password
|
|
|
|
|
searchEnv.put(Context.SECURITY_PRINCIPAL, result.getNameInNamespace()); |
|
|
|
|
searchEnv.put(Context.SECURITY_CREDENTIALS, userPwd); |
|
|
|
|
try { |
|
|
|
|