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

webhooks: Simplify logic around is_webhook_access. 

We clearly allow webhook access if we are setting the
webhook_client_name.  This removes the need for the `or`s later.
This commit is contained in:
Alex Vandiver 2020-09-21 15:42:29 -07:00 committed by Tim Abbott
parent d24869e484
commit 77d1a4a5c0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/decorator.py
View File

@ -513,6 +513,9 @@ def authenticated_rest_api_view(
allow_webhook_access: bool = False,
skip_rate_limiting: bool = False,
) -> Callable[[Callable[..., HttpResponse]], Callable[..., HttpResponse]]:
if webhook_client_name is not None:
allow_webhook_access = True
def _wrapped_view_func(view_func: Callable[..., HttpResponse]) -> Callable[..., HttpResponse]:
@csrf_exempt
@wraps(view_func)
@ -535,7 +538,7 @@ def authenticated_rest_api_view(
try:
# profile is a Union[UserProfile, RemoteZulipServer]
profile = validate_api_key(request, role, api_key,
allow_webhook_access=allow_webhook_access or webhook_client_name is not None,
allow_webhook_access=allow_webhook_access,
client_name=full_webhook_client_name(webhook_client_name))
except JsonableError as e:
return json_unauthorized(e.msg)
@ -547,7 +550,7 @@ def authenticated_rest_api_view(
target_view_func = view_func
return target_view_func(request, profile, *args, **kwargs)
except Exception as err:
if allow_webhook_access or webhook_client_name is not None:
if allow_webhook_access:
if isinstance(err, UnsupportedWebhookEventType) and webhook_client_name is not None:
err.webhook_name = webhook_client_name
request_body = request.POST.get('payload')