Changeset 2558

Timestamp:

Nov 22, 2009, 9:02:31 PM (15 years ago)

Author:

broder

Message:

"Cherry-pick" r2557 (Re-arrange the authz configuration.) to the
cherrypy branch.

(It's somewhat tenuous to claim this is a cherry-pick, given that all
of the changes would have conflicted had I actually tried to
cherry-pick the change. Oh well)

Location:

package_branches/invirt-web/cherrypy

Files:

• code/cache_acls.py (modified) (1 diff)
• code/getafsgroups.py (modified) (1 diff)
• code/main.py (modified) (1 diff)
• code/validation.py (modified) (1 diff)
• invirt-cache-acls (modified) (1 diff)

package_branches/invirt-web/cherrypy/code/cache_acls.py

@@ -40 +40 @@
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, config.authz[0].cell)
+        return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
     except getafsgroups.AfsProcessError:
         return []

package_branches/invirt-web/cherrypy/code/getafsgroups.py

@@ -31 +31 @@
 def getAfsGroupMembers(group, cell):
     encrypt = True
-    for c in config.authz:
-        if c.type == 'afs' and c.cell == cell and hasattr(c, 'auth'):
+    for c in config.authz.cells:
+        if c.cell == cell and hasattr(c, 'auth'):
             encrypt = c.auth
     if encrypt:

package_branches/invirt-web/cherrypy/code/main.py

@@ -92 +92 @@
     def __getattr__(self, name):
         if name in ("admin", "overlord"):
-            if not cherrypy.request.login in getAfsGroupMembers(config.adminacl, config.authz[0].cell):
+            if not cherrypy.request.login in getAfsGroupMembers(config.adminacl, config.authz.cells[0].cell):
                 raise InvalidInput('username', cherrypy.request.login,
                                    'Not in admin group %s.' % config.adminacl)

package_branches/invirt-web/cherrypy/code/validation.py

@@ -223 +223 @@
         admin = 'system:' + admin
     try:
-        if user in getafsgroups.getAfsGroupMembers(admin, config.authz[0].cell):
+        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
             return admin
     except getafsgroups.AfsProcessError, e:

package_branches/invirt-web/cherrypy/invirt-cache-acls

@@ -1 +1 @@
 #!/bin/sh
 cells () {
-  for i in $(invirt-getconf -l authz); do
-    if [ afs = "$(invirt-getconf authz.$i.type)" ]; then
-      invirt-getconf authz.$i.cell
-    fi
+  for i in $(invirt-getconf -l authz.cells); do
+    invirt-getconf authz.cells.$i.cell
   done
 }