UNDERTOW-967 Range requests do not handle ranges that exceed the reso…

…urce content length correctly
undertow-io · Jan 24, 2017 · 2e3d5a3 · 2e3d5a3
1 parent 1b80b44
commit 2e3d5a3
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 7 deletions.
diff --git a/core/src/main/java/io/undertow/util/ByteRange.java b/core/src/main/java/io/undertow/util/ByteRange.java
@@ -147,15 +147,13 @@ public RangeResponseResult getResponseResult(final long resourceContentLength, S
 
         if(start == -1 ) {
             //suffix range
-            long toWrite = end;
-            if(toWrite >= 0) {
-                rangeLength = toWrite;
-            } else {
+            if(end < 0){
                 //ignore the range request
                 return new RangeResponseResult(0, 0, 0, "bytes */" + resourceContentLength, StatusCodes.REQUEST_RANGE_NOT_SATISFIABLE);
             }
-            start = resourceContentLength - end;
+            start = Math.max(resourceContentLength - end, 0);
             end = resourceContentLength - 1;
+            rangeLength = resourceContentLength - start;
         } else if(end == -1) {
             //prefix range
             long toWrite = resourceContentLength - start;
@@ -167,11 +165,11 @@ public RangeResponseResult getResponseResult(final long resourceContentLength, S
             }
             end = resourceContentLength - 1;
         } else {
+            end = Math.min(end, resourceContentLength - 1);
             if(start >= resourceContentLength || start > end) {
                 return new RangeResponseResult(0, 0, 0, "bytes */" + resourceContentLength, StatusCodes.REQUEST_RANGE_NOT_SATISFIABLE);
             }
-            long toWrite = end - start + 1;
-            rangeLength = toWrite;
+            rangeLength = end - start + 1;
         }
         return new RangeResponseResult(start, end, rangeLength,  "bytes " + start + "-" + end + "/" + resourceContentLength, StatusCodes.PARTIAL_CONTENT);
     }

diff --git a/core/src/test/java/io/undertow/server/handlers/RangeRequestTestCase.java b/core/src/test/java/io/undertow/server/handlers/RangeRequestTestCase.java
@@ -95,6 +95,22 @@ public void runTest(String path, boolean etag) throws IOException, InterruptedEx
             Assert.assertEquals( "bytes 2-3/10", result.getFirstHeader(Headers.CONTENT_RANGE_STRING).getValue());
 
             get = new HttpGet(DefaultServer.getDefaultServerURL() + path);
+            get.addHeader(Headers.RANGE_STRING, "bytes=3-1000");
+            result = client.execute(get);
+            Assert.assertEquals(StatusCodes.PARTIAL_CONTENT, result.getStatusLine().getStatusCode());
+            response = EntityUtils.toString(result.getEntity());
+            Assert.assertEquals("3456789", response);
+            Assert.assertEquals( "bytes 3-9/10", result.getFirstHeader(Headers.CONTENT_RANGE_STRING).getValue());
+
+            get = new HttpGet(DefaultServer.getDefaultServerURL() + path);
+            get.addHeader(Headers.RANGE_STRING, "bytes=3-9");
+            result = client.execute(get);
+            Assert.assertEquals(StatusCodes.PARTIAL_CONTENT, result.getStatusLine().getStatusCode());
+            response = EntityUtils.toString(result.getEntity());
+            Assert.assertEquals("3456789", response);
+            Assert.assertEquals( "bytes 3-9/10", result.getFirstHeader(Headers.CONTENT_RANGE_STRING).getValue());
+            get = new HttpGet(DefaultServer.getDefaultServerURL() + path);
+
             get.addHeader(Headers.RANGE_STRING, "bytes=0-0");
             result = client.execute(get);
             Assert.assertEquals(StatusCodes.PARTIAL_CONTENT, result.getStatusLine().getStatusCode());

diff --git a/servlet/src/test/java/io/undertow/servlet/test/defaultservlet/DefaultServletTestCase.java b/servlet/src/test/java/io/undertow/servlet/test/defaultservlet/DefaultServletTestCase.java
@@ -117,6 +117,21 @@ public void testRangeRequest() throws IOException, InterruptedException {
             String response = HttpClientUtils.readResponse(result);
             Assert.assertEquals("--", response);
 
+            get = new HttpGet(uri);
+            get.addHeader(Headers.RANGE_STRING, "bytes=3-100");
+            result = client.execute(get);
+            Assert.assertEquals(StatusCodes.PARTIAL_CONTENT, result.getStatusLine().getStatusCode());
+            response = EntityUtils.toString(result.getEntity());
+            Assert.assertEquals("3456789", response);
+            Assert.assertEquals("bytes 3-9/10", result.getFirstHeader(Headers.CONTENT_RANGE_STRING).getValue());
+
+            get = new HttpGet(uri);
+            get.addHeader(Headers.RANGE_STRING, "bytes=3-9");
+            result = client.execute(get);
+            Assert.assertEquals(StatusCodes.PARTIAL_CONTENT, result.getStatusLine().getStatusCode());
+            response = EntityUtils.toString(result.getEntity());
+            Assert.assertEquals("3456789", response);
+            Assert.assertEquals("bytes 3-9/10", result.getFirstHeader(Headers.CONTENT_RANGE_STRING).getValue());
 
             get = new HttpGet(uri);
             get.addHeader(Headers.RANGE_STRING, "bytes=2-3");
@@ -166,6 +181,14 @@ public void testRangeRequest() throws IOException, InterruptedException {
             Assert.assertEquals("9", response);
             Assert.assertEquals("bytes 9-9/10", result.getFirstHeader(Headers.CONTENT_RANGE_STRING).getValue());
 
+            get = new HttpGet(uri);
+            get.addHeader(Headers.RANGE_STRING, "bytes=-100");
+            result = client.execute(get);
+            Assert.assertEquals(StatusCodes.PARTIAL_CONTENT, result.getStatusLine().getStatusCode());
+            response = EntityUtils.toString(result.getEntity());
+            Assert.assertEquals("0123456789", response);
+            Assert.assertEquals("bytes 0-9/10", result.getFirstHeader(Headers.CONTENT_RANGE_STRING).getValue());
+
             get = new HttpGet(uri);
             get.addHeader(Headers.RANGE_STRING, "bytes=99-100");
             result = client.execute(get);