#21 x509 LifecycleManager

src/main/java/org/springframework/security/config/annotation/web/X509Configurator.java

@@ -61,7 +61,7 @@
  * @author Rob Winch
  * @since 3.2
  */
-public final class X509Configurator extends SecurityConfiguratorAdapter<DefaultSecurityFilterChain, HttpConfiguration> {
+public final class X509Configurator extends BaseHttpConfigurator {
     private X509AuthenticationFilter x509AuthenticationFilter;
     private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService;
     private String subjectPrincipalRegex;
@@ -170,7 +170,7 @@ private X509AuthenticationFilter getFilter(
             if(authenticationDetailsSource != null) {
                 x509AuthenticationFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
             }
-            x509AuthenticationFilter.afterPropertiesSet();
+            x509AuthenticationFilter = registerLifecycle(x509AuthenticationFilter);
         }
 
         return x509AuthenticationFilter;

src/test/groovy/org/springframework/security/config/annotation/web/X509ConfiguratorTests.groovy

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.security.config.annotation.web
+
+import org.springframework.security.config.annotation.BaseSpringSpec
+import org.springframework.security.config.annotation.authentication.AuthenticationManagerBuilder
+import org.springframework.security.web.authentication.preauth.x509.X509AuthenticationFilter;
+import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter
+import org.springframework.security.web.session.ConcurrentSessionFilter;
+import org.springframework.security.web.session.SessionManagementFilter;
+
+/**
+ *
+ * @author Rob Winch
+ */
+class X509ConfiguratorTests extends BaseSpringSpec {
+
+    def "x509 LifecycleManager"() {
+        setup:
+            LifecycleManager lifecycleManager = Mock()
+            HttpConfiguration http = new HttpConfiguration(lifecycleManager, authenticationBldr)
+        when:
+            http
+                .x509()
+                    .and()
+                .build()
+
+        then: "X509AuthenticationFilter is registered with LifecycleManager"
+            1 * lifecycleManager.registerLifecycle(_ as X509AuthenticationFilter) >> {X509AuthenticationFilter o -> o}
+    }
+}