Context Navigation

cherrypy-rebased

Timestamp:

Dec 20, 2009, 9:47:20 PM (15 years ago)

Author:

broder

Message:

Update the cherrypy branch to use authz.afs.cells instead of just
authz.cells, to stay in sync with r2590.

(Again, this isn't really a cherry-pick, but whatever)

Location:

package_branches/invirt-web/cherrypy-rebased

Files:

r2716	r2717
40	40	return []
41	41	try:
42		return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
	42	return getafsgroups.getAfsGroupMembers(name, config.authz.afs.cells[0].cell)
43	43	except getafsgroups.AfsProcessError:
44	44	return []

r2716	r2717
31	31	def getAfsGroupMembers(group, cell):
32	32	encrypt = True
33		for c in config.authz.cells:
	33	for c in config.authz.afs.cells:
34	34	if c.cell == cell and hasattr(c, 'auth'):
35	35	encrypt = c.auth

r2716	r2717
87	87	def __getattr__(self, name):
88	88	if name in ("admin", "overlord"):
89		if not cherrypy.request.login in getAfsGroupMembers(config.adminacl, config.authz.cells[0].cell):
	89	if not cherrypy.request.login in getAfsGroupMembers(config.adminacl, config.authz.afs.cells[0].cell):
90	90	raise InvalidInput('username', cherrypy.request.login,
91	91	'Not in admin group %s.' % config.adminacl)

r2716	r2717
223	223	admin = 'system:' + admin
224	224	try:
225		if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
	225	if user in getafsgroups.getAfsGroupMembers(admin, config.authz.afs.cells[0].cell):
226	226	return admin
227	227	except getafsgroups.AfsProcessError, e:

-                      r2716
+                      r2717
 #!/bin/sh
 cells () {
   for i in $(invirt-getconf -l authz.cells); do
     invirt-getconf authz.cells.$i.cell
+  for i in $(invirt-getconf -l authz.afs.cells); do
+    invirt-getconf authz.afs.cells.$i.cell
   done
+}

Note: See TracChangeset for help on using the changeset viewer.