Ignore:
Timestamp:
Nov 22, 2009, 8:54:11 PM (15 years ago)
Author:
broder
Message:

Re-arrange the authz configuration.

In particular, even if we allow for mixing of multiple authz
mechanisms at some point, you won't have multiple instances of the
locker authz type, so the "type" shouldn't be a property of each of
the cells we specify how to authenticate against.

Location:
trunk/packages/invirt-web/code
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/invirt-web/code/cache_acls.py

    r2226 r2557  
    4040        return []
    4141    try:
    42         return getafsgroups.getAfsGroupMembers(name, config.authz[0].cell)
     42        return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
    4343    except getafsgroups.AfsProcessError:
    4444        return []
  • trunk/packages/invirt-web/code/getafsgroups.py

    r2119 r2557  
    3131def getAfsGroupMembers(group, cell):
    3232    encrypt = True
    33     for c in config.authz:
    34         if c.type == 'afs' and c.cell == cell and hasattr(c, 'auth'):
     33    for c in config.authz.cells:
     34        if c.cell == cell and hasattr(c, 'auth'):
    3535            encrypt = c.auth
    3636    subprocess.check_call(['aklog', cell], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
  • trunk/packages/invirt-web/code/validation.py

    r2293 r2557  
    223223        admin = 'system:' + admin
    224224    try:
    225         if user in getafsgroups.getAfsGroupMembers(admin, config.authz[0].cell):
     225        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
    226226            return admin
    227227    except getafsgroups.AfsProcessError, e:
Note: See TracChangeset for help on using the changeset viewer.