From a2945267e85c20e2cec87ca5fb470bf51fecfada Mon Sep 17 00:00:00 2001 From: Peter Iannucci Date: Mon, 1 Feb 2010 15:47:14 -0500 Subject: [PATCH 1/1] Made cache_acls use invirt.authz. svn path=/trunk/packages/invirt-web/; revision=2981 --- code/cache_acls.py | 52 ++++++---------------------------------------------- 1 file changed, 6 insertions(+), 46 deletions(-) diff --git a/code/cache_acls.py b/code/cache_acls.py index 7ae4ac8..3c3d11e 100755 --- a/code/cache_acls.py +++ b/code/cache_acls.py @@ -1,53 +1,13 @@ #!/usr/bin/python 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 def refreshMachine(m): @@ -60,7 +20,7 @@ def refreshMachine(m): ma = MachineAccess(user=p) m.acl.append(ma) session.save_or_update(ma) - + def refreshCache(): session.begin() @@ -69,9 +29,9 @@ def refreshCache(): for m in machines: 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: old = Admin.query.filter_by(user=removed).first() -- 1.7.9.5