root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Update to Spring Security Snapshot

This commit is contained in:
Rob Winch 2013-10-22 11:05:24 -05:00 committed by Dave Syer
parent 6c31854600
commit 77b5ad1b0b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
View File

@ -57,7 +57,7 @@ import org.springframework.security.config.annotation.web.configurers.HeadersCon
import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint; import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
import org.springframework.security.web.header.writers.HstsHeaderWriter; import org.springframework.security.web.header.writers.HstsHeaderWriter;
import org.springframework.security.web.util.AnyRequestMatcher; import org.springframework.security.web.util.matcher.AnyRequestMatcher;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for security of a web application or * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or
@ -299,10 +299,10 @@ public class SecurityAutoConfiguration {
private SecurityProperties security; private SecurityProperties security;
@Bean @Bean
public AuthenticationManager authenticationManager() throws Exception { public AuthenticationManager authenticationManager(ObjectPostProcessor<Object> objectPostProcessor) throws Exception {
InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> builder = new AuthenticationManagerBuilder( InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> builder = new AuthenticationManagerBuilder(
ObjectPostProcessor.QUIESCENT_POSTPROCESSOR).inMemoryAuthentication(); objectPostProcessor).inMemoryAuthentication();
User user = this.security.getUser(); User user = this.security.getUser();
if (user.isDefaultPassword()) { if (user.isDefaultPassword()) {
@ -327,7 +327,7 @@ public class SecurityAutoConfiguration {
if (headers.getHsts() != Headers.HSTS.none) { if (headers.getHsts() != Headers.HSTS.none) {
boolean includeSubdomains = headers.getHsts() == Headers.HSTS.all; boolean includeSubdomains = headers.getHsts() == Headers.HSTS.all;
HstsHeaderWriter writer = new HstsHeaderWriter(includeSubdomains); HstsHeaderWriter writer = new HstsHeaderWriter(includeSubdomains);
writer.setRequestMatcher(new AnyRequestMatcher()); writer.setRequestMatcher(AnyRequestMatcher.INSTANCE);
configurer.addHeaderWriter(writer); configurer.addHeaderWriter(writer);
} }
if (headers.isContentType()) { if (headers.isContentType()) {

2
spring-boot-dependencies/pom.xml
View File

@ -34,7 +34,7 @@
<snakeyaml.version>1.12</snakeyaml.version> <snakeyaml.version>1.12</snakeyaml.version>
<spock.version>0.7-groovy-2.0</spock.version> <spock.version>0.7-groovy-2.0</spock.version>
<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version> <spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
<spring-security.version>3.2.0.RC1</spring-security.version> <spring-security.version>3.2.0.CI-SNAPSHOT</spring-security.version>
<spring-integration.version>2.2.4.RELEASE</spring-integration.version> <spring-integration.version>2.2.4.RELEASE</spring-integration.version>
<spring-integration-groovydsl.version>1.0.0.M1</spring-integration-groovydsl.version> <spring-integration-groovydsl.version>1.0.0.M1</spring-integration-groovydsl.version>
<spring-batch.version>2.2.0.RELEASE</spring-batch.version> <spring-batch.version>2.2.0.RELEASE</spring-batch.version>