Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove additional attribute name from CsrfWebFilter

Browse Source 
Fixes gh-4799
This commit is contained in:
Rob Winch 2017-11-07 21:03:09 -06:00
parent 91e27c1422
commit 3f18881493
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,12 +387,6 @@ public class ServerHttpSecurity {
return this;
}
public CsrfBuilder csrfTokenAttributeName(String csrfTokenAttributeName) {
Assert.notNull(csrfTokenAttributeName, "csrfTokenAttributeName cannot be null");
this.filter.setCsrfTokenAttributeName(csrfTokenAttributeName);
return this;
}
public CsrfBuilder serverCsrfTokenRepository(
ServerCsrfTokenRepository serverCsrfTokenRepository) {
this.filter.setServerCsrfTokenRepository(serverCsrfTokenRepository);

8
web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java
View File

@ -59,19 +59,12 @@ public class CsrfWebFilter implements WebFilter {
private ServerAccessDeniedHandler serverAccessDeniedHandler = new HttpStatusServerAccessDeniedHandler(HttpStatus.FORBIDDEN);
private String csrfTokenAttributeName = "csrf";
public void setServerAccessDeniedHandler(
ServerAccessDeniedHandler serverAccessDeniedHandler) {
Assert.notNull(serverAccessDeniedHandler, "serverAccessDeniedHandler");
this.serverAccessDeniedHandler = serverAccessDeniedHandler;
}
public void setCsrfTokenAttributeName(String csrfTokenAttributeName) {
Assert.notNull(csrfTokenAttributeName, "csrfTokenAttributeName cannot be null");
this.csrfTokenAttributeName = csrfTokenAttributeName;
}
public void setServerCsrfTokenRepository(
ServerCsrfTokenRepository serverCsrfTokenRepository) {
Assert.notNull(serverCsrfTokenRepository, "serverCsrfTokenRepository cannot be null");
@ -113,7 +106,6 @@ public class CsrfWebFilter implements WebFilter {
private Mono<Void> continueFilterChain(ServerWebExchange exchange, WebFilterChain chain) {
return csrfToken(exchange)
.doOnSuccess(csrfToken -> exchange.getAttributes().put(CsrfToken.class.getName(), csrfToken))
.doOnSuccess(csrfToken -> exchange.getAttributes().put(this.csrfTokenAttributeName, csrfToken))
.flatMap( t -> chain.filter(exchange))
.then();
}