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

models: Use is_cross_realm_bot_email whenever possible.

Browse Source 
Fixes #7557
This commit is contained in:
Vishnu Ks
2017-12-07 20:15:34 +00:00
committed by showell
parent ff43443ac7
commit a30152cb94
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/actions.py
View File

@@ -66,7 +66,7 @@ from zerver.models import Realm, RealmEmoji, Stream, UserProfile, UserActivity,
UserActivityInterval, active_user_ids, get_active_streams, \ UserActivityInterval, active_user_ids, get_active_streams, \
realm_filters_for_realm, RealmFilter, \ realm_filters_for_realm, RealmFilter, \
get_owned_bot_dicts, stream_name_in_use, \ get_owned_bot_dicts, stream_name_in_use, \
get_old_unclaimed_attachments, get_cross_realm_emails, \ get_old_unclaimed_attachments, is_cross_realm_bot_email, \
Reaction, EmailChangeStatus, CustomProfileField, \ Reaction, EmailChangeStatus, CustomProfileField, \
custom_profile_fields_for_realm, get_huddle_user_ids, \ custom_profile_fields_for_realm, get_huddle_user_ids, \
CustomProfileFieldValue, validate_attachment_request, get_system_bot, \ CustomProfileFieldValue, validate_attachment_request, get_system_bot, \
@@ -1531,8 +1531,7 @@ def validate_recipient_user_profiles(user_profiles: List[UserProfile],
# We exempt cross-realm bots from the check that all the recipients # We exempt cross-realm bots from the check that all the recipients
# are in the same realm. # are in the same realm.
realms = set() realms = set()
exempt_emails = get_cross_realm_emails() if not is_cross_realm_bot_email(sender.email):
if sender.email not in exempt_emails:
realms.add(sender.realm_id) realms.add(sender.realm_id)
for user_profile in user_profiles: for user_profile in user_profiles:
@@ -1540,7 +1539,7 @@ def validate_recipient_user_profiles(user_profiles: List[UserProfile],
user_profile.realm.deactivated: user_profile.realm.deactivated:
raise ValidationError(_("'%s' is no longer using Zulip.") % (user_profile.email,)) raise ValidationError(_("'%s' is no longer using Zulip.") % (user_profile.email,))
recipient_profile_ids.add(user_profile.id) recipient_profile_ids.add(user_profile.id)
if user_profile.email not in exempt_emails: if not is_cross_realm_bot_email(user_profile.email):
realms.add(user_profile.realm_id) realms.add(user_profile.realm_id)
if len(realms) > 1: if len(realms) > 1:
@@ -1892,8 +1891,7 @@ def internal_send_message(realm, sender_email, recipient_type_name, recipients,
system bot.""" system bot."""
# Verify the user is in fact a system bot # Verify the user is in fact a system bot
assert(sender_email.lower() in settings.CROSS_REALM_BOT_EMAILS or assert(is_cross_realm_bot_email(sender_email) or sender_email == settings.ERROR_BOT)
sender_email == settings.ERROR_BOT)
sender = get_system_bot(sender_email) sender = get_system_bot(sender_email)
parsed_recipients = extract_recipients(recipients) parsed_recipients = extract_recipients(recipients)
@@ -3843,7 +3841,7 @@ def get_status_dict(requesting_user_profile: UserProfile) -> Dict[Text, Dict[Tex
return UserPresence.get_status_dict_by_realm(requesting_user_profile.realm_id) return UserPresence.get_status_dict_by_realm(requesting_user_profile.realm_id)
def get_cross_realm_dicts() -> List[Dict[str, Any]]: def get_cross_realm_dicts() -> List[Dict[str, Any]]:
users = bulk_get_users(list(get_cross_realm_emails()), None, users = bulk_get_users(list(settings.CROSS_REALM_BOT_EMAILS), None,
base_query=UserProfile.objects.filter( base_query=UserProfile.objects.filter(
realm__string_id=settings.SYSTEM_BOT_REALM)).values() realm__string_id=settings.SYSTEM_BOT_REALM)).values()
return [{'email': user.email, return [{'email': user.email,
@@ -3874,7 +3872,7 @@ def do_send_confirmation_email(invitee: PreregistrationUser,
from_address=FromAddress.NOREPLY, context=context) from_address=FromAddress.NOREPLY, context=context)
def email_not_system_bot(email: Text) -> None: def email_not_system_bot(email: Text) -> None:
if email.lower() in settings.CROSS_REALM_BOT_EMAILS: if is_cross_realm_bot_email(email):
raise ValidationError('%s is an email address reserved for system bots' % (email,)) raise ValidationError('%s is an email address reserved for system bots' % (email,))
def validate_email_for_realm(target_realm: Realm, email: Text) -> None: def validate_email_for_realm(target_realm: Realm, email: Text) -> None:

5
zerver/models.py
View File

@@ -1404,7 +1404,7 @@ def get_user(email: Text, realm: Realm) -> UserProfile:
return UserProfile.objects.select_related().get(email__iexact=email.strip(), realm=realm) return UserProfile.objects.select_related().get(email__iexact=email.strip(), realm=realm)
def get_user_including_cross_realm(email: Text, realm: Optional[Realm]=None) -> UserProfile: def get_user_including_cross_realm(email: Text, realm: Optional[Realm]=None) -> UserProfile:
if email in get_cross_realm_emails(): if is_cross_realm_bot_email(email):
return get_system_bot(email) return get_system_bot(email)
assert realm is not None assert realm is not None
return get_user(email, realm) return get_user(email, realm)
@@ -1455,9 +1455,6 @@ def get_owned_bot_dicts(user_profile: UserProfile,
} }
for botdict in result] for botdict in result]
def get_cross_realm_emails() -> Set[Text]:
return set(settings.CROSS_REALM_BOT_EMAILS)
def is_cross_realm_bot_email(email: Text) -> bool: def is_cross_realm_bot_email(email: Text) -> bool:
return email.lower() in settings.CROSS_REALM_BOT_EMAILS return email.lower() in settings.CROSS_REALM_BOT_EMAILS