From 219317e8c772ffefd48f9a79045c7fb574565c46 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 25 Mar 2015 17:22:30 +0000 Subject: [PATCH] Make web security config require spring-security-web on classpath Previously, SpringBootWebSecurityConfiguration required a web application and @EnableWebSecurity to be on the classpath. @EnableWebSecurity is in spring-security-config so this could lead to the configuration being active when spring-security-web isn't on the classpath but the rest of Spring Security is. This commit updates SpringBootWebSecurityConfiguration to also make it conditional on a class in spring-security-web. Fixes gh-2717 --- .../security/SpringBootWebSecurityConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java index fcd61541d6..8081866b90 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java @@ -87,7 +87,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor; */ @Configuration @EnableConfigurationProperties -@ConditionalOnClass({ EnableWebSecurity.class }) +@ConditionalOnClass({ EnableWebSecurity.class, AuthenticationEntryPoint.class }) @ConditionalOnMissingBean(WebSecurityConfiguration.class) @ConditionalOnWebApplication public class SpringBootWebSecurityConfiguration {