Make modify form work

[invirt/packages/invirt-web.git] / code / cache_acls.py

diff --git a/code/cache_acls.py b/code/cache_acls.py
old mode 100644 (file)
new mode 100755 (executable)
index fe69815..7ae4ac8
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -39,7 +39,7 @@ def expandName(name):
             return [name]
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, config.authz[0].cell)
+        return getafsgroups.getAfsGroupMembers(name, config.authz.afs.cells[0].cell)
     except getafsgroups.AfsProcessError:
         return []
 
@@ -70,6 +70,17 @@ def refreshCache():
             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: