Skip to content

Commit 3f18881

Browse files
committed
Remove additional attribute name from CsrfWebFilter
Fixes gh-4799
1 parent 91e27c1 commit 3f18881

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

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

-6
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,6 @@ public CsrfBuilder serverAccessDeniedHandler(
387387
return this;
388388
}
389389

390-
public CsrfBuilder csrfTokenAttributeName(String csrfTokenAttributeName) {
391-
Assert.notNull(csrfTokenAttributeName, "csrfTokenAttributeName cannot be null");
392-
this.filter.setCsrfTokenAttributeName(csrfTokenAttributeName);
393-
return this;
394-
}
395-
396390
public CsrfBuilder serverCsrfTokenRepository(
397391
ServerCsrfTokenRepository serverCsrfTokenRepository) {
398392
this.filter.setServerCsrfTokenRepository(serverCsrfTokenRepository);

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

-8
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,12 @@ public class CsrfWebFilter implements WebFilter {
5959

6060
private ServerAccessDeniedHandler serverAccessDeniedHandler = new HttpStatusServerAccessDeniedHandler(HttpStatus.FORBIDDEN);
6161

62-
private String csrfTokenAttributeName = "csrf";
63-
6462
public void setServerAccessDeniedHandler(
6563
ServerAccessDeniedHandler serverAccessDeniedHandler) {
6664
Assert.notNull(serverAccessDeniedHandler, "serverAccessDeniedHandler");
6765
this.serverAccessDeniedHandler = serverAccessDeniedHandler;
6866
}
6967

70-
public void setCsrfTokenAttributeName(String csrfTokenAttributeName) {
71-
Assert.notNull(csrfTokenAttributeName, "csrfTokenAttributeName cannot be null");
72-
this.csrfTokenAttributeName = csrfTokenAttributeName;
73-
}
74-
7568
public void setServerCsrfTokenRepository(
7669
ServerCsrfTokenRepository serverCsrfTokenRepository) {
7770
Assert.notNull(serverCsrfTokenRepository, "serverCsrfTokenRepository cannot be null");
@@ -113,7 +106,6 @@ private Mono<Boolean> containsValidCsrfToken(ServerWebExchange exchange, CsrfTok
113106
private Mono<Void> continueFilterChain(ServerWebExchange exchange, WebFilterChain chain) {
114107
return csrfToken(exchange)
115108
.doOnSuccess(csrfToken -> exchange.getAttributes().put(CsrfToken.class.getName(), csrfToken))
116-
.doOnSuccess(csrfToken -> exchange.getAttributes().put(this.csrfTokenAttributeName, csrfToken))
117109
.flatMap( t -> chain.filter(exchange))
118110
.then();
119111
}

0 commit comments

Comments
 (0)