2013-02-19 01:00:54 +01:00
|
|
|
#!/usr/bin/env python
|
2013-08-06 21:32:15 +02:00
|
|
|
# Copyright (C) 2012 Zulip, Inc.
|
2012-11-26 16:55:22 +01:00
|
|
|
#
|
|
|
|
# Permission is hereby granted, free of charge, to any person
|
|
|
|
# obtaining a copy of this software and associated documentation files
|
|
|
|
# (the "Software"), to deal in the Software without restriction,
|
|
|
|
# including without limitation the rights to use, copy, modify, merge,
|
|
|
|
# publish, distribute, sublicense, and/or sell copies of the Software,
|
|
|
|
# and to permit persons to whom the Software is furnished to do so,
|
|
|
|
# subject to the following conditions:
|
|
|
|
#
|
|
|
|
# The above copyright notice and this permission notice shall be
|
|
|
|
# included in all copies or substantial portions of the Software.
|
|
|
|
#
|
|
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
|
|
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
|
|
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
# SOFTWARE.
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
import sys
|
2013-05-06 23:24:52 +02:00
|
|
|
try:
|
|
|
|
import simplejson
|
|
|
|
except ImportError:
|
|
|
|
import json as simplejson
|
2012-11-19 18:04:23 +01:00
|
|
|
import re
|
|
|
|
import time
|
|
|
|
import subprocess
|
|
|
|
import optparse
|
|
|
|
import os
|
|
|
|
import datetime
|
|
|
|
import textwrap
|
|
|
|
import signal
|
|
|
|
import logging
|
2012-11-27 16:27:02 +01:00
|
|
|
import hashlib
|
2012-12-20 20:10:12 +01:00
|
|
|
import tempfile
|
2013-05-07 17:08:01 +02:00
|
|
|
import select
|
2012-12-21 17:59:41 +01:00
|
|
|
|
2013-07-24 23:53:39 +02:00
|
|
|
DEFAULT_SITE = "https://api.zulip.com"
|
2012-11-19 18:04:23 +01:00
|
|
|
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
class States:
|
2013-08-06 21:34:20 +02:00
|
|
|
Startup, ZulipToZephyr, ZephyrToZulip, ChildSending = range(4)
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
CURRENT_STATE = States.Startup
|
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
def to_zulip_username(zephyr_username):
|
2012-11-19 18:04:23 +01:00
|
|
|
if "@" in zephyr_username:
|
|
|
|
(user, realm) = zephyr_username.split("@")
|
|
|
|
else:
|
|
|
|
(user, realm) = (zephyr_username, "ATHENA.MIT.EDU")
|
|
|
|
if realm.upper() == "ATHENA.MIT.EDU":
|
2013-10-11 22:06:50 +02:00
|
|
|
# Hack to make ctl's fake username setup work :)
|
|
|
|
if user.lower() == 'golem':
|
|
|
|
user = 'ctl'
|
2012-11-19 18:04:23 +01:00
|
|
|
return user.lower() + "@mit.edu"
|
|
|
|
return user.lower() + "|" + realm.upper() + "@mit.edu"
|
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
def to_zephyr_username(zulip_username):
|
|
|
|
(user, realm) = zulip_username.split("@")
|
2012-11-19 18:04:23 +01:00
|
|
|
if "|" not in user:
|
2013-10-15 22:44:19 +02:00
|
|
|
# Hack to make ctl's fake username setup work :)
|
|
|
|
if user.lower() == 'ctl':
|
|
|
|
user = 'golem'
|
2012-11-19 18:04:23 +01:00
|
|
|
return user.lower() + "@ATHENA.MIT.EDU"
|
|
|
|
match_user = re.match(r'([a-zA-Z0-9_]+)\|(.+)', user)
|
|
|
|
if not match_user:
|
2013-08-06 22:25:43 +02:00
|
|
|
raise Exception("Could not parse Zephyr realm for cross-realm user %s" % (zulip_username,))
|
2012-11-19 18:04:23 +01:00
|
|
|
return match_user.group(1).lower() + "@" + match_user.group(2).upper()
|
|
|
|
|
|
|
|
# Checks whether the pair of adjacent lines would have been
|
|
|
|
# linewrapped together, had they been intended to be parts of the same
|
|
|
|
# paragraph. Our check is whether if you move the first word on the
|
|
|
|
# 2nd line onto the first line, the resulting line is either (1)
|
|
|
|
# significantly shorter than the following line (which, if they were
|
|
|
|
# in the same paragraph, should have been wrapped in a way consistent
|
|
|
|
# with how the previous line was wrapped) or (2) shorter than 60
|
|
|
|
# characters (our assumed minimum linewrapping threshhold for Zephyr)
|
|
|
|
# or (3) the first word of the next line is longer than this entire
|
|
|
|
# line.
|
|
|
|
def different_paragraph(line, next_line):
|
|
|
|
words = next_line.split()
|
|
|
|
return (len(line + " " + words[0]) < len(next_line) * 0.8 or
|
|
|
|
len(line + " " + words[0]) < 50 or
|
|
|
|
len(line) < len(words[0]))
|
|
|
|
|
|
|
|
# Linewrapping algorithm based on:
|
|
|
|
# http://gcbenison.wordpress.com/2011/07/03/a-program-to-intelligently-remove-carriage-returns-so-you-can-paste-text-without-having-it-look-awful/
|
|
|
|
def unwrap_lines(body):
|
|
|
|
lines = body.split("\n")
|
|
|
|
result = ""
|
|
|
|
previous_line = lines[0]
|
|
|
|
for line in lines[1:]:
|
|
|
|
line = line.rstrip()
|
|
|
|
if (re.match(r'^\W', line, flags=re.UNICODE)
|
|
|
|
and re.match(r'^\W', previous_line, flags=re.UNICODE)):
|
|
|
|
result += previous_line + "\n"
|
|
|
|
elif (line == "" or
|
|
|
|
previous_line == "" or
|
|
|
|
re.match(r'^\W', line, flags=re.UNICODE) or
|
|
|
|
different_paragraph(previous_line, line)):
|
|
|
|
# Use 2 newlines to separate sections so that we
|
|
|
|
# trigger proper Markdown processing on things like
|
|
|
|
# bulleted lists
|
|
|
|
result += previous_line + "\n\n"
|
|
|
|
else:
|
|
|
|
result += previous_line + " "
|
|
|
|
previous_line = line
|
|
|
|
result += previous_line
|
|
|
|
return result
|
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
def send_zulip(zeph):
|
2012-11-19 18:04:23 +01:00
|
|
|
message = {}
|
|
|
|
if options.forward_class_messages:
|
|
|
|
message["forged"] = "yes"
|
|
|
|
message['type'] = zeph['type']
|
|
|
|
message['time'] = zeph['time']
|
2013-08-06 22:25:43 +02:00
|
|
|
message['sender'] = to_zulip_username(zeph['sender'])
|
2012-11-19 18:04:23 +01:00
|
|
|
if "subject" in zeph:
|
2013-08-06 21:32:15 +02:00
|
|
|
# Truncate the subject to the current limit in Zulip. No
|
2012-11-19 18:04:23 +01:00
|
|
|
# need to do this for stream names, since we're only
|
|
|
|
# subscribed to valid stream names.
|
|
|
|
message["subject"] = zeph["subject"][:60]
|
|
|
|
if zeph['type'] == 'stream':
|
|
|
|
# Forward messages sent to -c foo -i bar to stream bar subject "instance"
|
|
|
|
if zeph["stream"] == "message":
|
|
|
|
message['to'] = zeph['subject'].lower()
|
|
|
|
message['subject'] = "instance %s" % (zeph['subject'],)
|
|
|
|
elif zeph["stream"] == "tabbott-test5":
|
|
|
|
message['to'] = zeph['subject'].lower()
|
|
|
|
message['subject'] = "test instance %s" % (zeph['subject'],)
|
|
|
|
else:
|
|
|
|
message["to"] = zeph["stream"]
|
|
|
|
else:
|
|
|
|
message["to"] = zeph["recipient"]
|
|
|
|
message['content'] = unwrap_lines(zeph['content'])
|
|
|
|
|
|
|
|
if options.test_mode and options.site == DEFAULT_SITE:
|
|
|
|
logger.debug("Message is: %s" % (str(message),))
|
|
|
|
return {'result': "success"}
|
|
|
|
|
2013-08-07 17:51:03 +02:00
|
|
|
return zulip_client.send_message(message)
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
def send_error_zulip(error_msg):
|
2012-12-03 22:20:42 +01:00
|
|
|
message = {"type": "private",
|
2013-08-06 22:25:43 +02:00
|
|
|
"sender": zulip_account_email,
|
|
|
|
"to": zulip_account_email,
|
2012-12-03 22:20:42 +01:00
|
|
|
"content": error_msg,
|
|
|
|
}
|
2013-08-07 17:51:03 +02:00
|
|
|
zulip_client.send_message(message)
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
current_zephyr_subs = set()
|
|
|
|
def zephyr_bulk_subscribe(subs):
|
|
|
|
try:
|
|
|
|
zephyr._z.subAll(subs)
|
|
|
|
except IOError:
|
|
|
|
# Since we haven't added the subscription to
|
|
|
|
# current_zephyr_subs yet, we can just return (so that we'll
|
|
|
|
# continue processing normal messages) and we'll end up
|
|
|
|
# retrying the next time the bot checks its subscriptions are
|
|
|
|
# up to date.
|
|
|
|
logger.exception("Error subscribing to streams (will retry automatically):")
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.warning("Streams were: %s" % ([cls for cls, instance, recipient in subs],))
|
2012-11-28 21:09:15 +01:00
|
|
|
return
|
|
|
|
try:
|
|
|
|
actual_zephyr_subs = [cls for (cls, _, _) in zephyr._z.getSubscriptions()]
|
|
|
|
except IOError:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.exception("Error getting current Zephyr subscriptions")
|
2012-11-28 21:09:15 +01:00
|
|
|
# Don't add anything to current_zephyr_subs so that we'll
|
|
|
|
# retry the next time we check for streams to subscribe to
|
|
|
|
# (within 15 seconds).
|
2012-11-19 18:04:23 +01:00
|
|
|
return
|
|
|
|
for (cls, instance, recipient) in subs:
|
2012-11-29 19:12:18 +01:00
|
|
|
if cls not in actual_zephyr_subs:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.error("Zephyr failed to subscribe us to %s; will retry" % (cls,))
|
2012-11-28 21:09:15 +01:00
|
|
|
try:
|
|
|
|
# We'll retry automatically when we next check for
|
|
|
|
# streams to subscribe to (within 15 seconds), but
|
|
|
|
# it's worth doing 1 retry immediately to avoid
|
|
|
|
# missing 15 seconds of messages on the affected
|
|
|
|
# classes
|
|
|
|
zephyr._z.sub(cls, instance, recipient)
|
|
|
|
except IOError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
current_zephyr_subs.add(cls)
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-02-05 16:20:49 +01:00
|
|
|
def update_subscriptions():
|
2012-11-19 18:04:23 +01:00
|
|
|
try:
|
2013-08-14 17:58:07 +02:00
|
|
|
f = file(options.stream_file_path, "r")
|
2013-02-05 16:20:49 +01:00
|
|
|
public_streams = simplejson.loads(f.read())
|
|
|
|
f.close()
|
|
|
|
except:
|
|
|
|
logger.exception("Error reading public streams:")
|
2012-11-19 18:04:23 +01:00
|
|
|
return
|
2013-02-05 16:20:49 +01:00
|
|
|
|
2012-11-29 19:12:18 +01:00
|
|
|
classes_to_subscribe = set()
|
2013-02-05 16:20:49 +01:00
|
|
|
for stream in public_streams:
|
|
|
|
zephyr_class = stream.encode("utf-8")
|
2012-11-27 16:27:02 +01:00
|
|
|
if (options.shard is not None and
|
2013-02-05 16:20:49 +01:00
|
|
|
not hashlib.sha1(zephyr_class).hexdigest().startswith(options.shard)):
|
2012-11-27 16:27:02 +01:00
|
|
|
# This stream is being handled by a different zephyr_mirror job.
|
|
|
|
continue
|
2013-02-05 16:20:49 +01:00
|
|
|
if zephyr_class in current_zephyr_subs:
|
|
|
|
continue
|
|
|
|
classes_to_subscribe.add((zephyr_class, "*", "*"))
|
2012-11-27 16:27:02 +01:00
|
|
|
|
2012-11-29 19:12:18 +01:00
|
|
|
if len(classes_to_subscribe) > 0:
|
|
|
|
zephyr_bulk_subscribe(list(classes_to_subscribe))
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2012-12-21 17:59:41 +01:00
|
|
|
def maybe_kill_child():
|
|
|
|
try:
|
|
|
|
if child_pid is not None:
|
|
|
|
os.kill(child_pid, signal.SIGTERM)
|
|
|
|
except OSError:
|
|
|
|
# We don't care if the child process no longer exists, so just log the error
|
|
|
|
logger.exception("")
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
def maybe_restart_mirroring_script():
|
|
|
|
if os.stat(os.path.join(options.root_path, "stamps", "restart_stamp")).st_mtime > start_time or \
|
|
|
|
((options.user == "tabbott" or options.user == "tabbott/extra") and
|
|
|
|
os.stat(os.path.join(options.root_path, "stamps", "tabbott_stamp")).st_mtime > start_time):
|
|
|
|
logger.warning("")
|
|
|
|
logger.warning("zephyr mirroring script has been updated; restarting...")
|
2012-12-21 17:59:41 +01:00
|
|
|
maybe_kill_child()
|
2012-12-21 17:42:54 +01:00
|
|
|
try:
|
|
|
|
zephyr._z.cancelSubs()
|
|
|
|
except IOError:
|
|
|
|
# We don't care whether we failed to cancel subs properly, but we should log it
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.exception("")
|
2012-11-19 18:04:23 +01:00
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
os.execvp(os.path.join(options.root_path, "user_root", "zephyr_mirror_backend.py"), sys.argv)
|
2012-11-29 14:48:35 +01:00
|
|
|
except Exception:
|
2012-11-19 18:04:23 +01:00
|
|
|
logger.exception("Error restarting mirroring script; trying again... Traceback:")
|
|
|
|
time.sleep(1)
|
|
|
|
|
|
|
|
def process_loop(log):
|
2013-04-04 16:21:42 +02:00
|
|
|
restart_check_count = 0
|
2013-05-07 17:08:01 +02:00
|
|
|
last_check_time = time.time()
|
2012-11-19 18:04:23 +01:00
|
|
|
while True:
|
2013-05-07 17:08:01 +02:00
|
|
|
select.select([zephyr._z.getFD()], [], [], 15)
|
2012-11-19 18:41:46 +01:00
|
|
|
try:
|
2013-09-25 19:23:11 +02:00
|
|
|
# Fetch notices from the queue until its empty
|
|
|
|
while True:
|
|
|
|
notice = zephyr.receive(block=False)
|
|
|
|
if notice is None:
|
|
|
|
break
|
|
|
|
try:
|
|
|
|
process_notice(notice, log)
|
|
|
|
except Exception:
|
|
|
|
logger.exception("Error relaying zephyr:")
|
|
|
|
time.sleep(2)
|
2012-11-19 18:41:46 +01:00
|
|
|
except Exception:
|
|
|
|
logger.exception("Error checking for new zephyrs:")
|
|
|
|
time.sleep(1)
|
|
|
|
continue
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-05-07 17:08:01 +02:00
|
|
|
if time.time() - last_check_time > 15:
|
|
|
|
last_check_time = time.time()
|
|
|
|
try:
|
|
|
|
maybe_restart_mirroring_script()
|
|
|
|
if restart_check_count > 0:
|
2013-05-09 19:50:21 +02:00
|
|
|
logger.info("Stopped getting errors checking whether restart is required.")
|
2013-05-07 17:08:01 +02:00
|
|
|
restart_check_count = 0
|
|
|
|
except Exception:
|
|
|
|
if restart_check_count < 5:
|
|
|
|
logger.exception("Error checking whether restart is required:")
|
|
|
|
restart_check_count += 1
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
if options.forward_class_messages:
|
2012-11-19 18:41:46 +01:00
|
|
|
try:
|
2013-02-05 16:20:49 +01:00
|
|
|
update_subscriptions()
|
2012-11-19 18:41:46 +01:00
|
|
|
except Exception:
|
2013-07-10 22:58:30 +02:00
|
|
|
logger.exception("Error updating subscriptions from Zulip:")
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
def parse_zephyr_body(zephyr_data):
|
|
|
|
try:
|
|
|
|
(zsig, body) = zephyr_data.split("\x00", 1)
|
|
|
|
except ValueError:
|
|
|
|
(zsig, body) = ("", zephyr_data)
|
|
|
|
return (zsig, body)
|
|
|
|
|
2013-08-20 21:23:29 +02:00
|
|
|
def parse_crypt_table(zephyr_class, instance):
|
2013-08-14 18:03:03 +02:00
|
|
|
try:
|
|
|
|
crypt_table = file(os.path.join(os.environ["HOME"], ".crypt-table"))
|
|
|
|
except IOError:
|
2013-08-20 21:23:29 +02:00
|
|
|
return None
|
2013-08-14 18:03:03 +02:00
|
|
|
|
|
|
|
for line in crypt_table.readlines():
|
|
|
|
if line.strip() == "":
|
|
|
|
# Ignore blank lines
|
|
|
|
continue
|
|
|
|
match = re.match("^crypt-(?P<class>[^:]+):\s+((?P<algorithm>(AES|DES)):\s+)?(?P<keypath>\S+)$", line)
|
|
|
|
if match is None:
|
|
|
|
# Malformed crypt_table line
|
|
|
|
logger.debug("Invalid crypt_table line!")
|
|
|
|
continue
|
|
|
|
groups = match.groupdict()
|
|
|
|
if groups['class'].lower() == zephyr_class and 'keypath' in groups and \
|
|
|
|
groups.get("algorithm") == "AES":
|
2013-08-20 21:23:29 +02:00
|
|
|
return groups["keypath"]
|
|
|
|
return None
|
|
|
|
|
|
|
|
def decrypt_zephyr(zephyr_class, instance, body):
|
|
|
|
keypath = parse_crypt_table(zephyr_class, instance)
|
|
|
|
if keypath is None:
|
2013-08-14 18:03:03 +02:00
|
|
|
# We can't decrypt it, so we just return the original body
|
|
|
|
return body
|
|
|
|
|
|
|
|
# Enable handling SIGCHLD briefly while we call into
|
|
|
|
# subprocess to avoid http://bugs.python.org/issue9127
|
|
|
|
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
|
|
|
|
|
|
|
|
# decrypt the message!
|
|
|
|
p = subprocess.Popen(["gpg",
|
|
|
|
"--decrypt",
|
|
|
|
"--no-options",
|
|
|
|
"--no-default-keyring",
|
|
|
|
"--keyring=/dev/null",
|
|
|
|
"--secret-keyring=/dev/null",
|
|
|
|
"--batch",
|
|
|
|
"--quiet",
|
|
|
|
"--no-use-agent",
|
|
|
|
"--passphrase-file",
|
2013-08-20 21:23:29 +02:00
|
|
|
keypath],
|
2013-08-14 18:03:03 +02:00
|
|
|
stdin=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=subprocess.PIPE)
|
|
|
|
decrypted, _ = p.communicate(input=body)
|
|
|
|
# Restore our ignoring signals
|
|
|
|
signal.signal(signal.SIGCHLD, signal.SIG_IGN)
|
|
|
|
return decrypted
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
def process_notice(notice, log):
|
|
|
|
(zsig, body) = parse_zephyr_body(notice.message)
|
|
|
|
is_personal = False
|
|
|
|
is_huddle = False
|
|
|
|
|
|
|
|
if notice.opcode == "PING":
|
|
|
|
# skip PING messages
|
|
|
|
return
|
|
|
|
|
2012-11-27 00:54:21 +01:00
|
|
|
zephyr_class = notice.cls.lower()
|
|
|
|
|
2013-08-26 21:43:29 +02:00
|
|
|
if zephyr_class == options.nagios_class:
|
|
|
|
# Mark that we got the message and proceed
|
|
|
|
with file(options.nagios_path, "w") as f:
|
|
|
|
f.write("0\n")
|
|
|
|
return
|
|
|
|
|
2012-11-27 00:55:37 +01:00
|
|
|
if notice.recipient != "":
|
2012-11-27 00:54:21 +01:00
|
|
|
is_personal = True
|
|
|
|
# Drop messages not to the listed subscriptions
|
|
|
|
if is_personal and not options.forward_personals:
|
|
|
|
return
|
2012-11-27 16:17:52 +01:00
|
|
|
if (zephyr_class not in current_zephyr_subs) and not is_personal:
|
2012-11-27 00:54:21 +01:00
|
|
|
logger.debug("Skipping ... %s/%s/%s" %
|
|
|
|
(zephyr_class, notice.instance, is_personal))
|
|
|
|
return
|
2013-02-04 20:19:43 +01:00
|
|
|
if notice.format.startswith("Zephyr error: See") or notice.format.endswith("@(@color(blue))"):
|
2013-07-10 22:58:30 +02:00
|
|
|
logger.debug("Skipping message we got from Zulip!")
|
2012-11-19 18:04:23 +01:00
|
|
|
return
|
2013-08-27 21:25:59 +02:00
|
|
|
if (zephyr_class == "mail" and notice.instance.lower() == "inbox" and is_personal and
|
|
|
|
not options.forward_mail_zephyrs):
|
|
|
|
# Only forward mail zephyrs if forwarding them is enabled.
|
|
|
|
return
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2012-11-27 00:54:21 +01:00
|
|
|
if is_personal:
|
2012-11-19 18:04:23 +01:00
|
|
|
if body.startswith("CC:"):
|
|
|
|
is_huddle = True
|
2015-09-20 09:35:54 +02:00
|
|
|
# Map "CC: user1 user2" => "user1@mit.edu, user2@mit.edu"
|
2013-08-06 22:25:43 +02:00
|
|
|
huddle_recipients = [to_zulip_username(x.strip()) for x in
|
2012-11-19 18:04:23 +01:00
|
|
|
body.split("\n")[0][4:].split()]
|
|
|
|
if notice.sender not in huddle_recipients:
|
2013-08-06 22:25:43 +02:00
|
|
|
huddle_recipients.append(to_zulip_username(notice.sender))
|
2012-11-19 18:04:23 +01:00
|
|
|
body = body.split("\n", 1)[1]
|
|
|
|
|
2013-08-14 18:03:03 +02:00
|
|
|
if options.forward_class_messages and notice.opcode.lower() == "crypt":
|
2013-08-20 21:23:29 +02:00
|
|
|
body = decrypt_zephyr(zephyr_class, notice.instance.lower(), body)
|
2013-08-14 18:03:03 +02:00
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
zeph = { 'time' : str(notice.time),
|
|
|
|
'sender' : notice.sender,
|
|
|
|
'zsig' : zsig, # logged here but not used by app
|
|
|
|
'content' : body }
|
|
|
|
if is_huddle:
|
|
|
|
zeph['type'] = 'private'
|
|
|
|
zeph['recipient'] = huddle_recipients
|
|
|
|
elif is_personal:
|
|
|
|
zeph['type'] = 'private'
|
2013-08-06 22:25:43 +02:00
|
|
|
zeph['recipient'] = to_zulip_username(notice.recipient)
|
2012-11-19 18:04:23 +01:00
|
|
|
else:
|
|
|
|
zeph['type'] = 'stream'
|
|
|
|
zeph['stream'] = zephyr_class
|
|
|
|
if notice.instance.strip() != "":
|
|
|
|
zeph['subject'] = notice.instance
|
|
|
|
else:
|
|
|
|
zeph["subject"] = '(instance "%s")' % (notice.instance,)
|
|
|
|
|
|
|
|
# Add instances in for instanced personals
|
2012-11-27 19:27:41 +01:00
|
|
|
if is_personal:
|
|
|
|
if notice.cls.lower() != "message" and notice.instance.lower != "personal":
|
|
|
|
heading = "[-c %s -i %s]\n" % (notice.cls, notice.instance)
|
|
|
|
elif notice.cls.lower() != "message":
|
|
|
|
heading = "[-c %s]\n" % (notice.cls,)
|
|
|
|
elif notice.instance.lower() != "personal":
|
|
|
|
heading = "[-i %s]\n" % (notice.instance,)
|
|
|
|
else:
|
|
|
|
heading = ""
|
|
|
|
zeph["content"] = heading + zeph["content"]
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
zeph = decode_unicode_byte_strings(zeph)
|
|
|
|
|
|
|
|
logger.info("Received a message on %s/%s from %s..." %
|
|
|
|
(zephyr_class, notice.instance, notice.sender))
|
|
|
|
if log is not None:
|
|
|
|
log.write(simplejson.dumps(zeph) + '\n')
|
|
|
|
log.flush()
|
|
|
|
|
|
|
|
if os.fork() == 0:
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
global CURRENT_STATE
|
|
|
|
CURRENT_STATE = States.ChildSending
|
2012-11-19 18:04:23 +01:00
|
|
|
# Actually send the message in a child process, to avoid blocking.
|
2012-11-29 14:57:25 +01:00
|
|
|
try:
|
2013-08-06 22:25:43 +02:00
|
|
|
res = send_zulip(zeph)
|
2012-11-29 14:57:25 +01:00
|
|
|
if res.get("result") != "success":
|
|
|
|
logger.error("Error relaying zephyr:\n%s\n%s" % (zeph, res))
|
|
|
|
except Exception:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.exception("Error relaying zephyr:")
|
2012-11-29 14:57:25 +01:00
|
|
|
finally:
|
|
|
|
os._exit(0)
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
def decode_unicode_byte_strings(zeph):
|
|
|
|
for field in zeph.keys():
|
|
|
|
if isinstance(zeph[field], str):
|
|
|
|
try:
|
|
|
|
decoded = zeph[field].decode("utf-8")
|
2012-11-29 14:48:35 +01:00
|
|
|
except Exception:
|
2012-11-19 18:04:23 +01:00
|
|
|
decoded = zeph[field].decode("iso-8859-1")
|
|
|
|
zeph[field] = decoded
|
|
|
|
return zeph
|
|
|
|
|
2012-12-21 17:59:41 +01:00
|
|
|
def quit_failed_initialization(message):
|
|
|
|
logger.error(message)
|
|
|
|
maybe_kill_child()
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
def zephyr_init_autoretry():
|
2014-03-11 19:09:15 +01:00
|
|
|
backoff = zulip.RandomExponentialBackoff()
|
2012-12-21 17:59:41 +01:00
|
|
|
while backoff.keep_going():
|
|
|
|
try:
|
|
|
|
# zephyr.init() tries to clear old subscriptions, and thus
|
|
|
|
# sometimes gets a SERVNAK from the server
|
|
|
|
zephyr.init()
|
|
|
|
backoff.succeed()
|
|
|
|
return
|
|
|
|
except IOError:
|
|
|
|
logger.exception("Error initializing Zephyr library (retrying). Traceback:")
|
|
|
|
backoff.fail()
|
|
|
|
|
|
|
|
quit_failed_initialization("Could not initialize Zephyr library, quitting!")
|
|
|
|
|
2013-08-23 20:13:26 +02:00
|
|
|
def zephyr_load_session_autoretry(session_path):
|
2014-03-11 19:09:15 +01:00
|
|
|
backoff = zulip.RandomExponentialBackoff()
|
2013-08-23 20:13:26 +02:00
|
|
|
while backoff.keep_going():
|
|
|
|
try:
|
|
|
|
session = file(session_path, "r").read()
|
|
|
|
zephyr._z.initialize()
|
|
|
|
zephyr._z.load_session(session)
|
|
|
|
zephyr.__inited = True
|
|
|
|
return
|
|
|
|
except IOError:
|
|
|
|
logger.exception("Error loading saved Zephyr session (retrying). Traceback:")
|
|
|
|
backoff.fail()
|
|
|
|
|
|
|
|
quit_failed_initialization("Could not load saved Zephyr session, quitting!")
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
def zephyr_subscribe_autoretry(sub):
|
2014-03-11 19:09:15 +01:00
|
|
|
backoff = zulip.RandomExponentialBackoff()
|
2012-12-21 17:59:41 +01:00
|
|
|
while backoff.keep_going():
|
2012-11-19 18:04:23 +01:00
|
|
|
try:
|
|
|
|
zephyr.Subscriptions().add(sub)
|
2012-12-21 17:59:41 +01:00
|
|
|
backoff.succeed()
|
2012-11-19 18:04:23 +01:00
|
|
|
return
|
|
|
|
except IOError:
|
2013-01-14 19:08:33 +01:00
|
|
|
# Probably a SERVNAK from the zephyr server, but log the
|
2012-11-19 18:04:23 +01:00
|
|
|
# traceback just in case it's something else
|
|
|
|
logger.exception("Error subscribing to personals (retrying). Traceback:")
|
2012-12-21 17:59:41 +01:00
|
|
|
backoff.fail()
|
|
|
|
|
|
|
|
quit_failed_initialization("Could not subscribe to personals, quitting!")
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
def zephyr_to_zulip(options):
|
2013-08-23 20:13:26 +02:00
|
|
|
if options.use_sessions and os.path.exists(options.session_path):
|
|
|
|
logger.info("Loading old session")
|
|
|
|
zephyr_load_session_autoretry(options.session_path)
|
|
|
|
else:
|
|
|
|
zephyr_init_autoretry()
|
|
|
|
if options.forward_class_messages:
|
|
|
|
update_subscriptions()
|
|
|
|
if options.forward_personals:
|
|
|
|
# Subscribe to personals; we really can't operate without
|
|
|
|
# those subscriptions, so just retry until it works.
|
|
|
|
zephyr_subscribe_autoretry(("message", "*", "%me%"))
|
2013-08-27 21:25:59 +02:00
|
|
|
zephyr_subscribe_autoretry(("mail", "inbox", "%me%"))
|
2013-08-26 21:43:29 +02:00
|
|
|
if options.nagios_class:
|
|
|
|
zephyr_subscribe_autoretry((options.nagios_class, "*", "*"))
|
2013-08-23 20:13:26 +02:00
|
|
|
if options.use_sessions:
|
|
|
|
file(options.session_path, "w").write(zephyr._z.dump_session())
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-08-27 17:10:13 +02:00
|
|
|
if options.logs_to_resend is not None:
|
|
|
|
with open(options.logs_to_resend, 'r') as log:
|
2012-11-19 18:04:23 +01:00
|
|
|
for ln in log:
|
|
|
|
try:
|
|
|
|
zeph = simplejson.loads(ln)
|
|
|
|
# New messages added to the log shouldn't have any
|
|
|
|
# elements of type str (they should already all be
|
|
|
|
# unicode), but older messages in the log are
|
|
|
|
# still of type str, so convert them before we
|
|
|
|
# send the message
|
|
|
|
zeph = decode_unicode_byte_strings(zeph)
|
|
|
|
# Handle importing older zephyrs in the logs
|
|
|
|
# where it isn't called a "stream" yet
|
|
|
|
if "class" in zeph:
|
|
|
|
zeph["stream"] = zeph["class"]
|
|
|
|
if "instance" in zeph:
|
|
|
|
zeph["subject"] = zeph["instance"]
|
|
|
|
logger.info("sending saved message to %s from %s..." %
|
|
|
|
(zeph.get('stream', zeph.get('recipient')),
|
|
|
|
zeph['sender']))
|
2013-08-06 22:25:43 +02:00
|
|
|
send_zulip(zeph)
|
2012-11-29 14:48:35 +01:00
|
|
|
except Exception:
|
2012-11-19 18:04:23 +01:00
|
|
|
logger.exception("Could not send saved zephyr:")
|
|
|
|
time.sleep(2)
|
|
|
|
|
2012-12-21 17:59:41 +01:00
|
|
|
logger.info("Successfully initialized; Starting receive loop.")
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-08-27 17:10:13 +02:00
|
|
|
if options.resend_log_path is not None:
|
|
|
|
with open(options.resend_log_path, 'a') as log:
|
2012-11-19 18:04:23 +01:00
|
|
|
process_loop(log)
|
|
|
|
else:
|
|
|
|
process_loop(None)
|
|
|
|
|
|
|
|
def send_zephyr(zwrite_args, content):
|
|
|
|
p = subprocess.Popen(zwrite_args, stdin=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
|
|
stdout, stderr = p.communicate(input=content.encode("utf-8"))
|
|
|
|
if p.returncode:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.error("zwrite command '%s' failed with return code %d:" % (
|
2013-01-02 19:37:20 +01:00
|
|
|
" ".join(zwrite_args), p.returncode,))
|
2012-11-19 18:04:23 +01:00
|
|
|
if stdout:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.info("stdout: " + stdout)
|
2012-11-19 18:04:23 +01:00
|
|
|
elif stderr:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.warning("zwrite command '%s' printed the following warning:" % (
|
2013-01-02 19:37:20 +01:00
|
|
|
" ".join(zwrite_args),))
|
2012-11-19 18:04:23 +01:00
|
|
|
if stderr:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.warning("stderr: " + stderr)
|
2012-11-19 18:04:23 +01:00
|
|
|
return (p.returncode, stderr)
|
|
|
|
|
|
|
|
def send_authed_zephyr(zwrite_args, content):
|
|
|
|
return send_zephyr(zwrite_args, content)
|
|
|
|
|
|
|
|
def send_unauthed_zephyr(zwrite_args, content):
|
|
|
|
return send_zephyr(zwrite_args + ["-d"], content)
|
|
|
|
|
2013-08-20 21:23:29 +02:00
|
|
|
def zcrypt_encrypt_content(zephyr_class, instance, content):
|
|
|
|
keypath = parse_crypt_table(zephyr_class, instance)
|
|
|
|
if keypath is None:
|
2013-08-21 22:03:15 +02:00
|
|
|
return None
|
2013-08-20 21:23:29 +02:00
|
|
|
|
|
|
|
# encrypt the message!
|
|
|
|
p = subprocess.Popen(["gpg",
|
|
|
|
"--symmetric",
|
|
|
|
"--no-options",
|
|
|
|
"--no-default-keyring",
|
|
|
|
"--keyring=/dev/null",
|
|
|
|
"--secret-keyring=/dev/null",
|
|
|
|
"--batch",
|
|
|
|
"--quiet",
|
|
|
|
"--no-use-agent",
|
|
|
|
"--armor",
|
|
|
|
"--cipher-algo", "AES",
|
|
|
|
"--passphrase-file",
|
|
|
|
keypath],
|
|
|
|
stdin=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=subprocess.PIPE)
|
|
|
|
encrypted, _ = p.communicate(input=content)
|
|
|
|
return encrypted
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
def forward_to_zephyr(message):
|
2013-08-28 00:01:50 +02:00
|
|
|
support_heading = "Hi there! This is an automated message from Zulip."
|
|
|
|
support_closing = """If you have any questions, please be in touch through the \
|
2013-08-28 01:49:55 +02:00
|
|
|
Feedback button or at support@zulip.com."""
|
2013-08-28 00:01:50 +02:00
|
|
|
|
2012-12-18 16:32:17 +01:00
|
|
|
wrapper = textwrap.TextWrapper(break_long_words=False, break_on_hyphens=False)
|
2012-11-21 14:08:46 +01:00
|
|
|
wrapped_content = "\n".join("\n".join(wrapper.wrap(line))
|
2013-07-30 22:48:20 +02:00
|
|
|
for line in message["content"].replace("@", "@@").split("\n"))
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2014-05-15 07:07:03 +02:00
|
|
|
zwrite_args = ["zwrite", "-n", "-s", message["sender_full_name"],
|
|
|
|
"-F", "Zephyr error: See http://zephyr.1ts.org/wiki/df",
|
|
|
|
"-x", "UTF-8"]
|
2013-08-28 21:58:34 +02:00
|
|
|
|
|
|
|
# Hack to make ctl's fake username setup work :)
|
|
|
|
if message['type'] == "stream" and zulip_account_email == "ctl@mit.edu":
|
|
|
|
zwrite_args.extend(["-S", "ctl"])
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
if message['type'] == "stream":
|
|
|
|
zephyr_class = message["display_recipient"]
|
|
|
|
instance = message["subject"]
|
|
|
|
|
|
|
|
match_whitespace_instance = re.match(r'^\(instance "(\s*)"\)$', instance)
|
|
|
|
if match_whitespace_instance:
|
|
|
|
# Forward messages sent to '(instance "WHITESPACE")' back to the
|
|
|
|
# appropriate WHITESPACE instance for bidirectional mirroring
|
|
|
|
instance = match_whitespace_instance.group(1)
|
|
|
|
elif (instance == "instance %s" % (zephyr_class,) or
|
|
|
|
instance == "test instance %s" % (zephyr_class,)):
|
|
|
|
# Forward messages to e.g. -c -i white-magic back from the
|
|
|
|
# place we forward them to
|
|
|
|
if instance.startswith("test"):
|
|
|
|
instance = zephyr_class
|
|
|
|
zephyr_class = "tabbott-test5"
|
|
|
|
else:
|
|
|
|
instance = zephyr_class
|
|
|
|
zephyr_class = "message"
|
2012-11-26 20:47:59 +01:00
|
|
|
zwrite_args.extend(["-c", zephyr_class, "-i", instance])
|
2012-12-10 19:35:31 +01:00
|
|
|
logger.info("Forwarding message to class %s, instance %s" % (zephyr_class, instance))
|
2012-12-03 19:49:12 +01:00
|
|
|
elif message['type'] == "private":
|
2012-12-08 18:59:57 +01:00
|
|
|
if len(message['display_recipient']) == 1:
|
2012-12-03 19:49:12 +01:00
|
|
|
recipient = to_zephyr_username(message["display_recipient"][0]["email"])
|
2012-12-10 19:35:31 +01:00
|
|
|
recipients = [recipient]
|
2012-12-08 18:59:57 +01:00
|
|
|
elif len(message['display_recipient']) == 2:
|
|
|
|
recipient = ""
|
|
|
|
for r in message["display_recipient"]:
|
2013-08-06 22:25:43 +02:00
|
|
|
if r["email"].lower() != zulip_account_email.lower():
|
2012-12-08 18:59:57 +01:00
|
|
|
recipient = to_zephyr_username(r["email"])
|
|
|
|
break
|
2012-12-10 19:35:31 +01:00
|
|
|
recipients = [recipient]
|
2012-12-03 19:49:12 +01:00
|
|
|
else:
|
|
|
|
zwrite_args.extend(["-C"])
|
2012-12-10 19:49:08 +01:00
|
|
|
# We drop the @ATHENA.MIT.EDU here because otherwise the
|
|
|
|
# "CC: user1 user2 ..." output will be unnecessarily verbose.
|
2012-12-10 19:35:31 +01:00
|
|
|
recipients = [to_zephyr_username(user["email"]).replace("@ATHENA.MIT.EDU", "")
|
|
|
|
for user in message["display_recipient"]]
|
|
|
|
logger.info("Forwarding message to %s" % (recipients,))
|
|
|
|
zwrite_args.extend(recipients)
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-08-28 00:01:50 +02:00
|
|
|
if message.get("invite_only_stream"):
|
2013-08-21 22:03:15 +02:00
|
|
|
result = zcrypt_encrypt_content(zephyr_class, instance, wrapped_content)
|
2013-08-28 00:01:50 +02:00
|
|
|
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))
|
|
|
|
|
|
|
|
# Proceed with sending a zcrypted message
|
|
|
|
wrapped_content = result
|
|
|
|
zwrite_args.extend(["-O", "crypt"])
|
2013-08-20 21:23:29 +02:00
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
if options.test_mode:
|
|
|
|
logger.debug("Would have forwarded: %s\n%s" %
|
|
|
|
(zwrite_args, wrapped_content.encode("utf-8")))
|
|
|
|
return
|
|
|
|
|
|
|
|
(code, stderr) = send_authed_zephyr(zwrite_args, wrapped_content)
|
|
|
|
if code == 0 and stderr == "":
|
|
|
|
return
|
|
|
|
elif code == 0:
|
2013-08-06 22:25:43 +02:00
|
|
|
return send_error_zulip("""%s
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
Your last message was successfully mirrored to zephyr, but zwrite \
|
|
|
|
returned the following warning:
|
|
|
|
|
|
|
|
%s
|
|
|
|
|
2013-08-28 00:01:50 +02:00
|
|
|
%s""" % (support_heading, stderr, support_closing))
|
2012-11-19 18:04:23 +01:00
|
|
|
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,
|
|
|
|
# just notify the user that they need to renew their tickets
|
|
|
|
(code, stderr) = send_unauthed_zephyr(zwrite_args, wrapped_content)
|
|
|
|
if code == 0:
|
2013-08-26 20:50:30 +02:00
|
|
|
if options.ignore_expired_tickets:
|
|
|
|
return
|
2013-08-06 22:25:43 +02:00
|
|
|
return send_error_zulip("""%s
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-07-10 22:58:30 +02:00
|
|
|
Your last message was forwarded from Zulip to Zephyr unauthenticated, \
|
2012-11-19 18:04:23 +01:00
|
|
|
because your Kerberos tickets have expired. It was sent successfully, \
|
|
|
|
but please renew your Kerberos tickets in the screen session where you \
|
2013-07-10 22:58:30 +02:00
|
|
|
are running the Zulip-Zephyr mirroring bot, so we can send \
|
2012-11-19 18:04:23 +01:00
|
|
|
authenticated Zephyr messages for you again.
|
|
|
|
|
2013-08-28 00:01:50 +02:00
|
|
|
%s""" % (support_heading, support_closing))
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
# zwrite failed and it wasn't because of expired tickets: This is
|
|
|
|
# probably because the recipient isn't subscribed to personals,
|
|
|
|
# but regardless, we should just notify the user.
|
2013-08-06 22:25:43 +02:00
|
|
|
return send_error_zulip("""%s
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2013-07-10 22:58:30 +02:00
|
|
|
Your Zulip-Zephyr mirror bot was unable to forward that last message \
|
|
|
|
from Zulip to Zephyr. That means that while Zulip users (like you) \
|
2012-11-19 18:04:23 +01:00
|
|
|
received it, Zephyr users did not. The error message from zwrite was:
|
|
|
|
|
|
|
|
%s
|
|
|
|
|
2013-08-28 00:01:50 +02:00
|
|
|
%s""" % (support_heading, stderr, support_closing))
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
def maybe_forward_to_zephyr(message):
|
2013-08-06 22:25:43 +02:00
|
|
|
if (message["sender_email"] == zulip_account_email):
|
2012-11-19 18:04:23 +01:00
|
|
|
if not ((message["type"] == "stream") or
|
2012-12-03 19:49:12 +01:00
|
|
|
(message["type"] == "private" and
|
2012-11-19 18:04:23 +01:00
|
|
|
False not in [u["email"].lower().endswith("mit.edu") for u in
|
|
|
|
message["display_recipient"]])):
|
2012-12-03 19:49:12 +01:00
|
|
|
# Don't try forward private messages with non-MIT users
|
2012-11-19 18:04:23 +01:00
|
|
|
# to MIT Zephyr.
|
|
|
|
return
|
|
|
|
timestamp_now = datetime.datetime.now().strftime("%s")
|
|
|
|
if float(message["timestamp"]) < float(timestamp_now) - 15:
|
|
|
|
logger.warning("Skipping out of order message: %s < %s" %
|
|
|
|
(message["timestamp"], timestamp_now))
|
|
|
|
return
|
|
|
|
try:
|
|
|
|
forward_to_zephyr(message)
|
2012-11-29 14:48:35 +01:00
|
|
|
except Exception:
|
2012-11-19 18:04:23 +01:00
|
|
|
# Don't let an exception forwarding one message crash the
|
|
|
|
# whole process
|
|
|
|
logger.exception("Error forwarding message:")
|
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
def zulip_to_zephyr(options):
|
2014-02-24 21:27:15 +01:00
|
|
|
# Sync messages from zulip to zephyr
|
2012-11-19 18:04:23 +01:00
|
|
|
logger.info("Starting syncing messages.")
|
2012-11-19 18:41:46 +01:00
|
|
|
while True:
|
|
|
|
try:
|
2013-08-07 17:51:03 +02:00
|
|
|
zulip_client.call_on_each_message(maybe_forward_to_zephyr)
|
2012-11-19 18:41:46 +01:00
|
|
|
except Exception:
|
|
|
|
logger.exception("Error syncing messages:")
|
|
|
|
time.sleep(1)
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
def subscribed_to_mail_messages():
|
|
|
|
# In case we have lost our AFS tokens and those won't be able to
|
|
|
|
# parse the Zephyr subs file, first try reading in result of this
|
|
|
|
# query from the environment so we can avoid the filesystem read.
|
|
|
|
stored_result = os.environ.get("HUMBUG_FORWARD_MAIL_ZEPHYRS")
|
|
|
|
if stored_result is not None:
|
|
|
|
return stored_result == "True"
|
|
|
|
for (cls, instance, recipient) in parse_zephyr_subs(verbose=False):
|
|
|
|
if (cls.lower() == "mail" and instance.lower() == "inbox"):
|
|
|
|
os.environ["HUMBUG_FORWARD_MAIL_ZEPHYRS"] = "True"
|
|
|
|
return True
|
|
|
|
os.environ["HUMBUG_FORWARD_MAIL_ZEPHYRS"] = "False"
|
|
|
|
return False
|
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
def add_zulip_subscriptions(verbose):
|
2012-11-19 18:04:23 +01:00
|
|
|
zephyr_subscriptions = set()
|
|
|
|
skipped = set()
|
|
|
|
for (cls, instance, recipient) in parse_zephyr_subs(verbose=verbose):
|
2012-12-03 21:33:33 +01:00
|
|
|
if cls.lower() == "message":
|
2012-11-19 18:04:23 +01:00
|
|
|
if recipient != "*":
|
|
|
|
# We already have a (message, *, you) subscription, so
|
|
|
|
# these are redundant
|
|
|
|
continue
|
|
|
|
# We don't support subscribing to (message, *)
|
|
|
|
if instance == "*":
|
|
|
|
if recipient == "*":
|
|
|
|
skipped.add((cls, instance, recipient, "subscribing to all of class message is not supported."))
|
|
|
|
continue
|
2013-08-06 22:25:43 +02:00
|
|
|
# If you're on -i white-magic on zephyr, get on stream white-magic on zulip
|
|
|
|
# instead of subscribing to stream "message" on zulip
|
2012-11-19 18:04:23 +01:00
|
|
|
zephyr_subscriptions.add(instance)
|
|
|
|
continue
|
2012-12-03 21:33:33 +01:00
|
|
|
elif cls.lower() == "mail" and instance.lower() == "inbox":
|
2013-01-14 19:08:33 +01:00
|
|
|
# We forward mail zephyrs, so no need to log a warning.
|
2012-11-19 18:04:23 +01:00
|
|
|
continue
|
2013-11-10 23:55:31 +01:00
|
|
|
elif len(cls) > 60:
|
|
|
|
skipped.add((cls, instance, recipient, "Class longer than 60 characters"))
|
2012-11-19 18:04:23 +01:00
|
|
|
continue
|
|
|
|
elif instance != "*":
|
|
|
|
skipped.add((cls, instance, recipient, "Unsupported non-* instance"))
|
|
|
|
continue
|
|
|
|
elif recipient != "*":
|
|
|
|
skipped.add((cls, instance, recipient, "Unsupported non-* recipient."))
|
|
|
|
continue
|
|
|
|
zephyr_subscriptions.add(cls)
|
|
|
|
|
|
|
|
if len(zephyr_subscriptions) != 0:
|
2013-08-15 23:38:21 +02:00
|
|
|
res = zulip_client.add_subscriptions(list({"name": stream} for stream in zephyr_subscriptions),
|
|
|
|
authorization_errors_fatal=False)
|
2012-11-19 18:04:23 +01:00
|
|
|
if res.get("result") != "success":
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.error("Error subscribing to streams:\n%s" % (res["msg"],))
|
2012-11-19 18:04:23 +01:00
|
|
|
return
|
|
|
|
|
|
|
|
already = res.get("already_subscribed")
|
|
|
|
new = res.get("subscribed")
|
2013-08-15 23:38:21 +02:00
|
|
|
unauthorized = res.get("unauthorized")
|
2012-11-19 18:04:23 +01:00
|
|
|
if verbose:
|
|
|
|
if already is not None and len(already) > 0:
|
2013-02-06 19:20:58 +01:00
|
|
|
logger.info("\nAlready subscribed to: %s" % (", ".join(already.values()[0]),))
|
2012-11-19 18:04:23 +01:00
|
|
|
if new is not None and len(new) > 0:
|
2013-02-06 19:20:58 +01:00
|
|
|
logger.info("\nSuccessfully subscribed to: %s" % (", ".join(new.values()[0]),))
|
2013-08-15 23:38:21 +02:00
|
|
|
if unauthorized is not None and len(unauthorized) > 0:
|
|
|
|
logger.info("\n" + "\n".join(textwrap.wrap("""\
|
|
|
|
The following streams you have NOT been subscribed to,
|
|
|
|
because they have been configured in Zulip as invitation-only streams.
|
|
|
|
This was done at the request of users of these Zephyr classes, usually
|
|
|
|
because traffic to those streams is sent within the Zephyr world encrypted
|
|
|
|
via zcrypt (in Zulip, we achieve the same privacy goals through invitation-only streams).
|
|
|
|
If you wish to read these streams in Zulip, you need to contact the people who are
|
|
|
|
on these streams and already use Zulip. They can subscribe you to them via the
|
|
|
|
"streams" page in the Zulip web interface:
|
|
|
|
""")) + "\n\n %s" % (", ".join(unauthorized),))
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
if len(skipped) > 0:
|
|
|
|
if verbose:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.info("\n" + "\n".join(textwrap.wrap("""\
|
2012-11-19 18:04:23 +01:00
|
|
|
You have some lines in ~/.zephyr.subs that could not be
|
2013-07-10 22:58:30 +02:00
|
|
|
synced to your Zulip subscriptions because they do not
|
2012-11-19 18:04:23 +01:00
|
|
|
use "*" as both the instance and recipient and not one of
|
|
|
|
the special cases (e.g. personals and mail zephyrs) that
|
2013-07-10 22:58:30 +02:00
|
|
|
Zulip has a mechanism for forwarding. Zulip does not
|
|
|
|
allow subscribing to only some subjects on a Zulip
|
2012-11-19 18:04:23 +01:00
|
|
|
stream, so this tool has not created a corresponding
|
2013-07-10 22:58:30 +02:00
|
|
|
Zulip subscription to these lines in ~/.zephyr.subs:
|
2013-01-14 19:08:33 +01:00
|
|
|
""")) + "\n")
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
for (cls, instance, recipient, reason) in skipped:
|
|
|
|
if verbose:
|
|
|
|
if reason != "":
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.info(" [%s,%s,%s] (%s)" % (cls, instance, recipient, reason))
|
2012-11-19 18:04:23 +01:00
|
|
|
else:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.info(" [%s,%s,%s]" % (cls, instance, recipient))
|
2012-11-19 18:04:23 +01:00
|
|
|
if len(skipped) > 0:
|
|
|
|
if verbose:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.info("\n" + "\n".join(textwrap.wrap("""\
|
2013-07-10 22:58:30 +02:00
|
|
|
If you wish to be subscribed to any Zulip streams related
|
|
|
|
to these .zephyrs.subs lines, please do so via the Zulip
|
2012-11-19 18:04:23 +01:00
|
|
|
web interface.
|
2013-01-14 19:08:33 +01:00
|
|
|
""")) + "\n")
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
def valid_stream_name(name):
|
|
|
|
return name != ""
|
|
|
|
|
|
|
|
def parse_zephyr_subs(verbose=False):
|
|
|
|
zephyr_subscriptions = set()
|
|
|
|
subs_file = os.path.join(os.environ["HOME"], ".zephyr.subs")
|
|
|
|
if not os.path.exists(subs_file):
|
|
|
|
if verbose:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.error("Couldn't find ~/.zephyr.subs!")
|
2012-11-19 18:04:23 +01:00
|
|
|
return []
|
|
|
|
|
|
|
|
for line in file(subs_file, "r").readlines():
|
|
|
|
line = line.strip()
|
|
|
|
if len(line) == 0:
|
|
|
|
continue
|
|
|
|
try:
|
|
|
|
(cls, instance, recipient) = line.split(",")
|
|
|
|
cls = cls.replace("%me%", options.user)
|
|
|
|
instance = instance.replace("%me%", options.user)
|
|
|
|
recipient = recipient.replace("%me%", options.user)
|
|
|
|
if not valid_stream_name(cls):
|
|
|
|
if verbose:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.error("Skipping subscription to unsupported class name: [%s]" % (line,))
|
2012-11-19 18:04:23 +01:00
|
|
|
continue
|
2012-11-29 14:48:35 +01:00
|
|
|
except Exception:
|
2012-11-19 18:04:23 +01:00
|
|
|
if verbose:
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.error("Couldn't parse ~/.zephyr.subs line: [%s]" % (line,))
|
2012-11-19 18:04:23 +01:00
|
|
|
continue
|
|
|
|
zephyr_subscriptions.add((cls.strip(), instance.strip(), recipient.strip()))
|
|
|
|
return zephyr_subscriptions
|
|
|
|
|
2013-01-14 19:08:33 +01:00
|
|
|
def open_logger():
|
2013-08-27 17:10:13 +02:00
|
|
|
if options.log_path is not None:
|
|
|
|
log_file = options.log_path
|
|
|
|
elif options.forward_class_messages:
|
2012-11-19 18:04:23 +01:00
|
|
|
if options.test_mode:
|
2013-09-25 20:18:32 +02:00
|
|
|
log_file = "/var/log/zulip/test-mirror-log"
|
2012-11-19 18:04:23 +01:00
|
|
|
else:
|
2013-09-25 20:18:32 +02:00
|
|
|
log_file = "/var/log/zulip/mirror-log"
|
2012-11-19 18:04:23 +01:00
|
|
|
else:
|
2013-08-06 22:25:43 +02:00
|
|
|
f = tempfile.NamedTemporaryFile(prefix="zulip-log.%s." % (options.user,),
|
2012-12-20 20:10:12 +01:00
|
|
|
delete=False)
|
|
|
|
log_file = f.name
|
|
|
|
# Close the file descriptor, since the logging system will
|
|
|
|
# reopen it anyway.
|
|
|
|
f.close()
|
2012-11-19 18:04:23 +01:00
|
|
|
logger = logging.getLogger(__name__)
|
2013-01-14 19:08:33 +01:00
|
|
|
log_format = "%(asctime)s <initial>: %(message)s"
|
2012-11-19 18:04:23 +01:00
|
|
|
formatter = logging.Formatter(log_format)
|
|
|
|
logging.basicConfig(format=log_format)
|
|
|
|
logger.setLevel(logging.DEBUG)
|
|
|
|
file_handler = logging.FileHandler(log_file)
|
|
|
|
file_handler.setFormatter(formatter)
|
|
|
|
logger.addHandler(file_handler)
|
|
|
|
return logger
|
|
|
|
|
2013-01-14 19:08:33 +01:00
|
|
|
def configure_logger(logger, direction_name):
|
|
|
|
if direction_name is None:
|
|
|
|
log_format = "%(message)s"
|
|
|
|
else:
|
|
|
|
log_format = "%(asctime)s [" + direction_name + "] %(message)s"
|
|
|
|
formatter = logging.Formatter(log_format)
|
|
|
|
|
|
|
|
# Replace the formatters for the file and stdout loggers
|
|
|
|
for handler in logger.handlers:
|
|
|
|
handler.setFormatter(formatter)
|
|
|
|
root_logger = logging.getLogger()
|
|
|
|
for handler in root_logger.handlers:
|
|
|
|
handler.setFormatter(formatter)
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
def parse_args():
|
|
|
|
parser = optparse.OptionParser()
|
|
|
|
parser.add_option('--forward-class-messages',
|
|
|
|
default=False,
|
|
|
|
help=optparse.SUPPRESS_HELP,
|
|
|
|
action='store_true')
|
2012-11-27 16:27:02 +01:00
|
|
|
parser.add_option('--shard',
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
2012-11-29 14:58:59 +01:00
|
|
|
parser.add_option('--noshard',
|
|
|
|
default=False,
|
|
|
|
help=optparse.SUPPRESS_HELP,
|
|
|
|
action='store_true')
|
2012-11-19 18:04:23 +01:00
|
|
|
parser.add_option('--resend-log',
|
2013-08-27 17:10:13 +02:00
|
|
|
dest='logs_to_resend',
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
|
|
|
parser.add_option('--enable-resend-log',
|
2012-11-19 18:04:23 +01:00
|
|
|
dest='resend_log_path',
|
2012-11-26 23:43:59 +01:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
2013-08-27 17:10:13 +02:00
|
|
|
parser.add_option('--log-path',
|
2012-11-19 18:04:23 +01:00
|
|
|
dest='log_path',
|
2012-11-26 23:43:59 +01:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
2013-08-14 17:58:07 +02:00
|
|
|
parser.add_option('--stream-file-path',
|
|
|
|
dest='stream_file_path',
|
2013-10-04 19:19:57 +02:00
|
|
|
default="/home/zulip/public_streams",
|
2013-08-14 17:58:07 +02:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
2012-11-19 18:04:23 +01:00
|
|
|
parser.add_option('--no-forward-personals',
|
|
|
|
dest='forward_personals',
|
|
|
|
help=optparse.SUPPRESS_HELP,
|
|
|
|
default=True,
|
|
|
|
action='store_false')
|
2013-08-27 21:25:59 +02:00
|
|
|
parser.add_option('--forward-mail-zephyrs',
|
|
|
|
dest='forward_mail_zephyrs',
|
|
|
|
help=optparse.SUPPRESS_HELP,
|
|
|
|
default=False,
|
|
|
|
action='store_true')
|
2013-08-06 22:25:43 +02:00
|
|
|
parser.add_option('--no-forward-from-zulip',
|
2012-11-27 16:25:49 +01:00
|
|
|
default=True,
|
2013-08-06 22:25:43 +02:00
|
|
|
dest='forward_from_zulip',
|
2012-11-19 18:04:23 +01:00
|
|
|
help=optparse.SUPPRESS_HELP,
|
2012-11-27 16:25:49 +01:00
|
|
|
action='store_false')
|
2012-11-19 18:04:23 +01:00
|
|
|
parser.add_option('--verbose',
|
|
|
|
default=False,
|
|
|
|
help=optparse.SUPPRESS_HELP,
|
|
|
|
action='store_true')
|
|
|
|
parser.add_option('--sync-subscriptions',
|
|
|
|
default=False,
|
|
|
|
action='store_true')
|
2013-08-26 20:50:30 +02:00
|
|
|
parser.add_option('--ignore-expired-tickets',
|
|
|
|
default=False,
|
|
|
|
action='store_true')
|
2012-11-19 18:04:23 +01:00
|
|
|
parser.add_option('--site',
|
|
|
|
default=DEFAULT_SITE,
|
2012-11-26 23:43:59 +01:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
2013-08-20 20:03:07 +02:00
|
|
|
parser.add_option('--on-startup-command',
|
|
|
|
default=None,
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
2012-11-19 18:04:23 +01:00
|
|
|
parser.add_option('--user',
|
|
|
|
default=os.environ["USER"],
|
2012-11-26 23:43:59 +01:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
2012-11-19 18:04:23 +01:00
|
|
|
parser.add_option('--root-path',
|
|
|
|
default="/afs/athena.mit.edu/user/t/a/tabbott/for_friends",
|
2012-11-26 23:43:59 +01:00
|
|
|
help=optparse.SUPPRESS_HELP)
|
2013-08-23 20:13:26 +02:00
|
|
|
parser.add_option('--session-path',
|
|
|
|
default=None,
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
2013-08-26 21:43:29 +02:00
|
|
|
parser.add_option('--nagios-class',
|
|
|
|
default=None,
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
|
|
|
parser.add_option('--nagios-path',
|
|
|
|
default=None,
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
2013-08-23 20:13:26 +02:00
|
|
|
parser.add_option('--use-sessions',
|
|
|
|
default=False,
|
|
|
|
action='store_true',
|
|
|
|
help=optparse.SUPPRESS_HELP)
|
2012-11-19 18:04:23 +01:00
|
|
|
parser.add_option('--test-mode',
|
|
|
|
default=False,
|
|
|
|
help=optparse.SUPPRESS_HELP,
|
|
|
|
action='store_true')
|
|
|
|
parser.add_option('--api-key-file',
|
2012-11-26 23:43:59 +01:00
|
|
|
default=os.path.join(os.environ["HOME"], "Private", ".humbug-api-key"))
|
2012-11-19 18:04:23 +01:00
|
|
|
return parser.parse_args()
|
|
|
|
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
def die_gracefully(signal, frame):
|
2013-08-06 21:34:20 +02:00
|
|
|
if CURRENT_STATE == States.ZulipToZephyr or CURRENT_STATE == States.ChildSending:
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
# this is a child process, so we want os._exit (no clean-up necessary)
|
|
|
|
os._exit(1)
|
|
|
|
|
2013-08-23 20:13:26 +02:00
|
|
|
if CURRENT_STATE == States.ZephyrToZulip and not options.use_sessions:
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
try:
|
2013-08-06 22:25:43 +02:00
|
|
|
# zephyr=>zulip processes may have added subs, so run cancelSubs
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
zephyr._z.cancelSubs()
|
|
|
|
except IOError:
|
|
|
|
# We don't care whether we failed to cancel subs properly, but we should log it
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.exception("")
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
|
|
|
|
sys.exit(1)
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
if __name__ == "__main__":
|
|
|
|
# Set the SIGCHLD handler back to SIG_DFL to prevent these errors
|
|
|
|
# when importing the "requests" module after being restarted using
|
|
|
|
# the restart_stamp functionality:
|
|
|
|
#
|
|
|
|
# close failed in file object destructor:
|
|
|
|
# IOError: [Errno 10] No child processes
|
|
|
|
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
|
|
|
|
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
signal.signal(signal.SIGINT, die_gracefully)
|
|
|
|
|
2012-11-19 18:04:23 +01:00
|
|
|
(options, args) = parse_args()
|
|
|
|
|
2013-01-14 19:08:33 +01:00
|
|
|
logger = open_logger()
|
|
|
|
configure_logger(logger, "parent")
|
|
|
|
|
2013-08-07 17:51:03 +02:00
|
|
|
# The 'api' directory needs to go first, so that 'import zulip' won't pick
|
2012-12-03 23:13:41 +01:00
|
|
|
# up some other directory named 'humbug'.
|
2013-08-19 20:16:47 +02:00
|
|
|
pyzephyr_lib_path = "python-zephyr/build/lib.linux-%s-%s/" % (os.uname()[4], sys.version[0:3])
|
2012-12-03 23:13:41 +01:00
|
|
|
sys.path[:0] = [os.path.join(options.root_path, 'api'),
|
|
|
|
options.root_path,
|
2012-12-03 18:23:06 +01:00
|
|
|
os.path.join(options.root_path, "python-zephyr"),
|
2013-01-02 20:20:22 +01:00
|
|
|
os.path.join(options.root_path, pyzephyr_lib_path)]
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
# In case this is an automated restart of the mirroring script,
|
|
|
|
# and we have lost AFS tokens, first try reading the API key from
|
|
|
|
# the environment so that we can skip doing a filesystem read.
|
|
|
|
if os.environ.get("HUMBUG_API_KEY") is not None:
|
|
|
|
api_key = os.environ.get("HUMBUG_API_KEY")
|
|
|
|
else:
|
|
|
|
if not os.path.exists(options.api_key_file):
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.error("\n" + "\n".join(textwrap.wrap("""\
|
2012-11-19 18:04:23 +01:00
|
|
|
Could not find API key file.
|
|
|
|
You need to either place your api key file at %s,
|
2013-01-14 19:08:33 +01:00
|
|
|
or specify the --api-key-file option.""" % (options.api_key_file,))))
|
2012-11-19 18:04:23 +01:00
|
|
|
sys.exit(1)
|
|
|
|
api_key = file(options.api_key_file).read().strip()
|
|
|
|
# Store the API key in the environment so that our children
|
|
|
|
# don't need to read it in
|
|
|
|
os.environ["HUMBUG_API_KEY"] = api_key
|
|
|
|
|
2013-08-26 21:43:29 +02:00
|
|
|
if options.nagios_path is None and options.nagios_class is not None:
|
|
|
|
logger.error("\n" + "nagios_path is required with nagios_class\n")
|
|
|
|
sys.exit(1)
|
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
zulip_account_email = options.user + "@mit.edu"
|
2013-08-07 17:51:03 +02:00
|
|
|
import zulip
|
|
|
|
zulip_client = zulip.Client(
|
2013-08-06 22:25:43 +02:00
|
|
|
email=zulip_account_email,
|
2012-12-03 18:23:06 +01:00
|
|
|
api_key=api_key,
|
|
|
|
verbose=True,
|
|
|
|
client="zephyr_mirror",
|
|
|
|
site=options.site)
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
start_time = time.time()
|
|
|
|
|
|
|
|
if options.sync_subscriptions:
|
2013-01-14 19:08:33 +01:00
|
|
|
configure_logger(logger, None) # make the output cleaner
|
2013-07-10 22:58:30 +02:00
|
|
|
logger.info("Syncing your ~/.zephyr.subs to your Zulip Subscriptions!")
|
2013-08-06 22:25:43 +02:00
|
|
|
add_zulip_subscriptions(True)
|
2012-11-19 18:04:23 +01:00
|
|
|
sys.exit(0)
|
|
|
|
|
2012-12-21 17:26:36 +01:00
|
|
|
# Kill all zephyr_mirror processes other than this one and its parent.
|
2012-11-19 18:04:23 +01:00
|
|
|
if not options.test_mode:
|
2013-05-16 20:44:35 +02:00
|
|
|
pgrep_query = "python.*zephyr_mirror"
|
2012-11-27 16:27:02 +01:00
|
|
|
if options.shard is not None:
|
2013-08-26 20:29:41 +02:00
|
|
|
# sharded class mirror
|
2012-12-21 17:26:36 +01:00
|
|
|
pgrep_query = "%s.*--shard=%s" % (pgrep_query, options.shard)
|
2013-08-26 20:29:41 +02:00
|
|
|
elif options.user is not None:
|
|
|
|
# Personals mirror on behalf of another user.
|
|
|
|
pgrep_query = "%s.*--user=%s" % (pgrep_query, options.user)
|
2012-11-27 16:27:02 +01:00
|
|
|
proc = subprocess.Popen(['pgrep', '-U', os.environ["USER"], "-f", pgrep_query],
|
2012-11-19 18:04:23 +01:00
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=subprocess.PIPE)
|
|
|
|
out, _err_unused = proc.communicate()
|
2012-12-21 17:26:36 +01:00
|
|
|
for pid in map(int, out.split()):
|
|
|
|
if pid == os.getpid() or pid == os.getppid():
|
|
|
|
continue
|
|
|
|
|
|
|
|
# Another copy of zephyr_mirror.py! Kill it.
|
2013-01-14 19:08:33 +01:00
|
|
|
logger.info("Killing duplicate zephyr_mirror process %s" % (pid,))
|
2012-12-21 17:26:36 +01:00
|
|
|
try:
|
zmirror: Allow duplicate zmirror processes to die gracefully.
Fixes #602.
I replaced the SIGKILL with a SIGINT, and then catch SIGINT with a
handler. This handler calls cancelSubs if necessary, and can later be
edited to perform other clean-up operations, too. I thought about, in
this same commit, changing the SIGTERM in
maybe_restart_mirroring_script to a SIGINT, but after tracing out the
code paths, I realized that isn't necessary. (The SIGTERM is
necessarily performed on a process that has not subscribed to any
zephyr classes, so cancelSubs is unnecessary. If we do think that we
may want to add additional clean-up operations in the future, though,
then it might be worth investigating changing this SIGTERM.)
(imported from commit 692b295be6cb40b0e4ec2ca0bc58c58056ed9bd9)
2013-01-03 19:21:19 +01:00
|
|
|
os.kill(pid, signal.SIGINT)
|
2012-12-21 17:26:36 +01:00
|
|
|
except OSError:
|
2013-01-14 19:08:33 +01:00
|
|
|
# We don't care if the target process no longer exists, so just log the error
|
|
|
|
logger.exception("")
|
2012-11-19 18:04:23 +01:00
|
|
|
|
2012-11-27 16:27:02 +01:00
|
|
|
if options.shard is not None and set(options.shard) != set("a"):
|
|
|
|
# The shard that is all "a"s is the one that handles personals
|
2013-08-06 22:25:43 +02:00
|
|
|
# forwarding and zulip => zephyr forwarding
|
2012-11-27 16:27:02 +01:00
|
|
|
options.forward_personals = False
|
2013-08-06 22:25:43 +02:00
|
|
|
options.forward_from_zulip = False
|
2013-08-27 21:25:59 +02:00
|
|
|
if options.forward_mail_zephyrs is None:
|
|
|
|
options.forward_mail_zephyrs = subscribed_to_mail_messages()
|
2012-11-27 16:27:02 +01:00
|
|
|
|
2013-08-23 20:13:26 +02:00
|
|
|
if options.session_path is None:
|
|
|
|
options.session_path = "/var/tmp/%s" % (options.user,)
|
|
|
|
|
2013-08-06 22:25:43 +02:00
|
|
|
if options.forward_from_zulip:
|
2012-11-27 16:25:49 +01:00
|
|
|
child_pid = os.fork()
|
|
|
|
if child_pid == 0:
|
2013-08-06 21:34:20 +02:00
|
|
|
CURRENT_STATE = States.ZulipToZephyr
|
2013-08-06 22:25:43 +02:00
|
|
|
# Run the zulip => zephyr mirror in the child
|
|
|
|
configure_logger(logger, "zulip=>zephyr")
|
|
|
|
zulip_to_zephyr(options)
|
2012-11-27 16:25:49 +01:00
|
|
|
sys.exit(0)
|
|
|
|
else:
|
|
|
|
child_pid = None
|
2013-08-06 21:34:20 +02:00
|
|
|
CURRENT_STATE = States.ZephyrToZulip
|
2012-11-19 18:04:23 +01:00
|
|
|
|
|
|
|
import zephyr
|
2013-08-06 22:25:43 +02:00
|
|
|
logger_name = "zephyr=>zulip"
|
2012-11-27 16:27:02 +01:00
|
|
|
if options.shard is not None:
|
|
|
|
logger_name += "(%s)" % (options.shard,)
|
2013-01-14 19:08:33 +01:00
|
|
|
configure_logger(logger, logger_name)
|
2013-08-06 21:32:15 +02:00
|
|
|
# Have the kernel reap children for when we fork off processes to send Zulips
|
2012-11-19 18:04:23 +01:00
|
|
|
signal.signal(signal.SIGCHLD, signal.SIG_IGN)
|
2013-08-06 22:25:43 +02:00
|
|
|
zephyr_to_zulip(options)
|