Changeset c8cb9ba for asadb/util/sync_moira_authz.py

Timestamp:

Dec 23, 2011, 12:01:31 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

d7dcfee

Parents:

ac1d897

git-author:

Alex Dehnert <adehnert@…> (12/23/11 00:00:02)

git-committer:

Alex Dehnert <adehnert@…> (12/23/11 00:01:31)

Message:

Sync staff status with the asa-admin list as well

It's possible we actually want to have some whitelist of "people who should
always have staff status". Not clearly worthwhile enough for me to implement
something now, though.

File:

• asadb/util/sync_moira_authz.py (modified) (7 diffs)

asadb/util/sync_moira_authz.py

@@ -24 +24 @@
         self.dj_groups = django.contrib.auth.models.Group.objects
 
-    def sync_members(self, sys_name, dj_name, ):
+    def sync_helper(self, sys_name, dj_members, adder, remover, ):
         kept = []
         added = []
@@ -31 +31 @@
         removed = []
         sys_members = self.get_members(sys_name)
-        dj_group = self.dj_groups.get(name=dj_name)
-        dj_members = dj_group.user_set.all()
         dj_usernames = set([m.username for m in dj_members])
         for username in sys_members:
@@ -42 +40 @@
                     user, is_new = mit.get_or_create_mit_user(username, )
                     if is_new: created.append(username)
-                    user.groups.add(dj_group)
+                    adder(user)
                     added.append(username)
                 except ValueError:
@@ -51 +49 @@
                 assert username in kept
             else:
-                user.groups.remove(dj_group)
+                remover(user)
                 removed.append(username)
         return {
@@ -62 +60 @@
         }
 
+    def sync_staff(self, sys_name, ):
+        dj_members = django.contrib.auth.models.User.objects.filter(is_staff=True, )
+        def adder(user, ):
+            user.is_staff = True
+            user.save()
+        def remover(user, ):
+            user.is_staff = False
+            user.save()
+        return self.sync_helper(sys_name, dj_members, adder, remover, )
+
+    def sync_members(self, sys_name, dj_name, ):
+        dj_group = self.dj_groups.get(name=dj_name)
+        dj_members = dj_group.user_set.all()
+        adder = lambda user: user.groups.add(dj_group)
+        remover = lambda user: user.groups.remove(dj_group)
+        return self.sync_helper(sys_name, dj_members, adder, remover, )
+
     def sync_many(con, what, force_print=False, ):
         changed = False
@@ -67 +82 @@
         for sys_name, dj_group in what:
             assert dj_group not in results
-            results[dj_group] = con_afs.sync_members(sys_name, dj_group)
+            if dj_group == "STAFF":
+                results[dj_group] = con_afs.sync_staff(sys_name, )
+            else:
+                results[dj_group] = con_afs.sync_members(sys_name, dj_group)
             if results[dj_group]['change']: changed = True
         if changed or force_print:
@@ -129 +147 @@
 
 sync_pairs = [
+    ('asa-admin', 'STAFF', ),
     ('asa-admin', 'asa-ebm', ),
     ('asa-db-mit-deskworker', 'mit-deskworker', ),