paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 19:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

message: Allow system bots to mention group if everyone else can.

Browse Source 
We now allow system bots to mention a group if can_mention_group
setting is set to "role:everyone" group and not when it is set
to some other group.
This commit is contained in:
Sahil Batra
2024-01-10 12:28:52 +05:30
parent dcac272afc
commit 76b2e6de0b
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/message.py
View File

@@ -77,8 +77,10 @@ from zerver.models import (
UserTopic, UserTopic,
) )
from zerver.models.constants import MAX_TOPIC_NAME_LENGTH from zerver.models.constants import MAX_TOPIC_NAME_LENGTH
from zerver.models.groups import SystemGroups
from zerver.models.messages import get_usermessage_by_message_id from zerver.models.messages import get_usermessage_by_message_id
from zerver.models.realms import get_fake_email_domain from zerver.models.realms import get_fake_email_domain
from zerver.models.users import is_cross_realm_bot_email
class MessageDetailsDict(TypedDict, total=False): class MessageDetailsDict(TypedDict, total=False):
@@ -1756,9 +1758,20 @@ def check_user_group_mention_allowed(sender: UserProfile, user_group_ids: List[i
user_groups = UserGroup.objects.filter(id__in=user_group_ids).select_related( user_groups = UserGroup.objects.filter(id__in=user_group_ids).select_related(
"can_mention_group" "can_mention_group"
) )
sender_is_system_bot = is_cross_realm_bot_email(sender.delivery_email)
for group in user_groups: for group in user_groups:
can_mention_group = group.can_mention_group can_mention_group = group.can_mention_group
if sender_is_system_bot:
if can_mention_group.name == SystemGroups.EVERYONE:
continue
raise JsonableError(
_(
"You are not allowed to mention user group '{user_group_name}'. You must be a member of '{can_mention_group_name}' to mention this group."
).format(user_group_name=group.name, can_mention_group_name=can_mention_group.name)
)
if not is_user_in_group(can_mention_group, sender, direct_member_only=False): if not is_user_in_group(can_mention_group, sender, direct_member_only=False):
raise JsonableError( raise JsonableError(
_( _(

28
zerver/tests/test_message_send.py
View File

@@ -2174,6 +2174,34 @@ class StreamMessagesTest(ZulipTestCase):
result = self.api_get(shiva, "/api/v1/messages/" + str(msg_id)) result = self.api_get(shiva, "/api/v1/messages/" + str(msg_id))
self.assert_json_success(result) self.assert_json_success(result)
# Test system bots.
content = "Test mentioning user group @*support*"
members_group = UserGroup.objects.get(
name=SystemGroups.MEMBERS, realm=iago.realm, is_system_group=True
)
support.can_mention_group = members_group
support.save()
internal_realm = get_realm(settings.SYSTEM_BOT_REALM)
system_bot = get_system_bot(settings.EMAIL_GATEWAY_BOT, internal_realm.id)
with self.assertRaisesRegex(
JsonableError,
f"You are not allowed to mention user group '{support.name}'. You must be a member of '{members_group.name}' to mention this group.",
):
self.send_stream_message(system_bot, "test_stream", content, recipient_realm=iago.realm)
everyone_group = UserGroup.objects.get(
name=SystemGroups.EVERYONE, realm=iago.realm, is_system_group=True
)
support.can_mention_group = everyone_group
support.save()
msg_id = self.send_stream_message(
system_bot, "test_stream", content, recipient_realm=iago.realm
)
result = self.api_get(shiva, "/api/v1/messages/" + str(msg_id))
self.assert_json_success(result)
def test_stream_message_mirroring(self) -> None: def test_stream_message_mirroring(self) -> None:
user = self.mit_user("starnine") user = self.mit_user("starnine")
self.subscribe(user, "Verona") self.subscribe(user, "Verona")