Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x' into 6.2.x 

Closes gh-14346
This commit is contained in:
Josh Cummings 2023-12-18 11:47:23 -07:00
parent ee73f29be5 b855ccdb09
commit 03e48905c7
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
View File

@ -823,7 +823,7 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* replaced with "#". For example: * replaced with "#". For example:
* *
* <pre> * <pre>
* X-XSS-Protection: 1 ; mode=block * X-XSS-Protection: 1; mode=block
* </pre> * </pre>
* @param headerValue the new header value * @param headerValue the new header value
* @since 5.8 * @since 5.8

2
config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java
View File

@ -320,7 +320,7 @@ public class HeaderSpecTests {
@Test @Test
public void headersWhenXssProtectionValueEnabledModeBlockThenXssProtectionWritten() { public void headersWhenXssProtectionValueEnabledModeBlockThenXssProtectionWritten() {
this.expectedHeaders.set(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION, "1 ; mode=block"); this.expectedHeaders.set(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION, "1; mode=block");
// @formatter:off // @formatter:off
this.http.headers() this.http.headers()
.xssProtection() .xssProtection()

4
web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
View File

@ -74,7 +74,7 @@ public final class XXssProtectionHeaderWriter implements HeaderWriter {
* specify mode as blocked. The content will be replaced with "#". For example: * specify mode as blocked. The content will be replaced with "#". For example:
* *
* <pre> * <pre>
* X-XSS-Protection: 1 ; mode=block * X-XSS-Protection: 1; mode=block
* </pre> * </pre>
* @param headerValue the new header value * @param headerValue the new header value
* @throws IllegalArgumentException when headerValue is null * @throws IllegalArgumentException when headerValue is null
@ -86,7 +86,7 @@ public final class XXssProtectionHeaderWriter implements HeaderWriter {
} }
/** /**
* The value of the x-xss-protection header. One of: "0", "1", "1 ; mode=block" * The value of the x-xss-protection header. One of: "0", "1", "1; mode=block"
* *
* @author Daniel Garnier-Moiroux * @author Daniel Garnier-Moiroux
* @since 5.8 * @since 5.8

6
web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java
View File

@ -73,7 +73,7 @@ public class XXssProtectionServerHttpHeadersWriter implements ServerHttpHeadersW
* specify mode as blocked. The content will be replaced with "#". For example: * specify mode as blocked. The content will be replaced with "#". For example:
* *
* <pre> * <pre>
* X-XSS-Protection: 1 ; mode=block * X-XSS-Protection: 1; mode=block
* </pre> * </pre>
* @param headerValue the new headerValue * @param headerValue the new headerValue
* @throws IllegalArgumentException if headerValue is null * @throws IllegalArgumentException if headerValue is null
@ -86,14 +86,14 @@ public class XXssProtectionServerHttpHeadersWriter implements ServerHttpHeadersW
} }
/** /**
* The value of the x-xss-protection header. One of: "0", "1", "1 ; mode=block" * The value of the x-xss-protection header. One of: "0", "1", "1; mode=block"
* *
* @author Daniel Garnier-Moiroux * @author Daniel Garnier-Moiroux
* @since 5.8 * @since 5.8
*/ */
public enum HeaderValue { public enum HeaderValue {
DISABLED("0"), ENABLED("1"), ENABLED_MODE_BLOCK("1 ; mode=block"); DISABLED("0"), ENABLED("1"), ENABLED_MODE_BLOCK("1; mode=block");
private final String value; private final String value;

2
web/src/test/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriterTests.java
View File

@ -82,7 +82,7 @@ public class XXssProtectionServerHttpHeadersWriterTests {
this.writer.writeHttpHeaders(this.exchange); this.writer.writeHttpHeaders(this.exchange);
assertThat(this.headers).hasSize(1); assertThat(this.headers).hasSize(1);
assertThat(this.headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION)) assertThat(this.headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION))
.containsOnly("1 ; mode=block"); .containsOnly("1; mode=block");
} }
} }