Properly escape the zwrite command line

[Scripts/git/.git] / django / mit / __init__.py

diff --git a/django/mit/__init__.py b/django/mit/__init__.py
index ff296a890c366166b4d6a9f5dde2b33a52d81888..78ba4de675676d3dc2f808bff66928a71de4cbe7 100644 (file)
--- a/django/mit/__init__.py
+++ b/django/mit/__init__.py
@@ -1,11 +1,16 @@
+import subprocess
+
 from django.contrib.auth.middleware import RemoteUserMiddleware
 from django.contrib.auth.backends import RemoteUserBackend
 from django.contrib import auth
 from django.core.exceptions import ObjectDoesNotExist
 
 def zephyr(msg, clas='remit', instance='log', rcpt='adehnert',):
-    import os
-    os.system("zwrite -d -c '%s' -i '%s' '%s' -m '%s'" % (clas, instance, rcpt, msg, ))
+    proc = subprocess.Popen(
+        ['zwrite', '-d', '-n', '-c', clas, '-i', instance, rcpt, ],
+        stdin=subprocess.PIPE, stdout=subprocess.PIPE
+    )
+    proc.communicate(msg)
 
 class ScriptsRemoteUserMiddleware(RemoteUserMiddleware):
     header = 'SSL_CLIENT_S_DN_Email'
@@ -20,6 +25,7 @@ class ScriptsRemoteUserBackend(RemoteUserBackend):
             return username
     def configure_user(self, user, ):
         username = user.username
+        user.password = "ScriptsSSLAuth"
         import ldap
         con = ldap.open('ldap.mit.edu')
         con.simple_bind_s("", "")
@@ -34,9 +40,9 @@ class ScriptsRemoteUserBackend(RemoteUserBackend):
                 user.groups.add(auth.models.Group.objects.get(name='mit'))
             except ObjectDoesNotExist:
                 print "Failed to retrieve mit group"
-            user.save()
         try:
             user.groups.add(auth.models.Group.objects.get(name='autocreated'))
         except ObjectDoesNotExist:
             print "Failed to retrieve autocreated group"
+        user.save()
         return user