From 2c8854bb7fd9f8d2b832ee8c4035e35182259a34 Mon Sep 17 00:00:00 2001 From: Wellington Domiciano Date: Sun, 25 Dec 2022 19:15:54 -0300 Subject: [PATCH 1/2] Adjusts setRequestHandler javadoc in CsrfFilter Adjusts setRequestHandler method javadoc in CsrfFilter class to reflect changes in 6.0. In 6.0, the default CsrfTokenRequestHandler changed to XorCsrfTokenRequestAttributeHandler, however, the javadoc for the setRequestHandler method still said it was CsrfTokenRequestAttributeHandler. This change adjusts the information to make it more accurate, because, although XorCsrfTokenRequestAttributeHandler is a subclass of CsrfTokenRequestAttributeHandler, the behavior is quite different. Closes gh-12464 --- .../java/org/springframework/security/web/csrf/CsrfFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java index c3294c93e7..eed9832b71 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java +++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java @@ -170,7 +170,7 @@ public final class CsrfFilter extends OncePerRequestFilter { * {@link CsrfToken} available as a request attribute. * *

- * The default is {@link CsrfTokenRequestAttributeHandler}. + * The default is {@link XorCsrfTokenRequestAttributeHandler}. *

* @param requestHandler the {@link CsrfTokenRequestHandler} to use * @since 5.8 From 4e80338a9b366997bad867deb6f476bdebade277 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Tue, 10 Jan 2023 11:22:22 -0600 Subject: [PATCH 2/2] Polish gh-12466 --- .../java/org/springframework/security/web/csrf/CsrfFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java index eed9832b71..06afa7747d 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java +++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.