X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/dc5962060920e5b064064f10e539d49a68c9da68..52d630b4ed2f7bbdd61b3eada7a2c38d64c077cb:/code/cache_acls.py

diff --git a/code/cache_acls.py b/code/cache_acls.py
old mode 100644
new mode 100755
index 414f2e3..75f4720
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -6,7 +6,16 @@ import getafsgroups
 import subprocess
 
 def expandLocker(name):
-    groups = getafsgroups.getLockerAcl(name)
+    try:
+        groups = getafsgroups.getLockerAcl(name)
+    except getafsgroups.AfsProcessError, e:
+        if e.message.startswith("fs: You don't have the required access rights on"):
+            return []
+        elif e.message.endswith("doesn't exist\n"):
+            # presumably deactivated
+            return []
+        else:
+            raise
     cell = getafsgroups.getCell(name)
     ans = set()
     for group in groups:
@@ -30,14 +39,15 @@ def expandName(name):
             return [name]
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, config.authz[0].cell)
+        return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
     except getafsgroups.AfsProcessError:
         return []
 
 def accessList(m):
     people = set()
     people.update(expandLocker(m.owner))
-    people.update(expandName(m.administrator))
+    if m.administrator is not None:
+        people.update(expandName(m.administrator))
     return people
 
 def refreshMachine(m):
@@ -55,11 +65,22 @@ def refreshCache():
     session.begin()
 
     try:
-        machines = Machine.select()
+        machines = Machine.query().all()
         for m in machines:
             refreshMachine(m)
         session.flush()
             
+        # Update the admin ACL as well
+        admin_acl = set(expandName(config.adminacl))
+        old_admin_acl = set(a.user for a in Admin.query())
+        for removed in old_admin_acl - admin_acl:
+            old = Admin.query.filter_by(user=removed).first()
+            session.delete(old)
+        for added in admin_acl - old_admin_acl:
+            a = Admin(user=added)
+            session.save_or_update(a)
+        session.flush()
+    
         # Atomically execute our changes
         session.commit()
     except: