Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

fix #17 ldap auth

Browse Source
This commit is contained in:
Thorsten Ludewig
2011-05-17 08:32:20 +02:00
parent 8c597ca3f4
commit 74730c1cba
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/scm-auth-ldap-plugin/src/main/java/sonia/scm/auth/ldap/LDAPAuthenticationHandler.java
View File

@@ -57,8 +57,8 @@ import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.HashSet; import java.util.HashSet;
import java.util.Hashtable;
import java.util.Properties; import java.util.Properties;
import java.util.Set;
import javax.naming.Context; import javax.naming.Context;
import javax.naming.NamingEnumeration; import javax.naming.NamingEnumeration;
@@ -153,7 +153,8 @@ public class LDAPAuthenticationHandler implements AuthenticationHandler
{ {
SearchResult sr = searchResult.next(); SearchResult sr = searchResult.next();
String userDn = sr.getName() + "," + baseDn; String userDn = sr.getName() + "," + baseDn;
Properties userProperties = new Properties(ldapProperties); Hashtable<String, String> userProperties = new Hashtable<String,
String>(ldapProperties);
userProperties.put(Context.SECURITY_PRINCIPAL, userDn); userProperties.put(Context.SECURITY_PRINCIPAL, userDn);
userProperties.put(Context.SECURITY_CREDENTIALS, password); userProperties.put(Context.SECURITY_CREDENTIALS, password);
@@ -213,7 +214,6 @@ public class LDAPAuthenticationHandler implements AuthenticationHandler
// read dynamic group attribute // read dynamic group attribute
getGroups(userAttributes, groups); getGroups(userAttributes, groups);
result = new AuthenticationResult(user, groups); result = new AuthenticationResult(user, groups);
} }
catch (NamingException ex) catch (NamingException ex)
@@ -350,7 +350,7 @@ public class LDAPAuthenticationHandler implements AuthenticationHandler
*/ */
private void buildLdapProperties() private void buildLdapProperties()
{ {
ldapProperties = new Properties(); ldapProperties = new Hashtable<String, String>();
ldapProperties.put(Context.INITIAL_CONTEXT_FACTORY, ldapProperties.put(Context.INITIAL_CONTEXT_FACTORY,
"com.sun.jndi.ldap.LdapCtxFactory"); "com.sun.jndi.ldap.LdapCtxFactory");
ldapProperties.put(Context.PROVIDER_URL, config.getHostUrl()); ldapProperties.put(Context.PROVIDER_URL, config.getHostUrl());
@@ -411,7 +411,7 @@ public class LDAPAuthenticationHandler implements AuthenticationHandler
private LDAPConfig config; private LDAPConfig config;
/** Field description */ /** Field description */
private Properties ldapProperties; private Hashtable<String, String> ldapProperties;
/** Field description */ /** Field description */
private Store<LDAPConfig> store; private Store<LDAPConfig> store;