Switched from caching ORM to direct database queries; now uncached queries are almost...

[invirt/packages/invirt-remote.git] / files / usr / sbin / invirt-remconffs

diff --git a/files/usr/sbin/invirt-remconffs b/files/usr/sbin/invirt-remconffs
index 384c791..6389391 100755 (executable)
--- a/files/usr/sbin/invirt-remconffs
+++ b/files/usr/sbin/invirt-remconffs
@@ -5,83 +5,84 @@ from routes import Mapper
 
 from syslog import *
 from time import time
 
 from syslog import *
 from time import time

+import sqlalchemy as sa

 
 from invirt import database
 from invirt.config import structs as config
 
 class RemConfFS(routefs.RouteFS):
 
 from invirt import database
 from invirt.config import structs as config
 
 class RemConfFS(routefs.RouteFS):

-       """
-       RemConfFS creates a filesytem for configuring remctl, like this:
-       /
-       |-- acl
-       |   |-- machine1
-       |   ...
-       |   `-- machinen
-       `-- conf
+    """
+    RemConfFS creates a filesytem for configuring remctl, like this:
+    /
+    |-- acl
+    |   |-- machine1
+    |   ...
+    |   `-- machinen
+    `-- conf
+    
+    The machine list and the acls are drawn from a database.
+    """
+    
+    def __init__(self, *args, **kw):
+        """Initialize the filesystem and set it to allow_other access besides
+        the user who mounts the filesystem (i.e. root)
+        """
+        super(RemConfFS, self).__init__(*args, **kw)
+        self.fuse_args.add("allow_other", True)

         
         

-       The machine list and the acls are drawn from a database.
-       """
-       
-       def __init__(self, *args, **kw):
-               """Initialize the filesystem and set it to allow_other access besides
-               the user who mounts the filesystem (i.e. root)
-               """
-               super(RemConfFS, self).__init__(*args, **kw)
-               self.lasttime = time()
-               self.fuse_args.add("allow_other", True)
-               
-               openlog('invirt-remconffs ', LOG_PID, LOG_DAEMON)
-               
-               syslog(LOG_DEBUG, 'Init complete.')
+        openlog('invirt-remconffs ', LOG_PID, LOG_DAEMON)

         
         

-        def make_map(self):
-                m = Mapper()
-                m.connect('', controller='getroot')
-                m.connect('acl', controller='getmachines')
-                m.connect('acl/:machine', controller='getacl')
-                m.connect('conf', controller='getconf')
-                return m
+        syslog(LOG_DEBUG, 'Init complete.')
+    
+    def make_map(self):
+        m = Mapper()
+        m.connect('', controller='getroot')
+        m.connect('acl', controller='getmachines')
+        m.connect('acl/:machine', controller='getacl')
+        m.connect('conf', controller='getconf')
+        return m
+    
+    def getroot(self, **kw):
+        return ['acl', 'conf']
+    
+    def getacl(self, machine, **kw):
+        """Build the ACL file for a machine
+        """
+        s = sa.sql.select([database.machine_access_table.c.user], # Field to select from
+                          sa.sql.and_( # where clause
+                database.machine_table.c.machine_id==database.machine_access_table.c.machine_id, # join field
+                database.machine_table.c.name == machine), # filter field
+                          from_obj=[database.machine_access_table, database.machine_table]) # from tables
+        users = [self.userToPrinc(acl[0]) for acl in
+                 database.session.execute(s)]
+        return "\n".join(users
+                 + ['include /etc/remctl/acl/web',
+                    ''])
+    
+    def getconf(self, **kw):
+        """Build the master conf file, with all machines
+        """
+        return '\n'.join("control %s /usr/sbin/invirt-remote-proxy-control"
+                 " /etc/remctl/remconffs/acl/%s"
+                 % (machine_name, machine_name)
+                 for machine_name in self.getmachines())+'\n'
+    
+    def getmachines(self, **kw):
+        """Get the list of VMs in the database. Does not cache to prevent race conditions."""
+        return list(row[0] for row in database.session.execute(sa.sql.select([database.Machine.c.name])))
+    
+    def userToPrinc(self, user):
+        """Convert Kerberos v4-style names to v5-style and append a default
+        realm if none is specified
+        """
+        if '@' in user:
+            (princ, realm) = user.split('@')
+        else:
+            princ = user
+            realm = config.authn[0].realm

         
         

-        def getroot(self, **kw):
-                return ['acl', 'conf']
-        
-       def getacl(self, machine, **kw):
-               """Build the ACL file for a machine
-               """
-               machine = database.Machine.query().filter_by(name=machine).one()
-               users = [acl.user for acl in machine.acl]
-               return "\n".join(map(self.userToPrinc, users)
-                                + ['include /etc/remctl/acl/web',
-                                   ''])
-        
-       def getconf(self, **kw):
-               """Build the master conf file, with all machines
-               """
-               return '\n'.join("control %s /usr/sbin/invirt-remote-proxy-control"
-                                " /etc/remctl/remconffs/acl/%s"
-                                % (machine_name, machine_name)
-                                for machine_name in self.getmachines())+'\n'
-       
-       def getmachines(self, **kw):
-               """Get the list of VMs in the database, clearing the cache if it's 
-               older than 15 seconds"""
-               if time() - self.lasttime > 15:
-                       self.lasttime = time()
-                       database.clear_cache()
-               return [machine.name for machine in database.session.query(database.Machine).all()]
-        
-       def userToPrinc(self, user):
-               """Convert Kerberos v4-style names to v5-style and append a default
-               realm if none is specified
-               """
-               if '@' in user:
-                       (princ, realm) = user.split('@')
-               else:
-                       princ = user
-                       realm = config.authn[0].realm
-               
-               return princ.replace('.', '/') + '@' + realm
+        return princ.replace('.', '/') + '@' + realm

 
 if __name__ == '__main__':
 
 if __name__ == '__main__':

-       database.connect()
-        routefs.main(RemConfFS)
+    database.connect()
+    routefs.main(RemConfFS)