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

Change PrincipalError to return status code 403 by default.

This commit is contained in:
Tim Abbott 2016-04-27 16:23:45 -07:00
parent 85c64c9f93
commit 620debc5fd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/tests/test_subs.py
View File

@ -409,7 +409,8 @@ class StreamAdminTest(AuthedTestCase):
"principals": ujson.dumps(["baduser@zulip.com"])})
self.assert_json_error(
result,
"User not authorized to execute queries on behalf of 'baduser@zulip.com'")
"User not authorized to execute queries on behalf of 'baduser@zulip.com'",
status_code=403)
class DefaultStreamTest(AuthedTestCase):
def get_default_stream_names(self, realm):
@ -1051,7 +1052,7 @@ class SubscriptionAPITest(AuthedTestCase):
result = self.common_subscribe_to_streams(self.test_email, self.streams,
{"principals": ujson.dumps([invalid_principal])})
self.assert_json_error(result, "User not authorized to execute queries on behalf of '%s'"
% (invalid_principal,))
% (invalid_principal,), status_code=403)
def test_subscription_add_principal_other_realm(self):
"""
@ -1065,7 +1066,7 @@ class SubscriptionAPITest(AuthedTestCase):
result = self.common_subscribe_to_streams(self.test_email, self.streams,
{"principals": ujson.dumps([principal])})
self.assert_json_error(result, "User not authorized to execute queries on behalf of '%s'"
% (principal,))
% (principal,), status_code=403)
def helper_check_subs_before_and_after_remove(self, subscriptions, json_dict,
email, new_subs):

2
zerver/views/streams.py
View File

@ -81,7 +81,7 @@ def list_to_streams(streams_raw, user_profile, autocreate=False, invite_only=Fal
return existing_streams, created_streams
class PrincipalError(JsonableError):
def __init__(self, principal, status_code=400):
def __init__(self, principal, status_code=403):
self.principal = principal
self.status_code = status_code