Changeset 2981 for trunk/packages

Timestamp:

Feb 1, 2010, 3:47:14 PM (15 years ago)

Author:

iannucci

Message:

Made cache_acls use invirt.authz.

File:

• trunk/packages/invirt-web/code/cache_acls.py (modified) (3 diffs)

trunk/packages/invirt-web/code/cache_acls.py

@@ -2 +2 @@
 from invirt.database import *
 from invirt.config import structs as config
-import sys
-import getafsgroups
-import subprocess
-
-def expandLocker(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:
-        if ':' in group:
-            ans.update(getafsgroups.getAfsGroupMembers(group, cell))
-        else:
-            ans.add(group)
-    return ans
-
-def isUser(name):
-    p = subprocess.Popen(['vos', 'examine', 'user.'+name],
-                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if p.wait():
-        return False
-    return True
-    
-
-def expandName(name):
-    if ':' not in name:
-        if isUser(name):
-            return [name]
-        return []
-    try:
-        return getafsgroups.getAfsGroupMembers(name, config.authz.afs.cells[0].cell)
-    except getafsgroups.AfsProcessError:
-        return []
+from invirt import authz
 
 def accessList(m):
     people = set()
-    people.update(expandLocker(m.owner))
+    people.update(authz.expandOwner(m.owner))
     if m.administrator is not None:
-        people.update(expandName(m.administrator))
+        people.update(authz.expandAdmin(m.administrator))
     return people
 
@@ -61 +21 @@
         m.acl.append(ma)
         session.save_or_update(ma)
-    
+
 def refreshCache():
     session.begin()
@@ -70 +30 @@
             refreshMachine(m)
         session.flush()
-            
+
         # Update the admin ACL as well
-        admin_acl = set(expandName(config.adminacl))
+        admin_acl = set(authz.expandAdmin(config.adminacl))
         old_admin_acl = set(a.user for a in Admin.query())
         for removed in old_admin_acl - admin_acl: