Changeset 413 for trunk/packages/sipb-xen-www/code/validation.py

Timestamp:

Apr 14, 2008, 12:44:00 AM (16 years ago)

Author:

ecprice

Message:

Resolve #69, by checking that administrators are either users or
groups in the athena cell.

File:

• trunk/packages/sipb-xen-www/code/validation.py (modified) (1 diff)

trunk/packages/sipb-xen-www/code/validation.py

@@ -159 +159 @@
             return admin
         admin = 'system:' + admin
-    if getafsgroups.checkAfsGroup(user, admin, 'athena.mit.edu'):
-        return admin
-    #XXX Should we require that user is in cache_acls.expandName(admin)?
+    try:
+        if user in getafsgroups.getAfsGroupMembers(admin, 'athena.mit.edu'):
+            return admin
+    except getafsgroups.AfsProcessError, e:
+        raise InvalidInput('administrator', admin, str(e))
+    #XXX Should we require that user is in the admin group?
     return admin