Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix Range header handling for static files (#1402)

Browse Source 
This commit fixes the issue in the `Range` header handling that was done
while serving the file contents.

As per the HTTP response standards, a status code of 206 will be used in
case if the Range is returning a partial value and default of 200 in
other cases.

Signed-off-by: Harsha Narayana <harsha2k4@gmail.com>
This commit is contained in:
Harsha Narayana 2018-11-07 19:06:56 +05:30 committed by Stephen Sadowski
parent b63c06c75a
commit 92b73a6f4f
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sanic/handlers.py
View File

@ -167,17 +167,17 @@ class ContentRangeHandler:
) )
else: else:
# this case represents `Content-Range: bytes 5-` # this case represents `Content-Range: bytes 5-`
self.end = self.total self.end = self.total - 1
else: else:
if self.start is None: if self.start is None:
# this case represents `Content-Range: bytes -5` # this case represents `Content-Range: bytes -5`
self.start = self.total - self.end self.start = self.total - self.end
self.end = self.total self.end = self.total - 1
if self.start >= self.end: if self.start >= self.end:
raise ContentRangeError( raise ContentRangeError(
"Invalid for Content Range parameters", self "Invalid for Content Range parameters", self
) )
self.size = self.end - self.start self.size = self.end - self.start + 1
self.headers = { self.headers = {
"Content-Range": "bytes %s-%s/%s" "Content-Range": "bytes %s-%s/%s"
% (self.start, self.end, self.total) % (self.start, self.end, self.total)

2
sanic/response.py
View File

@ -302,6 +302,7 @@ async def file(
_range.end, _range.end,
_range.total, _range.total,
) )
status = 206
else: else:
out_stream = await _file.read() out_stream = await _file.read()
@ -371,6 +372,7 @@ async def file_stream(
_range.end, _range.end,
_range.total, _range.total,
) )
status = 206
return StreamingHTTPResponse( return StreamingHTTPResponse(
streaming_fn=_streaming_fn, streaming_fn=_streaming_fn,
status=status, status=status,

8
tests/test_static.py
View File

@ -84,11 +84,11 @@ def test_static_content_range_correct(app, file_name, static_file_directory):
'Range': 'bytes=12-19' 'Range': 'bytes=12-19'
} }
request, response = app.test_client.get('/testing.file', headers=headers) request, response = app.test_client.get('/testing.file', headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(
static_file_directory, file_name))[12:19] static_file_directory, file_name))[12:20]
assert int(response.headers[ assert int(response.headers[
'Content-Length']) == len(static_content) 'Content-Length']) == len(static_content)
assert response.body == static_content assert response.body == static_content
@ -104,7 +104,7 @@ def test_static_content_range_front(app, file_name, static_file_directory):
'Range': 'bytes=12-' 'Range': 'bytes=12-'
} }
request, response = app.test_client.get('/testing.file', headers=headers) request, response = app.test_client.get('/testing.file', headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(
@ -124,7 +124,7 @@ def test_static_content_range_back(app, file_name, static_file_directory):
'Range': 'bytes=-12' 'Range': 'bytes=-12'
} }
request, response = app.test_client.get('/testing.file', headers=headers) request, response = app.test_client.get('/testing.file', headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(

16
tests/test_url_for_static.py
View File

@ -212,11 +212,11 @@ def test_static_content_range_correct(app, file_name, static_file_directory):
assert uri == app.url_for('static', name='static', filename='any') assert uri == app.url_for('static', name='static', filename='any')
request, response = app.test_client.get(uri, headers=headers) request, response = app.test_client.get(uri, headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(
static_file_directory, file_name))[12:19] static_file_directory, file_name))[12:20]
assert int(response.headers[ assert int(response.headers[
'Content-Length']) == len(static_content) 'Content-Length']) == len(static_content)
assert response.body == static_content assert response.body == static_content
@ -233,11 +233,11 @@ def test_static_content_range_correct(app, file_name, static_file_directory):
filename='any') filename='any')
request, response = app.test_client.get(uri, headers=headers) request, response = app.test_client.get(uri, headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(
static_file_directory, file_name))[12:19] static_file_directory, file_name))[12:20]
assert int(response.headers[ assert int(response.headers[
'Content-Length']) == len(static_content) 'Content-Length']) == len(static_content)
assert response.body == static_content assert response.body == static_content
@ -263,7 +263,7 @@ def test_static_content_range_front(app, file_name, static_file_directory):
assert uri == app.url_for('static', name='static', filename='any') assert uri == app.url_for('static', name='static', filename='any')
request, response = app.test_client.get(uri, headers=headers) request, response = app.test_client.get(uri, headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(
@ -284,7 +284,7 @@ def test_static_content_range_front(app, file_name, static_file_directory):
filename='any') filename='any')
request, response = app.test_client.get(uri, headers=headers) request, response = app.test_client.get(uri, headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(
@ -314,7 +314,7 @@ def test_static_content_range_back(app, file_name, static_file_directory):
assert uri == app.url_for('static', name='static', filename='any') assert uri == app.url_for('static', name='static', filename='any')
request, response = app.test_client.get(uri, headers=headers) request, response = app.test_client.get(uri, headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(
@ -335,7 +335,7 @@ def test_static_content_range_back(app, file_name, static_file_directory):
filename='any') filename='any')
request, response = app.test_client.get(uri, headers=headers) request, response = app.test_client.get(uri, headers=headers)
assert response.status == 200 assert response.status == 206
assert 'Content-Length' in response.headers assert 'Content-Length' in response.headers
assert 'Content-Range' in response.headers assert 'Content-Range' in response.headers
static_content = bytes(get_file_content( static_content = bytes(get_file_content(