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

Merge branch 'pull-152'

Browse source 
Conflicts:
	core/src/main/java/hudson/model/DependencyGraph.java

Originally-Committed-As: d5c24703706b5afc6f62664251d1bfb1b0e0668f
This commit is contained in:
Kohsuke Kawaguchi 2011-06-07 10:44:49 -07:00
commit f7389a7339
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ import static hudson.Util.fixNull;
import static hudson.Util.fixEmptyAndTrim; import static hudson.Util.fixEmptyAndTrim;
import static hudson.Util.fixEmpty; import static hudson.Util.fixEmpty;
import hudson.model.Descriptor; import hudson.model.Descriptor;
import hudson.model.Hudson; import jenkins.model.Jenkins;
import hudson.model.User; import hudson.model.User;
import hudson.tasks.MailAddressResolver; import hudson.tasks.MailAddressResolver;
import hudson.util.FormValidation; import hudson.util.FormValidation;
@ -73,7 +73,6 @@ import java.net.UnknownHostException;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -350,7 +349,7 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
binding.setVariable("instance", this); binding.setVariable("instance", this);
BeanBuilder builder = new BeanBuilder(); BeanBuilder builder = new BeanBuilder();
builder.parse(Hudson.getInstance().servletContext.getResourceAsStream("/WEB-INF/security/LDAPBindSecurityRealm.groovy"),binding); builder.parse(Jenkins.getInstance().servletContext.getResourceAsStream("/WEB-INF/security/LDAPBindSecurityRealm.groovy"),binding);
WebApplicationContext appContext = builder.createApplicationContext(); WebApplicationContext appContext = builder.createApplicationContext();
ldapTemplate = new LdapTemplate(findBean(InitialDirContextFactory.class, appContext)); ldapTemplate = new LdapTemplate(findBean(InitialDirContextFactory.class, appContext));
@ -453,7 +452,7 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
public static final class MailAdressResolverImpl extends MailAddressResolver { public static final class MailAdressResolverImpl extends MailAddressResolver {
public String findMailAddressFor(User u) { public String findMailAddressFor(User u) {
// LDAP not active // LDAP not active
SecurityRealm realm = Hudson.getInstance().getSecurityRealm(); SecurityRealm realm = Jenkins.getInstance().getSecurityRealm();
if(!(realm instanceof LDAPSecurityRealm)) if(!(realm instanceof LDAPSecurityRealm))
return null; return null;
try { try {
@ -547,7 +546,7 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm {
@QueryParameter final String managerDN, @QueryParameter final String managerDN,
@QueryParameter final String managerPassword) { @QueryParameter final String managerPassword) {
if(!Hudson.getInstance().hasPermission(Hudson.ADMINISTER)) if(!Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER))
return FormValidation.ok(); return FormValidation.ok();
try { try {

4
war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy
View file

@ -28,7 +28,7 @@ import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator2
import org.acegisecurity.ldap.DefaultInitialDirContextFactory import org.acegisecurity.ldap.DefaultInitialDirContextFactory
import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch
import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider
import hudson.model.Hudson import jenkins.model.Jenkins
import hudson.security.LDAPSecurityRealm.AuthoritiesPopulatorImpl import hudson.security.LDAPSecurityRealm.AuthoritiesPopulatorImpl
import hudson.Util import hudson.Util
import javax.naming.Context import javax.naming.Context
@ -74,7 +74,7 @@ authenticationManager(ProviderManager) {
// these providers apply everywhere // these providers apply everywhere
bean(RememberMeAuthenticationProvider) { bean(RememberMeAuthenticationProvider) {
key = Hudson.getInstance().getSecretKey(); key = Jenkins.getInstance().getSecretKey();
}, },
// this doesn't mean we allow anonymous access. // this doesn't mean we allow anonymous access.
// we just authenticate anonymous users as such, // we just authenticate anonymous users as such,