Merge branch '6.1.x' into 6.2.x

Closes gh-14346
spring-projects · Dec 18, 2023 · 03e4890 · 03e4890
2 parents ee73f29 + b855ccd
commit 03e4890
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...ava/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java b/...ava/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
@@ -823,7 +823,7 @@ private XXssConfig() {
 		 * replaced with "#". For example:
 		 *
 		 * <pre>
-		 * X-XSS-Protection: 1 ; mode=block
+		 * X-XSS-Protection: 1; mode=block
 		 * </pre>
 		 * @param headerValue the new header value
 		 * @since 5.8

diff --git a/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java
@@ -320,7 +320,7 @@ public void headersWhenXssProtectionValueEnabledThenXssProtectionWritten() {
 
 	@Test
 	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
 		this.http.headers()
 				.xssProtection()

diff --git a/...main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java b/...main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
@@ -74,7 +74,7 @@ public void writeHeaders(HttpServletRequest request, HttpServletResponse respons
 	 * specify mode as blocked. The content will be replaced with "#". For example:
 	 *
 	 * <pre>
-	 * X-XSS-Protection: 1 ; mode=block
+	 * X-XSS-Protection: 1; mode=block
 	 * </pre>
 	 * @param headerValue the new header value
 	 * @throws IllegalArgumentException when headerValue is null
@@ -86,7 +86,7 @@ public void setHeaderValue(HeaderValue headerValue) {
 	}
 
 	/**
-	 * 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
 	 * @since 5.8

diff --git a/...org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java b/...org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java
@@ -73,7 +73,7 @@ public Mono<Void> writeHttpHeaders(ServerWebExchange exchange) {
 	 * specify mode as blocked. The content will be replaced with "#". For example:
 	 *
 	 * <pre>
-	 * X-XSS-Protection: 1 ; mode=block
+	 * X-XSS-Protection: 1; mode=block
 	 * </pre>
 	 * @param headerValue the new headerValue
 	 * @throws IllegalArgumentException if headerValue is null
@@ -86,14 +86,14 @@ public void setHeaderValue(HeaderValue headerValue) {
 	}
 
 	/**
-	 * 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
 	 * @since 5.8
 	 */
 	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;
 

diff --git a/...pringframework/security/web/server/header/XXssProtectionServerHttpHeadersWriterTests.java b/...pringframework/security/web/server/header/XXssProtectionServerHttpHeadersWriterTests.java
@@ -82,7 +82,7 @@ void writeHeadersWhenEnabledModeBlockThenWriteHeaders() {
 		this.writer.writeHttpHeaders(this.exchange);
 		assertThat(this.headers).hasSize(1);
 		assertThat(this.headers.get(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION))
-			.containsOnly("1 ; mode=block");
+			.containsOnly("1; mode=block");
 	}
 
 }