Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-01 09:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polish Automatically Add CsrfServerLogoutHandler

Browse Source 
Issue: gh-5337
This commit is contained in:
Rob Winch 2018-09-21 00:57:26 -05:00
parent b060ec050a
commit 45a9c0fd54
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@ -1608,7 +1608,7 @@ public class ServerHttpSecurity {
protected void configure(ServerHttpSecurity http) { protected void configure(ServerHttpSecurity http) {
Optional.ofNullable(this.csrfTokenRepository).ifPresent(serverCsrfTokenRepository -> { Optional.ofNullable(this.csrfTokenRepository).ifPresent(serverCsrfTokenRepository -> {
this.filter.setCsrfTokenRepository(serverCsrfTokenRepository); this.filter.setCsrfTokenRepository(serverCsrfTokenRepository);
http.logout().logoutHandler(new CsrfServerLogoutHandler(serverCsrfTokenRepository)); http.logout().addLogoutHandler(new CsrfServerLogoutHandler(serverCsrfTokenRepository));
}); });
http.addFilterAt(this.filter, SecurityWebFiltersOrder.CSRF); http.addFilterAt(this.filter, SecurityWebFiltersOrder.CSRF);
} }
@ -2350,10 +2350,14 @@ public class ServerHttpSecurity {
* @return the {@link LogoutSpec} to configure * @return the {@link LogoutSpec} to configure
*/ */
public LogoutSpec logoutHandler(ServerLogoutHandler logoutHandler) { public LogoutSpec logoutHandler(ServerLogoutHandler logoutHandler) {
if (logoutHandler != null) { Assert.notNull(logoutHandler, "logoutHandler cannot be null");
this.logoutHandlers.add(logoutHandler); this.logoutHandlers.clear();
return addLogoutHandler(logoutHandler);
} }
private LogoutSpec addLogoutHandler(ServerLogoutHandler logoutHandler) {
Assert.notNull(logoutHandler, "logoutHandler cannot be null");
this.logoutHandlers.add(logoutHandler);
return this; return this;
} }