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

Add inhibitInferRootDN to LDAP module. This allows rootDN to be blank, import for some broken AD servers accessed via LDAP.

Browse source 
Originally-Committed-As: 9d43b581fd6a5c3f8585503a1bc464db720da8e0
This commit is contained in:
Chris Cosby 2011-04-21 17:12:29 -04:00 committed by Andrew Bayer
parent 99786b9526
commit 82aa9f4a96
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,6 +222,12 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
*/ */
public final String rootDN; public final String rootDN;
/**
* Allow the rootDN to be inferred? Default is false.
* If true, allow rootDN to be blank.
*/
public final boolean inhibitInferRootDN;
/** /**
* Specifies the relative DN from {@link #rootDN the root DN}. * Specifies the relative DN from {@link #rootDN the root DN}.
* This is used to narrow down the search space when doing user search. * This is used to narrow down the search space when doing user search.
@ -281,11 +287,12 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
private transient LdapTemplate ldapTemplate; private transient LdapTemplate ldapTemplate;
@DataBoundConstructor @DataBoundConstructor
public LDAPSecurityRealm(String server, String rootDN, String userSearchBase, String userSearch, String groupSearchBase, String managerDN, String managerPassword) { public LDAPSecurityRealm(String server, String rootDN, String userSearchBase, String userSearch, String groupSearchBase, String managerDN, String managerPassword, boolean inhibitInferRootDN) {
this.server = server.trim(); this.server = server.trim();
this.managerDN = fixEmpty(managerDN); this.managerDN = fixEmpty(managerDN);
this.managerPassword = Scrambler.scramble(fixEmpty(managerPassword)); this.managerPassword = Scrambler.scramble(fixEmpty(managerPassword));
if(fixEmptyAndTrim(rootDN)==null) rootDN= fixNull(inferRootDN(server)); this.inhibitInferRootDN = inhibitInferRootDN;
if(!inhibitInferRootDN && fixEmptyAndTrim(rootDN)==null) rootDN= fixNull(inferRootDN(server));
this.rootDN = rootDN.trim(); this.rootDN = rootDN.trim();
this.userSearchBase = fixNull(userSearchBase).trim(); this.userSearchBase = fixNull(userSearchBase).trim();
userSearch = fixEmptyAndTrim(userSearch); userSearch = fixEmptyAndTrim(userSearch);

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

@ -31,6 +31,8 @@ THE SOFTWARE.
<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">
<f:textbox name="ldap.rootDN" value="${instance.rootDN}" /> <f:textbox name="ldap.rootDN" value="${instance.rootDN}" />
<f:checkbox name="ldap.inhibitInferRootDN" checked="${instance.inhibitInferRootDN}"
title="${%Allow blank rootDN}"/>
</f:entry> </f:entry>
<f:entry title="${%User search base}" help="/help/security/ldap/userSearchBase.html"> <f:entry title="${%User search base}" help="/help/security/ldap/userSearchBase.html">
<f:textbox name="ldap.userSearchBase" value="${instance.userSearchBase}" /> <f:textbox name="ldap.userSearchBase" value="${instance.userSearchBase}" />

4
test/src/test/groovy/hudson/security/LDAPSecurityRealmTest.groovy
View file

@ -42,7 +42,7 @@ public class LDAPSecurityRealmTest extends HudsonTestCase {
* basic syntax errors and such. * basic syntax errors and such.
*/ */
void testGroovyBeanDef() { void testGroovyBeanDef() {
hudson.securityRealm = new LDAPSecurityRealm("ldap.itd.umich.edu",null,null,null,null,null,null); hudson.securityRealm = new LDAPSecurityRealm("ldap.itd.umich.edu",null,null,null,null,null,null,null);
println hudson.securityRealm.securityComponents // force the component creation println hudson.securityRealm.securityComponents // force the component creation
} }
@ -65,4 +65,4 @@ public class LDAPSecurityRealmTest extends HudsonTestCase {
assertSame(d1.attributes,d3.attributes); assertSame(d1.attributes,d3.attributes);
assertNotSame(d1.attributes,d2.attributes); assertNotSame(d1.attributes,d2.attributes);
} }
} }