root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing contribution 

Closes gh-33374
This commit is contained in:
rstoyanchev 2024-08-13 16:59:13 +03:00
parent 1703b71563
commit fe4fd00429
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/main/java/org/springframework/http/HttpHeaders.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@ -1048,9 +1048,8 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
*/
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.endsWith("\""), "Invalid ETag: does not end with \"");
Assert.isTrue(etag.startsWith("\"") || etag.startsWith("W/\""), "ETag does not start with W/\" or \"");
Assert.isTrue(etag.endsWith("\""), "ETag does not end with \"");
set(ETAG, etag);
}
else {

6
spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
View File

@ -191,15 +191,15 @@ class HttpHeadersTests {
}
@Test
void illegalETag() {
void illegalETagWithoutQuotes() {
String eTag = "v2.6";
assertThatIllegalArgumentException().isThrownBy(() -> headers.setETag(eTag));
}
@Test
void illegalETagWithoutQuoteAfterWSlash() {
void illegalWeakETagWithoutLeadingQuote() {
String etag = "W/v2.6\"";
assertThatIllegalArgumentException().as("Invalid Weak ETag").isThrownBy(() -> headers.setETag(etag));
assertThatIllegalArgumentException().isThrownBy(() -> headers.setETag(etag));
}
@Test