If the ACL for a locker isn't accessible, assume it's empty (closes #82)

[invirt/packages/invirt-web.git] / code / webcommon.py

diff --git a/code/webcommon.py b/code/webcommon.py
index 5911787..9052a4e 100644 (file)
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -1,7 +1,8 @@
 """Exceptions for the web interface."""
 
 import time
-from sipb_xen_database import Machine, MachineAccess
+from invirt import database
+from invirt.database import Machine, MachineAccess
 
 class MyException(Exception):
     """Base class for my exceptions"""
@@ -38,11 +39,19 @@ def cachedproperty(func):
 
 class State(object):
     """State for a request"""
-    def __init__(self, user):
+    def __init__(self, user, isadmin=False):
         self.username = user
+        self.isadmin = isadmin
 
-    machines = cachedproperty(lambda self:
-                                  Machine.query().join('acl').select_by(user=self.username))
+    def getMachines(self):
+        if self.isadmin:
+            return Machine.query().join('acl').filter_by(
+                database.or_(MachineAccess.c.user == self.username,
+                             Machine.c.adminable == True))
+        else:
+            return Machine.query().join('acl').filter_by(user=self.username)
+
+    machines = cachedproperty(getMachines)
     xmlist_raw = cachedproperty(lambda self: controls.getList())
     xmlist = cachedproperty(lambda self:
                                 dict((m, self.xmlist_raw[m.name])
@@ -54,5 +63,3 @@ class State(object):
         for attr in list(self.__dict__):
             if attr.startswith('__cache_'):
                 delattr(self, attr)
-
-state = State(None)