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

Add backend support for Jabber mirroring. 

(imported from commit 12f5c708a6961aded4f4e166af84e87720be4ddc)
This commit is contained in:
Tim Abbott 2013-10-29 11:00:20 -04:00
parent 06590f4332
commit 1292c5dbfe
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/actions.py
View File

@ -171,6 +171,9 @@ def do_change_user_email(user_profile, new_email):
def compute_irc_user_fullname(email): def compute_irc_user_fullname(email):
return email.split("@")[0] + " (IRC)" return email.split("@")[0] + " (IRC)"
def compute_jabber_user_fullname(email):
return email.split("@")[0] + " (XMPP)"
def compute_mit_user_fullname(email): def compute_mit_user_fullname(email):
try: try:
# Input is either e.g. starnine@mit.edu or user|CROSSREALM.INVALID@mit.edu # Input is either e.g. starnine@mit.edu or user|CROSSREALM.INVALID@mit.edu
@ -540,7 +543,7 @@ def check_message(sender, client, message_type_name, message_to,
raise JsonableError("Not authorized to send to stream '%s'" % (stream.name,)) raise JsonableError("Not authorized to send to stream '%s'" % (stream.name,))
elif message_type_name == 'private': elif message_type_name == 'private':
mirror_message = client and client.name in ["zephyr_mirror", "irc_mirror"] mirror_message = client and client.name in ["zephyr_mirror", "irc_mirror", "jabber_mirror"]
not_forged_mirror_message = mirror_message and not forged not_forged_mirror_message = mirror_message and not forged
try: try:
recipient = recipient_for_emails(message_to, not_forged_mirror_message, recipient = recipient_for_emails(message_to, not_forged_mirror_message,

2
zerver/models.py
View File

@ -29,7 +29,7 @@ MAX_MESSAGE_LENGTH = 10000
def is_super_user(user): def is_super_user(user):
return user.email in ["tabbott/extra@mit.edu", "emailgateway@zulip.com", return user.email in ["tabbott/extra@mit.edu", "emailgateway@zulip.com",
"irc-bot@zulip.com"] "irc-bot@zulip.com", "bot1@customer35.invalid"]
# Doing 1000 memcached requests to get_display_recipient is quite slow, # Doing 1000 memcached requests to get_display_recipient is quite slow,
# so add a local cache as well as the memcached cache. # so add a local cache as well as the memcached cache.

22
zerver/views/__init__.py
View File

@ -27,7 +27,7 @@ from zerver.models import Message, UserProfile, Stream, Subscription, \
is_super_user, AppleDeviceToken, get_active_user_dicts_in_realm is_super_user, AppleDeviceToken, get_active_user_dicts_in_realm
from zerver.lib.actions import do_remove_subscription, bulk_remove_subscriptions, \ from zerver.lib.actions import do_remove_subscription, bulk_remove_subscriptions, \
do_change_password, create_mirror_user_if_needed, compute_irc_user_fullname, \ do_change_password, create_mirror_user_if_needed, compute_irc_user_fullname, \
do_change_full_name, \ compute_jabber_user_fullname, do_change_full_name, \
do_change_enable_desktop_notifications, do_change_enter_sends, do_change_enable_sounds, \ do_change_enable_desktop_notifications, do_change_enter_sends, do_change_enable_sounds, \
do_send_confirmation_email, do_activate_user, do_create_user, check_send_message, \ do_send_confirmation_email, do_activate_user, do_create_user, check_send_message, \
do_change_subscription_property, internal_send_message, \ do_change_subscription_property, internal_send_message, \
@ -1216,6 +1216,16 @@ def same_realm_irc_user(user_profile, email):
return user_profile.realm.domain == domain.replace("irc.", "") return user_profile.realm.domain == domain.replace("irc.", "")
def same_realm_user(user_profile, email):
try:
validators.validate_email(email)
except ValidationError:
return False
domain = email_to_domain(email)
return user_profile.realm.domain == domain
def create_mirrored_message_users(request, user_profile, recipients): def create_mirrored_message_users(request, user_profile, recipients):
if "sender" not in request.POST: if "sender" not in request.POST:
return (False, None) return (False, None)
@ -1232,6 +1242,9 @@ def create_mirrored_message_users(request, user_profile, recipients):
elif request.client.name == "irc_mirror": elif request.client.name == "irc_mirror":
user_check = same_realm_irc_user user_check = same_realm_irc_user
fullname_function = compute_irc_user_fullname fullname_function = compute_irc_user_fullname
elif request.client.name == "jabber_mirror":
user_check = same_realm_user
fullname_function = compute_jabber_user_fullname
else: else:
# Unrecognized mirroring client # Unrecognized mirroring client
return (False, None) return (False, None)
@ -1315,7 +1328,7 @@ def send_message_backend(request, user_profile,
if not realm: if not realm:
return json_error("Unknown domain " + domain) return json_error("Unknown domain " + domain)
if client.name == "zephyr_mirror" or client.name == "irc_mirror": if client.name in ["zephyr_mirror", "irc_mirror", "jabber_mirror"]:
# Here's how security works for mirroring: # Here's how security works for mirroring:
# #
# For private messages, the message must be (1) both sent and # For private messages, the message must be (1) both sent and
@ -1324,8 +1337,9 @@ def send_message_backend(request, user_profile,
# #
# For stream messages, the message must be (1) being forwarded # For stream messages, the message must be (1) being forwarded
# by an API superuser for your realm and (2) being sent to a # by an API superuser for your realm and (2) being sent to a
# mirrored stream (any stream for the Zephyr mirror, but only # mirrored stream (any stream for the Zephyr and Jabber
# streams with names starting with a "#" for IRC mirrors) # mirrors, but only streams with names starting with a "#" for
# IRC mirrors)
# #
# The security checks are split between the below code # The security checks are split between the below code
# (especially create_mirrored_message_users which checks the # (especially create_mirrored_message_users which checks the