CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-18 21:04:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

zerver/decorator.py: Use force_bytes instead of encode.

Browse Source 
The value type of request.META is str, not text type.
So use force_bytes on the data instead of encode('utf-8').
This commit is contained in:
Eklavya Sharma 2016-07-08 01:20:08 +05:30
parent 4cf7641ab1
commit 3e9349df4f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/decorator.py
View File

@ -31,7 +31,7 @@ from six.moves import zip, urllib
from six import text_type
from typing import Union, Any, Callable, Sequence, Dict, Optional
from zerver.lib.str_utils import force_bytes
if settings.ZULIP_COM:
from zilencer.models import get_deployment_by_domain, Deployment
@ -348,11 +348,11 @@ def authenticated_rest_api_view(is_webhook=False):
try:
# Grab the base64-encoded authentication string, decode it, and split it into
# the email and API key
auth_type, b64encoded_credentials = request.META['HTTP_AUTHORIZATION'].split()
auth_type, credentials = request.META['HTTP_AUTHORIZATION'].split()
# case insensitive per RFC 1945
if auth_type.lower() != "basic":
return json_error(_("Only Basic authentication is supported."))
role, api_key = base64.b64decode(b64encoded_credentials.encode('utf-8')).decode('utf-8').split(":")
role, api_key = base64.b64decode(force_bytes(credentials)).decode('utf-8').split(":")
except ValueError:
json_error(_("Invalid authorization header for basic auth"))
except KeyError: