Changeset 874 for trunk/packages/sipb-xen-www

Timestamp:

Aug 6, 2008, 1:07:22 AM (16 years ago)

Author:

price

Message:

add and respect 'adminable' column to machines

This is for selectively, temporarily, manually enabling admin mode
for a VM. Where it's not set, admin mode now bypasses quotas and does
nothing else.

Location:

trunk/packages/sipb-xen-www/code

Files:

• validation.py (modified) (1 diff)
• webcommon.py (modified) (2 diffs)

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

@@ -126 +126 @@
 def haveAccess(user, state, machine):
     """Return whether a user has administrative access to a machine"""
-    return state.isadmin or user in cache_acls.accessList(machine)
+    return (user in cache_acls.accessList(machine)
+            or (machine.adminable and state.isadmin))
 
 def owns(user, machine):

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

@@ -2 +2 @@
 
 import time
+from invirt import database
 from invirt.database import Machine, MachineAccess
 
@@ -45 +46 @@
     def getMachines(self):
         if self.isadmin:
-            return Machine.select()
+            return Machine.query().join('acl').select_by(
+                database.or_(MachineAccess.c.user == self.username,
+                             Machine.c.adminable == True))
         else:
             return Machine.query().join('acl').select_by(user=self.username)