Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fixes exception due to unread bytes in stream #1897

Merged
merged 6 commits into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions sanic/response.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def get_headers(
body=b"",
):
""".. deprecated:: 20.3:
This function is not public API and will be removed."""
This function is not public API and will be removed."""

# self.headers get priority over content_type
if self.content_type and "Content-Type" not in self.headers:
Expand Down Expand Up @@ -249,7 +249,10 @@ def raw(
:param content_type: the content type (string) of the response.
"""
return HTTPResponse(
body=body, status=status, headers=headers, content_type=content_type,
body=body,
status=status,
headers=headers,
content_type=content_type,
)


Expand Down
2 changes: 1 addition & 1 deletion sanic/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def _get(self, url, method, host):
return route_handler, [], kwargs, route.uri, route.name

def is_stream_handler(self, request):
""" Handler for request is stream or not.
"""Handler for request is stream or not.
:param request: Request object
:return: bool
"""
Expand Down
13 changes: 7 additions & 6 deletions sanic/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,12 +418,13 @@ async def body_append(self, body):
async def stream_append(self):
while self._body_chunks:
body = self._body_chunks.popleft()
if self.request.stream.is_full():
self.transport.pause_reading()
await self.request.stream.put(body)
self.transport.resume_reading()
else:
await self.request.stream.put(body)
if self.request:
if self.request.stream.is_full():
self.transport.pause_reading()
await self.request.stream.put(body)
self.transport.resume_reading()
else:
await self.request.stream.put(body)

def on_message_complete(self):
# Entire request (headers and whole body) is received.
Expand Down
4 changes: 3 additions & 1 deletion sanic/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ async def error_handler(request, exception):

if self.port:
server_kwargs = dict(
host=host or self.host, port=self.port, **server_kwargs,
host=host or self.host,
port=self.port,
**server_kwargs,
)
host, port = host or self.host, self.port
else:
Expand Down
2 changes: 1 addition & 1 deletion sanic/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ async def _check_alive(self):

@staticmethod
def _create_ssl_context(cfg):
""" Creates SSLContext instance for usage in asyncio.create_server.
"""Creates SSLContext instance for usage in asyncio.create_server.
See ssl.SSLSocket.__init__ for more details.
"""
ctx = ssl.SSLContext(cfg.ssl_version)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_keep_alive_timeout.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@ async def handler3(request):

def test_keep_alive_timeout_reuse():
"""If the server keep-alive timeout and client keep-alive timeout are
both longer than the delay, the client _and_ server will successfully
reuse the existing connection."""
both longer than the delay, the client _and_ server will successfully
reuse the existing connection."""
try:
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
Expand Down
7 changes: 3 additions & 4 deletions tests/test_request_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ def modify(request, response):
invalid = str(e)

j = loads(response.body)
j['response_mw_valid'] = user
j['response_mw_invalid'] = invalid
j["response_mw_valid"] = user
j["response_mw_invalid"] = invalid
return json(j)

request, response = app.test_client.get("/")
Expand All @@ -59,8 +59,7 @@ def modify(request, response):
"has_missing": False,
"invalid": "'types.SimpleNamespace' object has no attribute 'missing'",
"response_mw_valid": "sanic",
"response_mw_invalid":
"'types.SimpleNamespace' object has no attribute 'missing'"
"response_mw_invalid": "'types.SimpleNamespace' object has no attribute 'missing'",
}


Expand Down
18 changes: 18 additions & 0 deletions tests/test_request_stream.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import pytest
import asyncio

from sanic.blueprints import Blueprint
from sanic.exceptions import HeaderExpectationFailed
from sanic.request import StreamBuffer
from sanic.response import json, stream, text
from sanic.views import CompositionView, HTTPMethodView
from sanic.views import stream as stream_decorator
from sanic.server import HttpProtocol


data = "abc" * 1_000_000
Expand Down Expand Up @@ -337,6 +339,22 @@ async def post(request, id):
assert "Method GET not allowed for URL /post/random_id" in response.text


@pytest.mark.asyncio
async def test_request_stream_unread(app):
"""ensure no error is raised when leaving unread bytes in byte-buffer"""

err = None
protocol = HttpProtocol(loop=asyncio.get_event_loop(), app=app)
try:
protocol.request = None
protocol._body_chunks.append("this is a test")
await protocol.stream_append()
except AttributeError as e:
err = e

assert err is None and not protocol._body_chunks


def test_request_stream_blueprint(app):
"""for self.is_request_stream = True"""
bp = Blueprint("test_blueprint_request_stream_blueprint")
Expand Down