Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

auth: Refactor JWT code to push REQ to top level functions. 

Fixes #25015.
This commit is contained in:
Tanmay Munjal 2023-04-26 23:27:22 +05:30 committed by GitHub
parent 95add66ed3
commit 80c01e9fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/views/auth.py
View File

@ -482,8 +482,7 @@ def remote_user_sso(
@has_request_variables @has_request_variables
def get_email_and_realm_from_jwt_authentication_request( def get_email_and_realm_from_jwt_authentication_request(
request: HttpRequest, request: HttpRequest, json_web_token: str
json_web_token: str = REQ("token", default=""),
) -> Tuple[str, Realm]: ) -> Tuple[str, Realm]:
realm = get_realm_from_request(request) realm = get_realm_from_request(request)
if realm is None: if realm is None:
@ -514,8 +513,9 @@ def get_email_and_realm_from_jwt_authentication_request(
@csrf_exempt @csrf_exempt
@require_post @require_post
@log_view_func @log_view_func
def remote_user_jwt(request: HttpRequest) -> HttpResponse: @has_request_variables
email, realm = get_email_and_realm_from_jwt_authentication_request(request) def remote_user_jwt(request: HttpRequest, token: str = REQ(default="")) -> HttpResponse:
email, realm = get_email_and_realm_from_jwt_authentication_request(request, token)
user_profile = authenticate(username=email, realm=realm, use_dummy_backend=True) user_profile = authenticate(username=email, realm=realm, use_dummy_backend=True)
if user_profile is None: if user_profile is None:
@ -941,8 +941,10 @@ def get_api_key_fetch_authenticate_failure(return_data: Dict[str, bool]) -> Json
def jwt_fetch_api_key( def jwt_fetch_api_key(
request: HttpRequest, request: HttpRequest,
include_profile: bool = REQ(default=False, json_validator=check_bool), include_profile: bool = REQ(default=False, json_validator=check_bool),
token: str = REQ(default=""),
) -> HttpResponse: ) -> HttpResponse:
remote_email, realm = get_email_and_realm_from_jwt_authentication_request(request) remote_email, realm = get_email_and_realm_from_jwt_authentication_request(request, token)
return_data: Dict[str, bool] = {} return_data: Dict[str, bool] = {}
user_profile = authenticate( user_profile = authenticate(