Fix incorrect weak ETag assertion

See gh-33374
spring-projects · Aug 13, 2024 · 1703b71 · 1703b71
1 parent 1911ca7
commit 1703b71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -1048,8 +1048,8 @@ public long getDate() {
 	 */
 	public void setETag(@Nullable String etag) {
 		if (etag != null) {
-			Assert.isTrue(etag.startsWith("\"") || etag.startsWith("W/"),
-					"Invalid ETag: does not start with W/ or \"");
+			Assert.isTrue(etag.startsWith("\"") || etag.startsWith("W/\""),
+					"Invalid ETag: does not start with W/\" or \"");
 			Assert.isTrue(etag.endsWith("\""), "Invalid ETag: does not end with \"");
 			set(ETAG, etag);
 		}

diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
@@ -196,6 +196,12 @@ void illegalETag() {
 		assertThatIllegalArgumentException().isThrownBy(() -> headers.setETag(eTag));
 	}
 
+	@Test
+	void illegalETagWithoutQuoteAfterWSlash() {
+		String etag = "W/v2.6\"";
+		assertThatIllegalArgumentException().as("Invalid Weak ETag").isThrownBy(() -> headers.setETag(etag));
+	}
+
 	@Test
 	void ifMatch() {
 		String ifMatch = "\"v2.6\"";