nicolabs/ldap-plugin
1
0
Fork 0
mirror of https://github.com/nicolabs/ldap-plugin.git synced 2025-09-07 05:14:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FIXED HUDSON-4261] applied a patch

Browse source 
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20880 71c3de6d-444a-0410-be80-ed276b4c234a

Originally-Committed-As: e259abec4a114dea56fc8adcc55022d613b50774
This commit is contained in:
kohsuke 2009-08-19 01:24:49 +00:00
parent 4de760aa81
commit 231e6a5923
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/src/main/java/hudson/security/LDAPSecurityRealm.java
View file

@ -23,7 +23,6 @@
*/ */
package hudson.security; package hudson.security;
import com.sun.jndi.ldap.LdapCtxFactory;
import groovy.lang.Binding; import groovy.lang.Binding;
import hudson.Extension; import hudson.Extension;
import hudson.Util; import hudson.Util;
@ -51,18 +50,15 @@ import org.acegisecurity.userdetails.ldap.LdapUserDetails;
import org.acegisecurity.userdetails.ldap.LdapUserDetailsImpl; import org.acegisecurity.userdetails.ldap.LdapUserDetailsImpl;
import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import javax.naming.Context; import javax.naming.Context;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.naming.AuthenticationException;
import javax.naming.directory.Attribute; import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes; import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext; import javax.naming.directory.DirContext;
import javax.servlet.ServletException; import javax.naming.directory.InitialDirContext;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
@ -304,7 +300,10 @@ public class LDAPSecurityRealm extends SecurityRealm {
props.put(Context.SECURITY_PRINCIPAL,managerDN); props.put(Context.SECURITY_PRINCIPAL,managerDN);
props.put(Context.SECURITY_CREDENTIALS,getManagerPassword()); props.put(Context.SECURITY_CREDENTIALS,getManagerPassword());
} }
DirContext ctx = LdapCtxFactory.getLdapCtxInstance(getServerUrl()+'/', props); props.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
props.put(Context.PROVIDER_URL, getServerUrl()+'/');
DirContext ctx = new InitialDirContext(props);
Attributes atts = ctx.getAttributes(""); Attributes atts = ctx.getAttributes("");
Attribute a = atts.get("defaultNamingContext"); Attribute a = atts.get("defaultNamingContext");
if(a!=null) // this entry is available on Active Directory. See http://msdn2.microsoft.com/en-us/library/ms684291(VS.85).aspx if(a!=null) // this entry is available on Active Directory. See http://msdn2.microsoft.com/en-us/library/ms684291(VS.85).aspx
@ -496,7 +495,10 @@ public class LDAPSecurityRealm extends SecurityRealm {
if(managerPassword!=null && managerPassword.trim().length() > 0 && !"undefined".equals(managerPassword)) { if(managerPassword!=null && managerPassword.trim().length() > 0 && !"undefined".equals(managerPassword)) {
props.put(Context.SECURITY_CREDENTIALS,managerPassword); props.put(Context.SECURITY_CREDENTIALS,managerPassword);
} }
DirContext ctx = LdapCtxFactory.getLdapCtxInstance(addPrefix(server)+'/', props); props.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
props.put(Context.PROVIDER_URL, addPrefix(server)+'/');
DirContext ctx = new InitialDirContext(props);
ctx.getAttributes(""); ctx.getAttributes("");
return FormValidation.ok(); // connected return FormValidation.ok(); // connected
} catch (NamingException e) { } catch (NamingException e) {