xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

zephyr_mirror: Require zcrypt when mirroring to invite-only streams.

Browse source 
(imported from commit 1b88a8fc9bc26f2f9b1bb3f037093f85255feb17)
This commit is contained in:
Tim Abbott 2013-08-27 18:01:50 -04:00
parent 5e5e35924c
commit 92731d0a95
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bots/zephyr_mirror_backend.py
View file

@ -612,6 +612,10 @@ def zcrypt_encrypt_content(zephyr_class, instance, content):
return encrypted
def forward_to_zephyr(message):
support_heading = "Hi there! This is an automated message from Zulip."
support_closing = """If you have any questions, please be in touch through the \
Feedback tab or at support@zulip.com."""
wrapper = textwrap.TextWrapper(break_long_words=False, break_on_hyphens=False)
wrapped_content = "\n".join("\n".join(wrapper.wrap(line))
for line in message["content"].replace("@", "@@").split("\n"))
@ -658,9 +662,21 @@ def forward_to_zephyr(message):
logger.info("Forwarding message to %s" % (recipients,))
zwrite_args.extend(recipients)
if message['type'] == "stream":
if message.get("invite_only_stream"):
result = zcrypt_encrypt_content(zephyr_class, instance, wrapped_content)
if result is not None:
if result is None:
return send_error_zulip("""%s
Your Zulip-Zephyr mirror bot was unable to forward that last message \
from Zulip to Zephyr because you were sending to a zcrypted Zephyr \
class and your mirroring bot does not have access to the relevant \
key (perhaps because your AFS tokens expired). That means that while \
Zulip users (like you) received it, Zephyr users did not.
%s""" % (support_heading, support_closing))
return
# Proceed with sending a zcrypted message
wrapped_content = result
zwrite_args.extend(["-O", "crypt"])
@ -669,10 +685,6 @@ def forward_to_zephyr(message):
(zwrite_args, wrapped_content.encode("utf-8")))
return
heading = "Hi there! This is an automated message from Zulip."
support_closing = """If you have any questions, please be in touch through the \
Feedback tab or at support@zulip.com."""
(code, stderr) = send_authed_zephyr(zwrite_args, wrapped_content)
if code == 0 and stderr == "":
return
@ -684,7 +696,7 @@ returned the following warning:
%s
%s""" % (heading, stderr, support_closing))
%s""" % (support_heading, stderr, support_closing))
elif code != 0 and (stderr.startswith("zwrite: Ticket expired while sending notice to ") or
stderr.startswith("zwrite: No credentials cache found while sending notice to ")):
# Retry sending the message unauthenticated; if that works,
@ -701,7 +713,7 @@ but please renew your Kerberos tickets in the screen session where you \
are running the Zulip-Zephyr mirroring bot, so we can send \
authenticated Zephyr messages for you again.
%s""" % (heading, support_closing))
%s""" % (support_heading, support_closing))
# zwrite failed and it wasn't because of expired tickets: This is
# probably because the recipient isn't subscribed to personals,
@ -714,7 +726,7 @@ received it, Zephyr users did not. The error message from zwrite was:
%s
%s""" % (heading, stderr, support_closing))
%s""" % (support_heading, stderr, support_closing))
def maybe_forward_to_zephyr(message):
if (message["sender_email"] == zulip_account_email):