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

streams: Restrict creating web public streams based on new setting.

Browse Source 
This commit restricts creating web public streams based on the
recently added create_web_public_stream_policy setting.
This commit is contained in:
Sahil Batra
2021-10-04 13:26:16 +05:30
committed by Tim Abbott
parent 3916181770
commit 2c2c19c4d4
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/streams.py
View File

@@ -689,10 +689,10 @@ def list_to_streams(
if web_public_stream_requested: if web_public_stream_requested:
if not user_profile.realm.web_public_streams_enabled(): if not user_profile.realm.web_public_streams_enabled():
raise JsonableError(_("Web public streams are not enabled.")) raise JsonableError(_("Web public streams are not enabled."))
if not user_profile.is_realm_owner: if not user_profile.can_create_web_public_streams():
# We only allow organization owners to create web-public streams, # We set create_web_public_stream_policy to allow only organization owners
# because of their sensitive nature. # to create web-public streams, because of their sensitive nature.
raise OrganizationOwnerRequired() raise JsonableError(_("Insufficient permission"))
if message_retention_days_not_none: if message_retention_days_not_none:
if not user_profile.is_realm_owner: if not user_profile.is_realm_owner:

28
zerver/tests/test_subs.py
View File

@@ -474,10 +474,10 @@ class StreamAdminTest(ZulipTestCase):
for (stream_name, stream_description) in zip(stream_names, stream_descriptions) for (stream_name, stream_description) in zip(stream_names, stream_descriptions)
] ]
# Normal user cannot create web-public streams
self.assertFalse(user_profile.can_create_web_public_streams()) self.assertFalse(user_profile.can_create_web_public_streams())
self.assertTrue(owner.can_create_web_public_streams()) self.assertTrue(owner.can_create_web_public_streams())
with self.assertRaisesRegex(JsonableError, "Must be an organization owner"): # As per create_web_public_stream_policy, only owners can create web-public streams by default.
with self.assertRaisesRegex(JsonableError, "Insufficient permission"):
list_to_streams( list_to_streams(
streams_raw, streams_raw,
user_profile, user_profile,
@@ -3261,7 +3261,11 @@ class SubscriptionAPITest(ZulipTestCase):
) )
def _test_user_settings_for_creating_streams( def _test_user_settings_for_creating_streams(
self, stream_policy: str, *, invite_only: bool self,
stream_policy: str,
*,
invite_only: bool,
is_web_public: bool,
) -> None: ) -> None:
user_profile = self.example_user("cordelia") user_profile = self.example_user("cordelia")
realm = user_profile.realm realm = user_profile.realm
@@ -3272,6 +3276,7 @@ class SubscriptionAPITest(ZulipTestCase):
user_profile, user_profile,
["new_stream1"], ["new_stream1"],
invite_only=invite_only, invite_only=invite_only,
is_web_public=is_web_public,
allow_fail=True, allow_fail=True,
) )
self.assert_json_error(result, "Insufficient permission") self.assert_json_error(result, "Insufficient permission")
@@ -3289,6 +3294,7 @@ class SubscriptionAPITest(ZulipTestCase):
["new_stream2"], ["new_stream2"],
allow_fail=True, allow_fail=True,
invite_only=invite_only, invite_only=invite_only,
is_web_public=is_web_public,
) )
self.assert_json_error(result, "Insufficient permission") self.assert_json_error(result, "Insufficient permission")
@@ -3301,6 +3307,7 @@ class SubscriptionAPITest(ZulipTestCase):
user_profile, user_profile,
["new_stream3"], ["new_stream3"],
invite_only=invite_only, invite_only=invite_only,
is_web_public=is_web_public,
allow_fail=True, allow_fail=True,
) )
self.assert_json_error(result, "Not allowed for guest users") self.assert_json_error(result, "Not allowed for guest users")
@@ -3310,6 +3317,7 @@ class SubscriptionAPITest(ZulipTestCase):
self.test_user, self.test_user,
["new_stream4"], ["new_stream4"],
invite_only=invite_only, invite_only=invite_only,
is_web_public=is_web_public,
) )
do_set_realm_property( do_set_realm_property(
@@ -3320,6 +3328,7 @@ class SubscriptionAPITest(ZulipTestCase):
user_profile, user_profile,
["new_stream5"], ["new_stream5"],
invite_only=invite_only, invite_only=invite_only,
is_web_public=is_web_public,
allow_fail=True, allow_fail=True,
) )
self.assert_json_error(result, "Insufficient permission") self.assert_json_error(result, "Insufficient permission")
@@ -3329,12 +3338,21 @@ class SubscriptionAPITest(ZulipTestCase):
def test_user_settings_for_creating_private_streams(self) -> None: def test_user_settings_for_creating_private_streams(self) -> None:
self._test_user_settings_for_creating_streams( self._test_user_settings_for_creating_streams(
"create_private_stream_policy", invite_only=True "create_private_stream_policy",
invite_only=True,
is_web_public=False,
) )
def test_user_settings_for_creating_public_streams(self) -> None: def test_user_settings_for_creating_public_streams(self) -> None:
self._test_user_settings_for_creating_streams( self._test_user_settings_for_creating_streams(
"create_public_stream_policy", invite_only=False "create_public_stream_policy",
invite_only=False,
is_web_public=False,
)
def test_user_settings_for_creating_web_public_streams(self) -> None:
self._test_user_settings_for_creating_streams(
"create_web_public_stream_policy", invite_only=False, is_web_public=True
) )
def _test_can_create_streams(self, stream_policy: str, invite_only: bool) -> None: def _test_can_create_streams(self, stream_policy: str, invite_only: bool) -> None: