Static range requests

CONTRIBUTORS.txt

@@ -21,6 +21,7 @@ Alex Lisovoy
 Amy Boyle
 Andrei Ursulenko
 Andrej Antonov
+Andrew Leech
 Andrew Svetlov
 Andrii Soldatenko
 Anton Kasyanov

aiohttp/file_sender.py

@@ -1,6 +1,7 @@
 import asyncio
 import mimetypes
 import os
+import re
 
 from . import hdrs
 from .helpers import create_future
@@ -152,16 +153,48 @@ def send(self, request, filepath):
         if not ct:
             ct = 'application/octet-stream'
 
-        resp = self._response_factory()
+        file_size = st.st_size
+
+        status = 200
+        start = 0
+        end = file_size - 1
+
+        # Handle 206 range response if requested
+        if 'range' in request.headers:
+            from .web_exceptions import HTTPPartialContent, HTTPRequestRangeNotSatisfiable
+            status = HTTPPartialContent.status_code
+
+            range_header = request.headers['range'].lower()
+            if not range_header.startswith('bytes='):
+                raise HTTPRequestRangeNotSatisfiable
+
+            try:
+                range_start, range_end = re.findall(r'bytes=(\d*)-(\d*)', request.headers['range'].lower())[0]
+            except IndexError:
+                raise HTTPRequestRangeNotSatisfiable
+            if range_start and range_end:
+                start = int(range_start)
+                end = int(range_end)
+            elif range_start and not range_end:
+                start = int(range_start)
+            elif range_end and not range_start:
+                start = file_size - int(range_end)
+            else:
+                raise HTTPRequestRangeNotSatisfiable
+
+            if start >= file_size or end >= file_size or start > end:
+                raise HTTPRequestRangeNotSatisfiable
+
+        resp = self._response_factory(status=status)
         resp.content_type = ct
         if encoding:
             resp.headers[hdrs.CONTENT_ENCODING] = encoding
         resp.last_modified = st.st_mtime
 
-        file_size = st.st_size
-
-        resp.content_length = file_size
+        count = end - start + 1
+        resp.content_length = count
         with filepath.open('rb') as f:
-            yield from self._sendfile(request, resp, f, file_size)
+            f.seek(start)
+            yield from self._sendfile(request, resp, f, count)
 
         return resp

tests/test_web_sendfile_functional.py

@@ -1,7 +1,6 @@
 import asyncio
 import os
 import pathlib
-
 import pytest
 
 import aiohttp
@@ -323,3 +322,92 @@ def test_static_file_huge(loop, test_client, tmpdir):
         off += len(chunk)
         cnt += 1
     f.close()
+
+
+@asyncio.coroutine
+def test_static_file_range(loop, test_client, sender):
+    filepath = (pathlib.Path(__file__).parent /
+                'software_development_in_picture.jpg')
+
+    @asyncio.coroutine
+    def handler(request):
+        resp = yield from sender(chunk_size=16).send(request, filepath)
+        return resp
+
+    app = web.Application(loop=loop)
+    app.router.add_get('/', handler)
+    client = yield from test_client(lambda loop: app)
+
+    with filepath.open('rb') as f:
+        content = f.read()
+
+    # Ensure the whole file requested in parts is correct
+    resp = yield from client.get('/', headers={'Range': 'bytes=0-999'})
+    assert resp.status == 206
+    body1 = yield from resp.read()
+    assert len(body1) == 1000
+    resp.close()
+
+    resp = yield from client.get('/', headers={'Range': 'bytes=0-999'})
+    assert resp.status == 206
+    body1 = yield from resp.read()
+    assert len(body1) == 1000
+    resp.close()
+
+    resp = yield from client.get('/', headers={'Range': 'bytes=1000-1999'})
+    assert resp.status == 206
+    body2 = yield from resp.read()
+    assert len(body1) == 1000
+    resp.close()
+
+    resp = yield from client.get('/', headers={'Range': 'bytes=2000-'})
+    assert resp.status == 206
+    body3 = yield from resp.read()
+    resp.close()
+
+    assert content == (body1 + body2 + body3)
+
+    # Ensure the tail of the file is correct
+    resp = yield from client.get('/', headers={'Range': 'bytes=-500'})
+    assert resp.status == 206
+    body4 = yield from resp.read()
+    resp.close()
+    assert content[-500:] == body4
+
+
+
+@asyncio.coroutine
+def test_static_file_invalid_range(loop, test_client, sender):
+    filepath = (pathlib.Path(__file__).parent /
+                'software_development_in_picture.jpg')
+
+    @asyncio.coroutine
+    def handler(request):
+        resp = yield from sender(chunk_size=16).send(request, filepath)
+        return resp
+
+    app = web.Application(loop=loop)
+    app.router.add_get('/', handler)
+    client = yield from test_client(lambda loop: app)
+
+    file_len = filepath.stat().st_size
+
+    # range must be in bytes
+    resp = yield from client.get('/', headers={'Range': 'blocks=0-10'})
+    assert resp.status == 416, 'Range must be in bytes'
+    resp.close()
+
+    # Range end is inclusive
+    resp = yield from client.get('/', headers={'Range': 'bytes=0-%d' % file_len})
+    assert resp.status == 416, 'Range end must be inclusive'
+    resp.close()
+
+    # start > end
+    resp = yield from client.get('/', headers={'Range': 'bytes=10-5'})
+    assert resp.status == 416, "Range start can't be greater than end"
+    resp.close()
+
+    # non-number range
+    resp = yield from client.get('/', headers={'Range': 'bytes=a-f'})
+    assert resp.status == 416, 'Range must be integers'
+    resp.close()