From 6f06cd5ebcb7f9505280147260f36d4a324dc758 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Tue, 9 Oct 2018 14:47:29 +0100 Subject: [PATCH] [WebUI|Py3] Refactor content_type check Simplify getting content_type from request to prevent str/bytes mixup. --- deluge/ui/web/json_api.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index 4ae84bb4c..f11cf3d53 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -194,10 +194,9 @@ class JSON(resource.Resource, component.Component): Handler to take the json data as a string and pass it on to the _handle_request method for further processing. """ - if request.getHeader(b'content-type') != b'application/json': - message = 'Invalid JSON request content-type: %s' % request.getHeader( - 'content-type' - ) + content_type = request.getHeader(b'content-type').decode() + if content_type != 'application/json': + message = 'Invalid JSON request content-type: %s' % content_type raise JSONException(message) log.debug('json-request: %s', request.json)