Changeset 9c1f0b2 for asadb/mit

Timestamp:

Jun 6, 2011, 3:10:15 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

c9d8369

Parents:

9480c7b

git-author:

Alex Dehnert <adehnert@…> (06/06/11 03:10:15)

git-committer:

Alex Dehnert <adehnert@…> (06/06/11 03:10:15)

Message:

Merge "upstream" fixes from SIPB's snippets

File:

• asadb/mit/__init__.py (modified) (4 diffs)

asadb/mit/__init__.py

@@ +1 @@
+import subprocess
+import ldap
+import ldap.filter
+
 from django.contrib.auth.middleware import RemoteUserMiddleware
 from django.contrib.auth.backends import RemoteUserBackend
@@ -8 +12 @@
 import settings
 
-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, ))
+def zephyr(msg, clas='message', instance='log', rcpt='nobody',):
+    proc = subprocess.Popen(
+        ['zwrite', '-d', '-n', '-c', clas, '-i', instance, rcpt, ],
+        stdin=subprocess.PIPE, stdout=subprocess.PIPE
+    )
+    proc.communicate(msg)
 
 class ScriptsRemoteUserMiddleware(RemoteUserMiddleware):
@@ -25 +32 @@
     def configure_user(self, user, ):
         username = user.username
-        import ldap
+        user.password = "ScriptsSSLAuth"
         con = ldap.open('ldap.mit.edu')
         con.simple_bind_s("", "")
         dn = "dc=mit,dc=edu"
         fields = ['cn', 'sn', 'givenName', 'mail', ]
-        result = con.search_s('dc=mit,dc=edu', ldap.SCOPE_SUBTREE, 'uid=%s'%username, fields)
+        userfilter = ldap.filter.filter_format('uid=%s', [username])
+        result = con.search_s('dc=mit,dc=edu', ldap.SCOPE_SUBTREE, userfilter, fields)
         if len(result) == 1:
             user.first_name = result[0][1]['givenName'][0]
@@ -39 +47 @@
             except ObjectDoesNotExist:
                 print "Failed to retrieve mit group"
-            user.save()
+        else:
+            raise ValueError, ("Could not find user with username '%s' (filter '%s')"%(username, userfilter))
         try:
             user.groups.add(auth.models.Group.objects.get(name='autocreated'))
         except ObjectDoesNotExist:
             print "Failed to retrieve autocreated group"
+        user.save()
         return user