Skip to content

Commit 9066858

Browse files
wilkinsonawilkinsona
committed
Polish contribution
Closes gh-3703
1 parent 8685893 commit 9066858

File tree

3 files changed

+24
-38
lines changed

3 files changed

+24
-38
lines changed

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterRegistrationAutoConfiguration.java renamed to ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2012-2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,16 +19,21 @@
1919

2020
import org.springframework.beans.factory.annotation.Qualifier;
2121
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
22+
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2223
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2324
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2425
import org.springframework.boot.context.embedded.FilterRegistrationBean;
2526
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2627
import org.springframework.context.annotation.Bean;
2728
import org.springframework.context.annotation.Configuration;
29+
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration;
2830
import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
2931

3032
/**
31-
* Configures the ordering for Spring Security's Filter.
33+
* {@link EnableAutoConfiguration Auto-configuration} for Spring Security's Filter.
34+
* Configured separately from {@link SpringBootWebSecurityConfiguration} to ensure that
35+
* the filter's order is still configured when a user-provided
36+
* {@link WebSecurityConfiguration} exists.
3237
*
3338
* @author Rob Winch
3439
* @since 1.3
@@ -37,7 +42,8 @@
3742
@ConditionalOnWebApplication
3843
@EnableConfigurationProperties
3944
@AutoConfigureAfter(SpringBootWebSecurityConfiguration.class)
40-
public class SecurityFilterRegistrationAutoConfiguration {
45+
public class SecurityFilterAutoConfiguration {
46+
4147
@Bean
4248
@ConditionalOnBean(name = AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
4349
public FilterRegistrationBean securityFilterChainRegistration(
@@ -49,4 +55,5 @@ public FilterRegistrationBean securityFilterChainRegistration(
4955
.setName(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME);
5056
return registration;
5157
}
58+
5259
}

‎spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\
5656
org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration,\
5757
org.springframework.boot.autoconfigure.redis.RedisAutoConfiguration,\
5858
org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration,\
59-
org.springframework.boot.autoconfigure.security.SecurityFilterRegistrationAutoConfiguration,\
59+
org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfiguration,\
6060
org.springframework.boot.autoconfigure.security.FallbackWebSecurityAutoConfiguration,\
6161
org.springframework.boot.autoconfigure.security.oauth2.OAuth2AutoConfiguration,\
6262
org.springframework.boot.autoconfigure.sendgrid.SendGridAutoConfiguration,\

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java

+13-34
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import org.junit.After;
2222
import org.junit.Test;
2323
import org.springframework.beans.factory.annotation.Autowired;
24-
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
25-
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
26-
import org.springframework.boot.autoconfigure.EnableAutoConfigurationImportSelector;
2724
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
2825
import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
2926
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -38,9 +35,6 @@
3835
import org.springframework.context.annotation.Bean;
3936
import org.springframework.context.annotation.Configuration;
4037
import org.springframework.core.annotation.Order;
41-
import org.springframework.core.io.DefaultResourceLoader;
42-
import org.springframework.core.type.StandardAnnotationMetadata;
43-
import org.springframework.mock.env.MockEnvironment;
4438
import org.springframework.mock.web.MockServletContext;
4539
import org.springframework.orm.jpa.JpaTransactionManager;
4640
import org.springframework.security.authentication.AuthenticationManager;
@@ -60,7 +54,6 @@
6054
import org.springframework.security.core.userdetails.UserDetailsService;
6155
import org.springframework.security.web.FilterChainProxy;
6256
import org.springframework.security.web.SecurityFilterChain;
63-
import org.springframework.util.ObjectUtils;
6457
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
6558

6659
import static org.junit.Assert.assertEquals;
@@ -73,6 +66,7 @@
7366
* Tests for {@link SecurityAutoConfiguration}.
7467
*
7568
* @author Dave Syer
69+
* @author Rob Winch
7670
*/
7771
public class SecurityAutoConfigurationTests {
7872

@@ -100,14 +94,12 @@ public void testWebConfiguration() throws Exception {
10094
assertEquals(5, filterChains.size());
10195
}
10296

103-
// gh-3703
10497
@Test
10598
public void testDefaultFilterOrderWithSecurityAdapter() throws Exception {
10699
this.context = new AnnotationConfigWebApplicationContext();
107100
this.context.setServletContext(new MockServletContext());
108-
this.context.register(WebSecurity.class,
109-
SecurityAutoConfiguration.class,
110-
SecurityFilterRegistrationAutoConfiguration.class,
101+
this.context.register(WebSecurity.class, SecurityAutoConfiguration.class,
102+
SecurityFilterAutoConfiguration.class,
111103
ServerPropertiesAutoConfiguration.class,
112104
PropertyPlaceholderAutoConfiguration.class);
113105
this.context.refresh();
@@ -118,29 +110,17 @@ public void testDefaultFilterOrderWithSecurityAdapter() throws Exception {
118110
}
119111

120112
@Test
121-
public void testSecurityFilterRegistrationAutoConfigurationRegisteredAutoConfiguration() throws Exception {
122-
EnableAutoConfigurationImportSelector selector = new EnableAutoConfigurationImportSelector();
123-
selector.setBeanFactory(new DefaultListableBeanFactory());
124-
selector.setEnvironment(new MockEnvironment());
125-
selector.setResourceLoader(new DefaultResourceLoader());
126-
String[] imports = selector.selectImports(new StandardAnnotationMetadata(AutoConfiguration.class));
127-
128-
assertTrue(ObjectUtils.containsElement(imports, "org.springframework.boot.autoconfigure.security.SecurityFilterRegistrationAutoConfiguration"));
129-
}
130-
131-
@Test
132-
public void testDefaultFilterOrderNotWeb() throws Exception {
113+
public void testFilterIsNotRegisteredInNonWeb() throws Exception {
133114
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
134115
context.register(SecurityAutoConfiguration.class,
135-
SecurityFilterRegistrationAutoConfiguration.class,
116+
SecurityFilterAutoConfiguration.class,
136117
ServerPropertiesAutoConfiguration.class,
137118
PropertyPlaceholderAutoConfiguration.class);
138-
139119
try {
140120
context.refresh();
141-
assertFalse(
142-
context.containsBean("securityFilterChainRegistration"));
143-
} finally {
121+
assertFalse(context.containsBean("securityFilterChainRegistration"));
122+
}
123+
finally {
144124
context.close();
145125
}
146126
}
@@ -150,7 +130,7 @@ public void testDefaultFilterOrder() throws Exception {
150130
this.context = new AnnotationConfigWebApplicationContext();
151131
this.context.setServletContext(new MockServletContext());
152132
this.context.register(SecurityAutoConfiguration.class,
153-
SecurityFilterRegistrationAutoConfiguration.class,
133+
SecurityFilterAutoConfiguration.class,
154134
ServerPropertiesAutoConfiguration.class,
155135
PropertyPlaceholderAutoConfiguration.class);
156136
this.context.refresh();
@@ -166,7 +146,7 @@ public void testCustomFilterOrder() throws Exception {
166146
EnvironmentTestUtils.addEnvironment(this.context, "security.filter-order:12345");
167147
this.context.setServletContext(new MockServletContext());
168148
this.context.register(SecurityAutoConfiguration.class,
169-
SecurityFilterRegistrationAutoConfiguration.class,
149+
SecurityFilterAutoConfiguration.class,
170150
ServerPropertiesAutoConfiguration.class,
171151
PropertyPlaceholderAutoConfiguration.class);
172152
this.context.refresh();
@@ -470,9 +450,8 @@ public UserDetailsService getUserDetails() {
470450

471451
@Configuration
472452
@EnableWebSecurity
473-
static class WebSecurity extends WebSecurityConfigurerAdapter {}
453+
static class WebSecurity extends WebSecurityConfigurerAdapter {
454+
455+
}
474456

475-
@Configuration
476-
@EnableAutoConfiguration
477-
static class AutoConfiguration {}
478457
}

0 commit comments

Comments
 (0)