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

Merge branch '6.1.x'

This commit is contained in:
Stéphane Nicoll 2024-07-23 10:51:56 +02:00
parent 92385418ae 6e9a19212f
commit eda21c4d22
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-web/src/main/java/org/springframework/web/util/ContentCachingResponseWrapper.java
View File

@ -140,11 +140,15 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
@Override @Override
public void setContentLengthLong(long len) { public void setContentLengthLong(long len) {
if (len > Integer.MAX_VALUE) { setContentLength(toContentLengthInt(len));
}
private int toContentLengthInt(long contentLength) {
if (contentLength > Integer.MAX_VALUE) {
throw new IllegalArgumentException("Content-Length exceeds ContentCachingResponseWrapper's maximum (" + throw new IllegalArgumentException("Content-Length exceeds ContentCachingResponseWrapper's maximum (" +
Integer.MAX_VALUE + "): " + len); Integer.MAX_VALUE + "): " + contentLength);
} }
setContentLength((int) len); return (int) contentLength;
} }
@Override @Override
@ -160,7 +164,7 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
@Override @Override
public void setHeader(String name, String value) { public void setHeader(String name, String value) {
if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) { if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) {
this.contentLength = Integer.valueOf(value); this.contentLength = toContentLengthInt(Long.parseLong(value));
} }
else { else {
super.setHeader(name, value); super.setHeader(name, value);
@ -170,7 +174,7 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
@Override @Override
public void addHeader(String name, String value) { public void addHeader(String name, String value) {
if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) { if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) {
this.contentLength = Integer.valueOf(value); this.contentLength = toContentLengthInt(Long.parseLong(value));
} }
else { else {
super.addHeader(name, value); super.addHeader(name, value);
@ -180,7 +184,7 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
@Override @Override
public void setIntHeader(String name, int value) { public void setIntHeader(String name, int value) {
if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) { if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) {
this.contentLength = Integer.valueOf(value); this.contentLength = value;
} }
else { else {
super.setIntHeader(name, value); super.setIntHeader(name, value);
@ -190,7 +194,7 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
@Override @Override
public void addIntHeader(String name, int value) { public void addIntHeader(String name, int value) {
if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) { if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) {
this.contentLength = Integer.valueOf(value); this.contentLength = value;
} }
else { else {
super.addIntHeader(name, value); super.addIntHeader(name, value);

38
spring-web/src/test/java/org/springframework/web/filter/ContentCachingResponseWrapperTests.java
View File

@ -31,6 +31,7 @@ import org.springframework.web.util.ContentCachingResponseWrapper;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.jupiter.api.Named.named; import static org.junit.jupiter.api.Named.named;
import static org.springframework.http.HttpHeaders.CONTENT_LENGTH; import static org.springframework.http.HttpHeaders.CONTENT_LENGTH;
import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
@ -233,6 +234,43 @@ class ContentCachingResponseWrapperTests {
assertThat(response.getContentAsByteArray()).isEqualTo(responseBody); assertThat(response.getContentAsByteArray()).isEqualTo(responseBody);
} }
@Test
void setContentLengthAbove2GbViaSetContentLengthLong() {
MockHttpServletResponse response = new MockHttpServletResponse();
ContentCachingResponseWrapper responseWrapper = new ContentCachingResponseWrapper(response);
long overflow = (long) Integer.MAX_VALUE + 1;
assertThatIllegalArgumentException()
.isThrownBy(() -> responseWrapper.setContentLengthLong(overflow))
.withMessageContaining("Content-Length exceeds ContentCachingResponseWrapper's maximum")
.withMessageContaining(String.valueOf(overflow));
}
@Test
void setContentLengthAbove2GbViaAddHeader() {
MockHttpServletResponse response = new MockHttpServletResponse();
ContentCachingResponseWrapper responseWrapper = new ContentCachingResponseWrapper(response);
String overflow = String.valueOf((long) Integer.MAX_VALUE + 1);
assertThatIllegalArgumentException()
.isThrownBy(() -> responseWrapper.addHeader(CONTENT_LENGTH, overflow))
.withMessageContaining("Content-Length exceeds ContentCachingResponseWrapper's maximum")
.withMessageContaining(overflow);
}
@Test
void setContentLengthAbove2GbViaSetHeader() {
MockHttpServletResponse response = new MockHttpServletResponse();
ContentCachingResponseWrapper responseWrapper = new ContentCachingResponseWrapper(response);
String overflow = String.valueOf((long) Integer.MAX_VALUE + 1);
assertThatIllegalArgumentException()
.isThrownBy(() -> responseWrapper.setHeader(CONTENT_LENGTH, overflow))
.withMessageContaining("Content-Length exceeds ContentCachingResponseWrapper's maximum")
.withMessageContaining(overflow);
}
private void assertHeader(HttpServletResponse response, String header, int value) { private void assertHeader(HttpServletResponse response, String header, int value) {
assertHeader(response, header, Integer.toString(value)); assertHeader(response, header, Integer.toString(value));
} }