zephyr_mirror: Make Webathena work for golem.

(imported from commit 6f8bf1f44c521b22c9fc990711d2821e5a60761d)

bots/zephyr_mirror_backend.py

@@ -621,6 +621,11 @@ Feedback button or at support@zulip.com."""
             for line in message["content"].replace("@", "@@").split("\n"))
 
     zwrite_args = ["zwrite", "-n", "-s", message["sender_full_name"], "-F", "Zephyr error: See http://zephyr.1ts.org/wiki/df"]
+
+    # 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"])
+
     if message['type'] == "stream":
         zephyr_class = message["display_recipient"]
         instance = message["subject"]

zerver/views.py

@@ -412,6 +412,10 @@ def webathena_kerberos_login(request, user_profile,
     try:
         parsed_cred = ujson.loads(cred)
         user = parsed_cred["cname"]["nameString"][0]
+        if user == "golem":
+            # Hack for an mit.edu user whose Kerberos username doesn't
+            # match what he zephyrs as
+            user = "ctl"
         assert(user == user_profile.email.split("@")[0])
         ccache = make_ccache(parsed_cred)
     except Exception: