bc08383acd
* Remove unnecessary import in test_constants.py, which also fixes an error on win (#2180) Co-authored-by: Adam Hopkins <admhpkns@gmail.com> * Manually reset the buffer when streaming request body (#2183) * Remove Duplicated Dependencies and PEP 517 Support (#2173) * Remove duplicated dependencies * Specify setuptools as the tool for generating distribution (PEP 517) * Add `isort` to `dev_require` * manage all dependencies in setup.py * Execute `make pretty` * Set usedevelop to true (revert previous change) * Fix the handling of the end of a chunked request. (#2188) * Fix the handling of the end of a chunked request. * Avoid hardcoding final chunk header size. * Add some unit tests for pipeline body reading * Decode bytes for json serialization Co-authored-by: L. Kärkkäinen <tronic@users.noreply.github.com> Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Resolve regressions in exceptions (#2181) * Update sanic-routing to fix path issues plus lookahead / lookbehind support (#2178) * Update sanic-routing to fix path issues plus lookahead / lookbehind support * Update setup.py Co-authored-by: Adam Hopkins <adam@amhopkins.com> Co-authored-by: Adam Hopkins <admhpkns@gmail.com> * style(app,blueprints): add some type hints (#2196) * style(app,blueprints): add some type hints * style(app): option is Any * style(blueprints): url prefix default value is ``""`` * style(app): backward compatible * style(app): backward compatible * style(blueprints): defult is None * style(app): apply code style (black) * Update some CC config (#2199) * Update README.rst * raise exception for `_static_request_handler` unknown exception; add test with custom error (#2195) Co-authored-by: n.feofanov <n.feofanov@visionlabs.ru> Co-authored-by: Adam Hopkins <admhpkns@gmail.com> * Change dumps to AnyStr (#2193) * HTTP tests (#2194) * Fix issues with after request handling in HTTP pipelining (#2201) * Clean up after a request is complete, before the next pipelined request. * Limit the size of request body consumed after handler has finished. * Linter error. * Add unit test re: bad headers Co-authored-by: L. Kärkkäinen <tronic@users.noreply.github.com> Co-authored-by: Adam Hopkins <admhpkns@gmail.com> Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Update CHANGELOG * Log remote address if available (#2207) * Log remote address if available * Add tests * Fix testing version Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Fixed for handling exceptions of asgi app call. (#2211) @cansarigol3megawatt Thanks for looking into this and getting the quick turnaround on this. I will 🍒 pick this into the 21.6 branch and get it out a little later tonight. * Signals Integration (#2160) * Update some tests * Resolve #2122 route decorator returning tuple * Use rc sanic-routing version * Update unit tests to <:str> * Minimal working version with some signals implemented * Add more http signals * Update ASGI and change listeners to signals * Allow for dynamic ODE signals * Allow signals to be stacked * Begin tests * Prioritize match_info on keyword argument injection * WIP on tests * Compat with signals * Work through some test coverage * Passing tests * Post linting * Setup proper resets * coverage reporting * Fixes from vltr comments * clear delayed tasks * Fix bad test * rm pycache * uncomment windows tests (#2214) * Add convenience methods to BP groups (#2209) * Fix bug where ws exceptions not being logged (#2213) * Fix bug where ws exceptions not being logged * Fix t\est * Style: add type hints (#2217) * style(routes): add_route argument, return typing * style(listeners): typing * style(views): typing as_view * style(routes): change type hint * style(listeners): change type hint * style(routes): change type hint * add some more types * Change as_view typing * Add some cleaner type annotations Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Add default messages to SanicExceptions (#2216) * Add default messages to SanicExceptions * Cleaner exception message setting * Copy Blueprints Implementation (#2184) * Accept header parsing (#2200) * Add some tests * docstring * Add accept matching * Add some more tests on matching * Add matching flags for wildcards * Add mathing controls to accept * Limit uvicorn 14 in testing * Add convenience for annotated handlers (#2225) * Split HttpProtocol parts into base SanicProtocol and HTTPProtocol subclass (#2229) * Split HttpProtocol parts into base SanicProtocol and HTTPProtocol subclass. * lint fixes * re-black server.py * Move server.py into its own module (#2230) * Move server.py into its own module * Change monkeypatch path on test_logging.py * Blueprint specific exception handlers (#2208) * Call abort() on sockets after close() to prevent dangling sockets (#2231) * Add ability to return Falsey but not-None from handlers (#2236) * Adds Blueprint Group exception decorator (#2238) * Add exception decorator * Added tests * Fix line too long * Static DIR and FILE resource types (#2244) * Explicit static directive for serving file or dir Co-authored-by: anbuhckr <36891836+anbuhckr@users.noreply.github.com> Co-authored-by: anbuhckr <miki.suhendra@gmail.com> * Close HTTP loop when connection task cancelled (#2245) * Terminate loop when no transport exists * Add log when closing HTTP loop because of shutdown * Add unit test * New websockets (#2158) * First attempt at new Websockets implementation based on websockets >= 9.0, with sans-i/o features. Requires more work. * Update sanic/websocket.py Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Update sanic/websocket.py Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Update sanic/websocket.py Co-authored-by: Adam Hopkins <adam@amhopkins.com> * wip, update websockets code to new Sans/IO API * Refactored new websockets impl into own modules Incorporated other suggestions made by team * Another round of work on the new websockets impl * Added websocket_timeout support (matching previous/legacy support) * Lots more comments * Incorporated suggested changes from previous round of review * Changed RuntimeError usage to ServerError * Changed SanicException usage to ServerError * Removed some redundant asserts * Change remaining asserts to ServerErrors * Fixed some timeout handling issues * Fixed websocket.close() handling, and made it more robust * Made auto_close task smarter and more error-resilient * Made fail_connection routine smarter and more error-resilient * Further new websockets impl fixes * Update compatibility with Websockets v10 * Track server connection state in a more precise way * Try to handle the shutdown process more gracefully * Add a new end_connection() helper, to use as an alterative to close() or fail_connection() * Kill the auto-close task and keepalive-timeout task when sanic is shutdown * Deprecate WEBSOCKET_READ_LIMIT and WEBSOCKET_WRITE_LIMIT configs, they are not used in this implementation. * Change a warning message to debug level Remove default values for deprecated websocket parameters * Fix flake8 errors * Fix a couple of missed failing tests * remove websocket bench from examples * Integrate suggestions from code reviews Use Optional[T] instead of union[T,None] Fix mypy type logic errors change "is not None" to truthy checks where appropriate change "is None" to falsy checks were appropriate Add more debug logging when debug mode is on Change to using sanic.logger for debug logging rather than error_logger. * Fix long line lengths of debug messages Add some new debug messages when websocket IO is paused and unpaused for flow control Fix websocket example to use app.static() * remove unused import in websocket example app * re-run isort after Flake8 fixes Co-authored-by: Adam Hopkins <adam@amhopkins.com> Co-authored-by: Adam Hopkins <admhpkns@gmail.com> * Account for BP with exception handler but no routes (#2246) * Don't log "enabled" if auto-reload disabled (#2247) Fixes #2240 Co-authored-by: Adam Hopkins <admhpkns@gmail.com> * Smarter auto fallback (#2162) * Smarter auto fallback * remove config from blueprints * Add tests for error formatting * Add check for proper format * Fix some tests * Add some tests * docstring * Add accept matching * Add some more tests on matching * Fix contains bug, earlier return on MediaType eq * Add matching flags for wildcards * Add mathing controls to accept * Cleanup dev cruft * Add cleanup and resolve OSError relating to test implementation * Fix test * Fix some typos * Some fixes to the new Websockets impl (#2248) * First attempt at new Websockets implementation based on websockets >= 9.0, with sans-i/o features. Requires more work. * Update sanic/websocket.py Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Update sanic/websocket.py Co-authored-by: Adam Hopkins <adam@amhopkins.com> * Update sanic/websocket.py Co-authored-by: Adam Hopkins <adam@amhopkins.com> * wip, update websockets code to new Sans/IO API * Refactored new websockets impl into own modules Incorporated other suggestions made by team * Another round of work on the new websockets impl * Added websocket_timeout support (matching previous/legacy support) * Lots more comments * Incorporated suggested changes from previous round of review * Changed RuntimeError usage to ServerError * Changed SanicException usage to ServerError * Removed some redundant asserts * Change remaining asserts to ServerErrors * Fixed some timeout handling issues * Fixed websocket.close() handling, and made it more robust * Made auto_close task smarter and more error-resilient * Made fail_connection routine smarter and more error-resilient * Further new websockets impl fixes * Update compatibility with Websockets v10 * Track server connection state in a more precise way * Try to handle the shutdown process more gracefully * Add a new end_connection() helper, to use as an alterative to close() or fail_connection() * Kill the auto-close task and keepalive-timeout task when sanic is shutdown * Deprecate WEBSOCKET_READ_LIMIT and WEBSOCKET_WRITE_LIMIT configs, they are not used in this implementation. * Change a warning message to debug level Remove default values for deprecated websocket parameters * Fix flake8 errors * Fix a couple of missed failing tests * remove websocket bench from examples * Integrate suggestions from code reviews Use Optional[T] instead of union[T,None] Fix mypy type logic errors change "is not None" to truthy checks where appropriate change "is None" to falsy checks were appropriate Add more debug logging when debug mode is on Change to using sanic.logger for debug logging rather than error_logger. * Fix long line lengths of debug messages Add some new debug messages when websocket IO is paused and unpaused for flow control Fix websocket example to use app.static() * remove unused import in websocket example app * re-run isort after Flake8 fixes * Some fixes to the new Websockets impl Will throw WebsocketClosed exception instead of ServerException now when attempting to read or write to closed websocket, this makes it easier to catch The various ws.recv() methods now have the ability to raise CancelledError into your websocket handler Fix a niche close-socket negotiation bug Fix bug where http protocol thought the websocket never sent any response. Allow data to still send in some cases after websocket enters CLOSING state. Fix some badly formatted and badly placed comments * allow eof_received to send back data too, if the connection is in CLOSING state Co-authored-by: Adam Hopkins <adam@amhopkins.com> Co-authored-by: Adam Hopkins <admhpkns@gmail.com> * 21.9 release docs (#2218) * Beging 21.9 release docs * Add PRs to changelog * Change deprecation version * Update logging tests * Bump version * Update changelog * Change dev install command (#2251) Co-authored-by: Zhiwei <zhi.wei.liang@outlook.com> Co-authored-by: L. Kärkkäinen <98187+Tronic@users.noreply.github.com> Co-authored-by: L. Kärkkäinen <tronic@users.noreply.github.com> Co-authored-by: Robert Palmer <robd003@users.noreply.github.com> Co-authored-by: Ryu JuHeon <saidbysolo@gmail.com> Co-authored-by: gluhar2006 <49654448+gluhar2006@users.noreply.github.com> Co-authored-by: n.feofanov <n.feofanov@visionlabs.ru> Co-authored-by: Néstor Pérez <25409753+prryplatypus@users.noreply.github.com> Co-authored-by: Can Sarigol <56863826+cansarigol3megawatt@users.noreply.github.com> Co-authored-by: Zhiwei <chihwei.public@outlook.com> Co-authored-by: YongChan Cho <h3236516@gmail.com> Co-authored-by: Zhiwei <zhiwei@sinatra.ai> Co-authored-by: Ashley Sommer <ashleysommer@gmail.com> Co-authored-by: anbuhckr <36891836+anbuhckr@users.noreply.github.com> Co-authored-by: anbuhckr <miki.suhendra@gmail.com>
275 lines
8.2 KiB
Python
275 lines
8.2 KiB
Python
import logging
|
|
import warnings
|
|
|
|
import pytest
|
|
|
|
from bs4 import BeautifulSoup
|
|
|
|
from sanic import Sanic
|
|
from sanic.exceptions import (
|
|
Forbidden,
|
|
InvalidUsage,
|
|
NotFound,
|
|
SanicException,
|
|
ServerError,
|
|
Unauthorized,
|
|
abort,
|
|
)
|
|
from sanic.response import text
|
|
from websockets.version import version as websockets_version
|
|
|
|
|
|
class SanicExceptionTestException(Exception):
|
|
pass
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def exception_app():
|
|
app = Sanic("test_exceptions")
|
|
|
|
@app.route("/")
|
|
def handler(request):
|
|
return text("OK")
|
|
|
|
@app.route("/error")
|
|
def handler_error(request):
|
|
raise ServerError("OK")
|
|
|
|
@app.route("/404")
|
|
def handler_404(request):
|
|
raise NotFound("OK")
|
|
|
|
@app.route("/403")
|
|
def handler_403(request):
|
|
raise Forbidden("Forbidden")
|
|
|
|
@app.route("/401")
|
|
def handler_401(request):
|
|
raise Unauthorized("Unauthorized")
|
|
|
|
@app.route("/401/basic")
|
|
def handler_401_basic(request):
|
|
raise Unauthorized("Unauthorized", scheme="Basic", realm="Sanic")
|
|
|
|
@app.route("/401/digest")
|
|
def handler_401_digest(request):
|
|
raise Unauthorized(
|
|
"Unauthorized",
|
|
scheme="Digest",
|
|
realm="Sanic",
|
|
qop="auth, auth-int",
|
|
algorithm="MD5",
|
|
nonce="abcdef",
|
|
opaque="zyxwvu",
|
|
)
|
|
|
|
@app.route("/401/bearer")
|
|
def handler_401_bearer(request):
|
|
raise Unauthorized("Unauthorized", scheme="Bearer")
|
|
|
|
@app.route("/invalid")
|
|
def handler_invalid(request):
|
|
raise InvalidUsage("OK")
|
|
|
|
@app.route("/abort/401")
|
|
def handler_401_error(request):
|
|
raise SanicException(status_code=401)
|
|
|
|
@app.route("/abort")
|
|
def handler_500_error(request):
|
|
raise SanicException(status_code=500)
|
|
|
|
@app.route("/old_abort")
|
|
def handler_old_abort_error(request):
|
|
abort(500)
|
|
|
|
@app.route("/abort/message")
|
|
def handler_abort_message(request):
|
|
raise SanicException(message="Custom Message", status_code=500)
|
|
|
|
@app.route("/divide_by_zero")
|
|
def handle_unhandled_exception(request):
|
|
_ = 1 / 0
|
|
|
|
@app.route("/error_in_error_handler_handler")
|
|
def custom_error_handler(request):
|
|
raise SanicExceptionTestException("Dummy message!")
|
|
|
|
@app.exception(SanicExceptionTestException)
|
|
def error_in_error_handler_handler(request, exception):
|
|
_ = 1 / 0
|
|
|
|
return app
|
|
|
|
|
|
def test_catch_exception_list(app):
|
|
@app.exception([SanicExceptionTestException, NotFound])
|
|
def exception_list(request, exception):
|
|
return text("ok")
|
|
|
|
@app.route("/")
|
|
def exception(request):
|
|
raise SanicExceptionTestException("You won't see me")
|
|
|
|
request, response = app.test_client.get("/random")
|
|
assert response.text == "ok"
|
|
|
|
request, response = app.test_client.get("/")
|
|
assert response.text == "ok"
|
|
|
|
|
|
def test_no_exception(exception_app):
|
|
"""Test that a route works without an exception"""
|
|
request, response = exception_app.test_client.get("/")
|
|
assert response.status == 200
|
|
assert response.text == "OK"
|
|
|
|
|
|
def test_server_error_exception(exception_app):
|
|
"""Test the built-in ServerError exception works"""
|
|
request, response = exception_app.test_client.get("/error")
|
|
assert response.status == 500
|
|
|
|
|
|
def test_invalid_usage_exception(exception_app):
|
|
"""Test the built-in InvalidUsage exception works"""
|
|
request, response = exception_app.test_client.get("/invalid")
|
|
assert response.status == 400
|
|
|
|
|
|
def test_not_found_exception(exception_app):
|
|
"""Test the built-in NotFound exception works"""
|
|
request, response = exception_app.test_client.get("/404")
|
|
assert response.status == 404
|
|
|
|
|
|
def test_forbidden_exception(exception_app):
|
|
"""Test the built-in Forbidden exception"""
|
|
request, response = exception_app.test_client.get("/403")
|
|
assert response.status == 403
|
|
|
|
|
|
def test_unauthorized_exception(exception_app):
|
|
"""Test the built-in Unauthorized exception"""
|
|
request, response = exception_app.test_client.get("/401")
|
|
assert response.status == 401
|
|
|
|
request, response = exception_app.test_client.get("/401/basic")
|
|
assert response.status == 401
|
|
assert response.headers.get("WWW-Authenticate") is not None
|
|
assert response.headers.get("WWW-Authenticate") == 'Basic realm="Sanic"'
|
|
|
|
request, response = exception_app.test_client.get("/401/digest")
|
|
assert response.status == 401
|
|
|
|
auth_header = response.headers.get("WWW-Authenticate")
|
|
assert auth_header is not None
|
|
assert auth_header.startswith("Digest")
|
|
assert 'qop="auth, auth-int"' in auth_header
|
|
assert 'algorithm="MD5"' in auth_header
|
|
assert 'nonce="abcdef"' in auth_header
|
|
assert 'opaque="zyxwvu"' in auth_header
|
|
|
|
request, response = exception_app.test_client.get("/401/bearer")
|
|
assert response.status == 401
|
|
assert response.headers.get("WWW-Authenticate") == "Bearer"
|
|
|
|
|
|
def test_handled_unhandled_exception(exception_app):
|
|
"""Test that an exception not built into sanic is handled"""
|
|
request, response = exception_app.test_client.get("/divide_by_zero")
|
|
assert response.status == 500
|
|
soup = BeautifulSoup(response.body, "html.parser")
|
|
assert "Internal Server Error" in soup.h1.text
|
|
|
|
message = " ".join(soup.p.text.split())
|
|
assert message == (
|
|
"The server encountered an internal error and "
|
|
"cannot complete your request."
|
|
)
|
|
|
|
|
|
def test_exception_in_exception_handler(exception_app):
|
|
"""Test that an exception thrown in an error handler is handled"""
|
|
request, response = exception_app.test_client.get(
|
|
"/error_in_error_handler_handler"
|
|
)
|
|
assert response.status == 500
|
|
assert response.body == b"An error occurred while handling an error"
|
|
|
|
|
|
def test_exception_in_exception_handler_debug_off(exception_app):
|
|
"""Test that an exception thrown in an error handler is handled"""
|
|
request, response = exception_app.test_client.get(
|
|
"/error_in_error_handler_handler", debug=False
|
|
)
|
|
assert response.status == 500
|
|
assert response.body == b"An error occurred while handling an error"
|
|
|
|
|
|
def test_exception_in_exception_handler_debug_on(exception_app):
|
|
"""Test that an exception thrown in an error handler is handled"""
|
|
request, response = exception_app.test_client.get(
|
|
"/error_in_error_handler_handler", debug=True
|
|
)
|
|
assert response.status == 500
|
|
assert response.body.startswith(b"Exception raised in exception ")
|
|
|
|
|
|
def test_sanic_exception(exception_app):
|
|
"""Test sanic exceptions are handled"""
|
|
request, response = exception_app.test_client.get("/abort/401")
|
|
assert response.status == 401
|
|
|
|
request, response = exception_app.test_client.get("/abort")
|
|
assert response.status == 500
|
|
# check fallback message
|
|
assert "Internal Server Error" in response.text
|
|
|
|
request, response = exception_app.test_client.get("/abort/message")
|
|
assert response.status == 500
|
|
assert "Custom Message" in response.text
|
|
|
|
with warnings.catch_warnings(record=True) as w:
|
|
request, response = exception_app.test_client.get("/old_abort")
|
|
assert response.status == 500
|
|
assert len(w) == 1 and "deprecated" in w[0].message.args[0]
|
|
|
|
|
|
def test_custom_exception_default_message(exception_app):
|
|
class TeaError(SanicException):
|
|
message = "Tempest in a teapot"
|
|
status_code = 418
|
|
|
|
exception_app.router.reset()
|
|
|
|
@exception_app.get("/tempest")
|
|
def tempest(_):
|
|
raise TeaError
|
|
|
|
_, response = exception_app.test_client.get("/tempest", debug=True)
|
|
assert response.status == 418
|
|
assert b"Tempest in a teapot" in response.body
|
|
|
|
|
|
def test_exception_in_ws_logged(caplog):
|
|
app = Sanic(__file__)
|
|
|
|
@app.websocket("/feed")
|
|
async def feed(request, ws):
|
|
raise Exception("...")
|
|
|
|
with caplog.at_level(logging.INFO):
|
|
app.test_client.websocket("/feed")
|
|
# Websockets v10.0 and above output an additional
|
|
# INFO message when a ws connection is accepted
|
|
ws_version_parts = websockets_version.split(".")
|
|
ws_major = int(ws_version_parts[0])
|
|
record_index = 2 if ws_major >= 10 else 1
|
|
assert caplog.record_tuples[record_index][0] == "sanic.error"
|
|
assert caplog.record_tuples[record_index][1] == logging.ERROR
|
|
assert (
|
|
"Exception occurred while handling uri:"
|
|
in caplog.record_tuples[record_index][2]
|
|
)
|