浏览代码

Remove additional attribute name from CsrfWebFilter

Fixes gh-4799
Rob Winch 7 年之前
父节点
当前提交
3f18881493

+ 0 - 6
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java

@@ -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);

+ 0 - 8
web/src/main/java/org/springframework/security/web/server/csrf/CsrfWebFilter.java

@@ -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();
 	}