paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

zerver/webhooks/beanstalk/view.py: Sweep force_bytes and force_str.

Browse Source
This commit is contained in:
Rhea Parekh
2017-12-22 01:29:50 +05:30
committed by showell
parent b792a90842
commit 99cb001345
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/webhooks/beanstalk/view.py
View File

@@ -10,7 +10,6 @@ from zerver.decorator import authenticated_rest_api_view
from zerver.lib.actions import check_send_stream_message
from zerver.lib.request import REQ, has_request_variables
from zerver.lib.response import json_success
from zerver.lib.str_utils import force_bytes, force_str
from zerver.lib.validator import check_dict
from zerver.models import UserProfile, get_client
from zerver.webhooks.github.view import build_message_from_gitlog
@@ -26,10 +25,10 @@ def beanstalk_decoder(view_func: ViewFuncT) -> ViewFuncT:
try:
auth_type, encoded_value = request.META['HTTP_AUTHORIZATION'].split() # type: str, str
if auth_type.lower() == "basic":
email, api_key = base64.b64decode(force_bytes(encoded_value)).decode('utf-8').split(":")
email, api_key = base64.b64decode(encoded_value).decode('utf-8').split(":")
email = email.replace('%40', '@')
credentials = u"%s:%s" % (email, api_key)
encoded_credentials = force_str(base64.b64encode(credentials.encode('utf-8')))
encoded_credentials = base64.b64encode(credentials.encode('utf-8')).decode('utf8') # type: str
request.META['HTTP_AUTHORIZATION'] = "Basic " + encoded_credentials
except Exception:
pass