Changeset 228 for trunk/web/templates/validation.py

Timestamp:

Oct 28, 2007, 11:57:32 PM (17 years ago)

Author:

ecprice

Message:

Remove the useless User class (now user is a string)
Allow creation under another owner.

File:

• trunk/web/templates/validation.py (modified) (4 diffs)

trunk/web/templates/validation.py

@@ -25 +25 @@
         owner = machine.owner
     else:
-        owner = user.username
+        owner = user
     return Machine.select_by(owner=owner)
 
@@ -69 +69 @@
 def haveAccess(user, machine):
     """Return whether a user has adminstrative access to a machine"""
-    if user.username == 'moo':
-        return True
-    if user.username in (machine.administrator, machine.owner):
-        return True
-    if getafsgroups.checkAfsGroup(user.username, machine.administrator, 
+    if user == 'moo':
+        return True
+    if user in (machine.administrator, machine.owner):
+        return True
+    if getafsgroups.checkAfsGroup(user, machine.administrator, 
                                   'athena.mit.edu'): #XXX Cell?
         return True
-    if getafsgroups.checkLockerOwner(user.username, machine.owner):
+    if getafsgroups.checkLockerOwner(user, machine.owner):
         return True
     return owns(user, machine)
@@ -82 +82 @@
 def owns(user, machine):
     """Return whether a user owns a machine"""
-    if user.username == 'moo':
-        return True
-    return getafsgroups.checkLockerOwner(user.username, machine.owner)
+    if user == 'moo':
+        return True
+    return getafsgroups.checkLockerOwner(user, machine.owner)
 
 def validMachineName(name):
@@ -154 +154 @@
     if admin in (None, machine.administrator):
         return None
-    if admin == user.username:
+    if admin == user:
         return admin
-    if getafsgroups.checkAfsGroup(user.username, admin, 'athena.mit.edu'):
+    if getafsgroups.checkAfsGroup(user, admin, 'athena.mit.edu'):
         return admin
-    if getafsgroups.checkAfsGroup(user.username, 'system:'+admin,
+    if getafsgroups.checkAfsGroup(user, 'system:'+admin,
                                   'athena.mit.edu'):
         return 'system:'+admin
     return admin
     
-def testOwner(user, owner, machine):
-    if owner in (None, machine.owner):
-        return None
-    value = getafsgroups.checkLockerOwner(user.username, owner, verbose=True)
+def testOwner(user, owner, machine=None):
+    if owner == user or machine is not None and owner == machine.owner:
+        return owner
+    if owner is None:
+        raise InvalidInput('owner', owner, "Owner must be specified")
+    value = getafsgroups.checkLockerOwner(user, owner, verbose=True)
     if not value:
         return owner