changeset 7c73ae565b76 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=7c73ae565b76
description:
Return 429 TOO MANY REQUESTS on RateLimitException
This is a better HTTP Status than the default 500.
issue8001
review47751002
diffstat:
trytond/protocols/wrappers.py | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diffs (64 lines):
diff -r d47d7123b3a0 -r 7c73ae565b76 trytond/protocols/wrappers.py
--- a/trytond/protocols/wrappers.py Sun Feb 03 20:33:01 2019 +0100
+++ b/trytond/protocols/wrappers.py Mon Feb 04 22:19:37 2019 +0100
@@ -5,6 +5,10 @@
import logging
from io import BytesIO
from functools import wraps
+try:
+ from http import HTTPStatus
+except ImportError:
+ from http import client as HTTPStatus
from werkzeug.wrappers import Request as _Request, Response
from werkzeug.utils import cached_property
@@ -13,6 +17,7 @@
from werkzeug.exceptions import abort, HTTPException
from trytond import security, backend
+from trytond.exceptions import RateLimitException
from trytond.pool import Pool
from trytond.transaction import Transaction
from trytond.config import config
@@ -66,9 +71,12 @@
database_name, auth.get('userid'), auth.get('session'),
context=context)
else:
- user_id = security.login(
- database_name, auth.username, auth, cache=False,
- context=context)
+ try:
+ user_id = security.login(
+ database_name, auth.username, auth, cache=False,
+ context=context)
+ except RateLimitException:
+ abort(HTTPStatus.TOO_MANY_REQUESTS)
return user_id
@cached_property
@@ -176,13 +184,13 @@
auth_type, auth_info = authorization.split(None, 1)
auth_type = auth_type.lower()
except ValueError:
- abort(401)
+ abort(HTTPStatus.UNAUTHORIZED)
if auth_type != b'bearer':
- abort(403)
+ abort(HTTPStatus.FORBIDDEN)
application = UserApplication.check(bytes_to_wsgi(auth_info), name)
if not application:
- abort(403)
+ abort(HTTPStatus.FORBIDDEN)
transaction = Transaction()
# TODO language
with transaction.set_user(application.user.id), \
@@ -193,7 +201,7 @@
if isinstance(e, HTTPException):
raise
logger.error('%s', request, exc_info=True)
- abort(500, e)
+ abort(HTTPStatus.INTERNAL_SERVER_ERROR, e)
if not isinstance(response, Response) and json:
response = Response(json_.dumps(response, cls=JSONEncoder),
content_type='application/json')
