Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply DefaultLoginPageConfigurer before logout 

If they are not applied in this order, then the LogoutConfigurer cannot
set the logoutSuccessUrl, because the DefaultLoginPageGeneratingFilter
does not exist yet.
This impacts users that inject the default HttpSecurity bean.

Closes gh-9973
This commit is contained in:
Eleftheria Stein 2021-06-24 10:12:26 +02:00
parent bfeb6bd756
commit fdd017d935
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java
View File

@ -94,8 +94,8 @@ class HttpSecurityConfiguration {
.requestCache(withDefaults()) .requestCache(withDefaults())
.anonymous(withDefaults()) .anonymous(withDefaults())
.servletApi(withDefaults()) .servletApi(withDefaults())
.logout(withDefaults())
.apply(new DefaultLoginPageConfigurer<>()); .apply(new DefaultLoginPageConfigurer<>());
http.logout(withDefaults());
// @formatter:on // @formatter:on
return http; return http;
} }

12
config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java
View File

@ -187,6 +187,18 @@ public class HttpSecurityConfigurationTests {
this.mockMvc.perform(get("/login")).andExpect(status().isOk()); this.mockMvc.perform(get("/login")).andExpect(status().isOk());
} }
@Test
public void loginWhenUsingDefaultsThenDefaultLoginFailurePageGenerated() throws Exception {
this.spring.register(SecurityEnabledConfig.class).autowire();
this.mockMvc.perform(get("/login?error")).andExpect(status().isOk());
}
@Test
public void loginWhenUsingDefaultsThenDefaultLogoutSuccessPageGenerated() throws Exception {
this.spring.register(SecurityEnabledConfig.class).autowire();
this.mockMvc.perform(get("/login?logout")).andExpect(status().isOk());
}
@RestController @RestController
static class NameController { static class NameController {