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

[HUDSON-1802] LDAP authentication with non-empty manager DN/password was not working correctly.

Browse source 
In 1.225.

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

Originally-Committed-As: 0f61ee2ca0187305f197dbddccee4c52d11fbc29
This commit is contained in:
kohsuke 2008-06-13 21:59:57 +00:00
parent 960e503e23
commit c197a542d5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/resources/hudson/security/LDAPSecurityRealm/config.jelly
View file

@ -1,7 +1,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry title="${%Server}" help="/help/security/ldap/server.html"> <f:entry title="${%Server}" help="/help/security/ldap/server.html">
<f:textbox name="ldap.server" value="${instance.server}" <f:textbox name="ldap.server" value="${instance.server}"
checkUrl="'${rootURL}/securityRealms/LDAPSecurityRealm/serverCheck?server='+escape(this.value)+'&amp;managerDN='+escape(this.form.elements['ldap.managerDN'].value)+'&amp;managerPassword='+escape(this.form.elements['ldap.managerPassword'].value)"/> checkUrl="'${rootURL}/securityRealms/LDAPSecurityRealm/serverCheck?field=server&amp;server='+escape(this.value)+'&amp;managerDN='+escape(this.form.elements['ldap.managerDN'].value)+'&amp;managerPassword='+escape(this.form.elements['ldap.managerPassword'].value)"/>
</f:entry> </f:entry>
<f:advanced> <f:advanced>
<f:entry title="${%root DN}" help="/help/security/ldap/rootDN.html"> <f:entry title="${%root DN}" help="/help/security/ldap/rootDN.html">
@ -15,12 +15,12 @@
</f:entry> </f:entry>
<f:entry title="${%Manager DN}" help="/help/security/ldap/managerDN.html"> <f:entry title="${%Manager DN}" help="/help/security/ldap/managerDN.html">
<f:textbox name="ldap.managerDN" value="${instance.managerDN}" <f:textbox name="ldap.managerDN" value="${instance.managerDN}"
checkUrl="'${rootURL}/securityRealms/LDAPSecurityRealm/serverCheck?server='+escape(this.form.elements['ldap.server'].value)+'&amp;managerDN='+escape(this.value)+'&amp;managerPassword='+escape(this.form.elements['ldap.managerPassword'].value)" checkUrl="'${rootURL}/securityRealms/LDAPSecurityRealm/serverCheck?field=managerDN&amp;server='+escape(this.form.elements['ldap.server'].value)+'&amp;managerDN='+escape(this.value)+'&amp;managerPassword='+escape(this.form.elements['ldap.managerPassword'].value)"
/> />
</f:entry> </f:entry>
<f:entry title="${%Manager Password}" help="/help/security/ldap/managerPassword.html"> <f:entry title="${%Manager Password}" help="/help/security/ldap/managerPassword.html">
<f:password name="ldap.managerPassword" value="${instance.managerPassword}" <f:password name="ldap.managerPassword" value="${instance.managerPassword}"
checkUrl="'${rootURL}/securityRealms/LDAPSecurityRealm/serverCheck?server='+escape(this.form.elements['ldap.server'].value)+'&amp;managerDN='+escape(this.form.elements['ldap.managerDN'].value)+'&amp;managerPassword='+escape(this.value)" checkUrl="'${rootURL}/securityRealms/LDAPSecurityRealm/serverCheck?field=password&amp;server='+escape(this.form.elements['ldap.server'].value)+'&amp;managerDN='+escape(this.form.elements['ldap.managerDN'].value)+'&amp;managerPassword='+escape(this.value)"
/> />
</f:entry> </f:entry>
</f:advanced> </f:advanced>

8
war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy
View file

@ -16,10 +16,10 @@ import hudson.model.Hudson
*/ */
initialDirContextFactory(DefaultInitialDirContextFactory, instance.getLDAPURL() ) { initialDirContextFactory(DefaultInitialDirContextFactory, instance.getLDAPURL() ) {
if(instance.managerDN!=null) {
// if anonymous bind is not allowed --- but what is the use of anonymous bind? managerDn = instance.managerDN;
// managerDn = "..." managerPassword = instance.getManagerPassword();
// managerPassword="..." }
} }
ldapUserSearch(FilterBasedLdapUserSearch, instance.userSearchBase, instance.userSearch, initialDirContextFactory) { ldapUserSearch(FilterBasedLdapUserSearch, instance.userSearchBase, instance.userSearch, initialDirContextFactory) {