From 007ec9e46be147403bd2ad85580d0a23eb41dc15 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Dec 2015 12:42:20 +0000 Subject: [PATCH] Make SecurityFilterAutoConfig work when SecurityAutoConfig is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, disabling SecurityAutoConfiguration could cause SecurityFilterAutoConfiguration to fail if Spring Security’s filter chain bean existing in the context. SecurityFilterAutoConfiguration relies on SecurityProperties which is created by SecurityAutoConfiguration. When SecurityAutoConfiguration is disabled, there’s no SecurityProperties bean so SecurityFilterAutoConfiguration would fail due to the missing dependency. This commit updates SecurityFilterAutoConfiguration to create a SecurityProperties bean if one does not already exist. Closes gh-4525 --- .../SecurityFilterAutoConfiguration.java | 7 ++ .../SecurityFilterAutoConfigurationTests.java | 73 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationTests.java diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java index e43ab071621..0b4b23cd098 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.context.embedded.DelegatingFilterProxyRegistrationBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -65,6 +66,12 @@ public class SecurityFilterAutoConfiguration { return registration; } + @Bean + @ConditionalOnMissingBean + public SecurityProperties securityProperties() { + return new SecurityProperties(); + } + private EnumSet getDispatcherTypes( SecurityProperties securityProperties) { if (securityProperties.getFilterDispatcherTypes() == null) { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationTests.java new file mode 100644 index 00000000000..cebd65df687 --- /dev/null +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationTests.java @@ -0,0 +1,73 @@ +/* + * Copyright 2012-2015 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.boot.autoconfigure.security; + +import org.junit.Test; + +import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.autoconfigure.security.SecurityAutoConfigurationTests.WebSecurity; +import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfigurationEarlyInitializationTests.ConverterBean; +import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfigurationEarlyInitializationTests.DeserializerBean; +import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfigurationEarlyInitializationTests.ExampleController; +import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfigurationEarlyInitializationTests.JacksonModuleBean; +import org.springframework.boot.autoconfigure.test.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.web.DispatcherServletAutoConfiguration; +import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration; +import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.mock.web.MockServletContext; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; + +/** + * Tests for {@link SecurityFilterAutoConfiguration}. + * + * @author Andy Wilkinson + */ +public class SecurityFilterAutoConfigurationTests { + + @Test + public void filterAutoConfigurationWorksWithoutSecurityAutoConfiguration() + throws Exception { + AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); + context.setServletContext(new MockServletContext()); + try { + context.register(Config.class); + context.refresh(); + } + finally { + context.close(); + } + + } + + @Configuration + @Import({ DeserializerBean.class, JacksonModuleBean.class, ExampleController.class, + ConverterBean.class }) + @ImportAutoConfiguration({ WebMvcAutoConfiguration.class, + JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, + DispatcherServletAutoConfiguration.class, WebSecurity.class, + SecurityFilterAutoConfiguration.class, + ServerPropertiesAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class }) + static class Config { + + } + +}