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

Reject range starting above resource length 

Closes: gh-23576
This commit is contained in:
Rossen Stoyanchev 2019-09-04 18:05:39 +01:00
parent 70bbe71235
commit bc81fa520e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-web/src/main/java/org/springframework/http/HttpRange.java
View File

@ -65,6 +65,7 @@ public abstract class HttpRange {
long contentLength = getLengthFor(resource); long contentLength = getLengthFor(resource);
long start = getRangeStart(contentLength); long start = getRangeStart(contentLength);
long end = getRangeEnd(contentLength); long end = getRangeEnd(contentLength);
Assert.isTrue(start < contentLength, "'position' exceeds the resource length " + contentLength);
return new ResourceRegion(resource, start, end - start + 1); return new ResourceRegion(resource, start, end - start + 1);
} }

14
spring-web/src/test/java/org/springframework/http/HttpRangeTests.java
View File

@ -158,8 +158,7 @@ public class HttpRangeTests {
ByteArrayResource resource = mock(ByteArrayResource.class); ByteArrayResource resource = mock(ByteArrayResource.class);
given(resource.contentLength()).willReturn(-1L); given(resource.contentLength()).willReturn(-1L);
HttpRange range = HttpRange.createByteRange(0, 9); HttpRange range = HttpRange.createByteRange(0, 9);
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource));
range.toResourceRegion(resource));
} }
@Test @Test
@ -167,8 +166,15 @@ public class HttpRangeTests {
InputStreamResource resource = mock(InputStreamResource.class); InputStreamResource resource = mock(InputStreamResource.class);
given(resource.contentLength()).willThrow(IOException.class); given(resource.contentLength()).willThrow(IOException.class);
HttpRange range = HttpRange.createByteRange(0, 9); HttpRange range = HttpRange.createByteRange(0, 9);
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource));
range.toResourceRegion(resource)); }
@Test // gh-23576
public void toResourceRegionStartingAtResourceByteCount() {
byte[] bytes = "Spring Framework".getBytes(StandardCharsets.UTF_8);
ByteArrayResource resource = new ByteArrayResource(bytes);
HttpRange range = HttpRange.createByteRange(resource.contentLength());
assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource));
} }
@Test @Test