bug fix

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

core/src/main/java/hudson/security/HudsonFilter.java

@@ -52,7 +52,7 @@ public class HudsonFilter implements Filter {
     public void init(FilterConfig filterConfig) throws ServletException {
         Binding binding = new Binding();
         binding.setVariable("authenticationManagerProxy", AUTHENTICATION_MANAGER);
-        binding.setVariable("UserDetailsServiceProxy", USER_DETAILS_SERVICE_PROXY);
+        binding.setVariable("userDetailsServiceProxy", USER_DETAILS_SERVICE_PROXY);
         binding.setVariable("app", Hudson.getInstance());
         BeanBuilder builder = new BeanBuilder();
         builder.parse(filterConfig.getServletContext().getResourceAsStream("/WEB-INF/security/SecurityFilters.groovy"),binding);
@@ -87,7 +87,10 @@ public class HudsonFilter implements Filter {
     }
 
     public void destroy() {
-        legacy.destroy();
-        acegi.destroy();
+        // these fields can be null if HudsonFilter.init() fails in the middle
+        if(legacy!=null)
+            legacy.destroy();
+        if(acegi!=null)
+            acegi.destroy();
     }
 }

war/resources/WEB-INF/security/HudsonPrivateSecurityRealm.groovy

@@ -6,18 +6,21 @@ import hudson.security.HudsonPrivateSecurityRealm.HudsonUserDetailsService
 import org.acegisecurity.providers.dao.DaoAuthenticationProvider
 import org.acegisecurity.providers.anonymous.AnonymousAuthenticationProvider
 import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider
+import hudson.model.Hudson
 
 
+userDetailsService(HudsonUserDetailsService) {}
+
 authenticationManager(ProviderManager) {
     providers = [
         // the primary authentication source is Hudson's own user database
         bean(DaoAuthenticationProvider) {
-            userDetailsService = new HudsonUserDetailsService()
+            userDetailsService = userDetailsService
         },
 
     // these providers apply everywhere
         bean(RememberMeAuthenticationProvider) {
-            key = app.getSecretKey();
+            key = Hudson.getInstance().getSecretKey();
         },
         // this doesn't mean we allow anonymous access.
         // we just authenticate anonymous users as such,

war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy

@@ -6,6 +6,7 @@ import org.acegisecurity.providers.ldap.populator.DefaultLdapAuthoritiesPopulato
 import org.acegisecurity.ldap.DefaultInitialDirContextFactory
 import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch
 import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider
+import hudson.model.Hudson
 
 /*
     Configure LDAP as the authentication realm.
@@ -42,7 +43,7 @@ authenticationManager(ProviderManager) {
 
     // these providers apply everywhere
         bean(RememberMeAuthenticationProvider) {
-            key = app.getSecretKey();
+            key = Hudson.getInstance().getSecretKey();
         },
         // this doesn't mean we allow anonymous access.
         // we just authenticate anonymous users as such,