disable GETting to post keyboards to ajaxterm

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

diff --git a/code/main.py b/code/main.py
index 3655352..1f9189f 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -1,14 +1,18 @@
 #!/usr/bin/python
 """Main CGI script for web interface"""
 
 #!/usr/bin/python
 """Main CGI script for web interface"""
 

+from __future__ import with_statement
+

 import base64
 import cPickle
 import cgi
 import datetime
 import hmac
 import base64
 import cPickle
 import cgi
 import datetime
 import hmac

+import os

 import random
 import sha
 import sys
 import random
 import sha
 import sys

+import threading

 import time
 import urllib
 import socket
 import time
 import urllib
 import socket

@@ -36,8 +40,18 @@ from invirt.config import structs as config
 from invirt.common import InvalidInput, CodeError
 
 from view import View, revertStandardError
 from invirt.common import InvalidInput, CodeError
 
 from view import View, revertStandardError

+import ajaxterm
+
+
+static_dir = os.path.join(os.path.dirname(__file__), 'static')
+InvirtStatic = cherrypy.tools.staticdir.handler(
+    root=static_dir,
+    dir=static_dir,
+    section='/static')

 
 class InvirtUnauthWeb(View):
 
 class InvirtUnauthWeb(View):

+    static = InvirtStatic
+

     @cherrypy.expose
     @cherrypy.tools.mako(filename="/unauth.mako")
     def index(self):
     @cherrypy.expose
     @cherrypy.tools.mako(filename="/unauth.mako")
     def index(self):

@@ -53,6 +67,8 @@ class InvirtWeb(View):
                                                  'from invirt import database']
         self._cp_config['request.error_response'] = self.handle_error
 
                                                  'from invirt import database']
         self._cp_config['request.error_response'] = self.handle_error
 

+    static = InvirtStatic
+

     @cherrypy.expose
     @cherrypy.tools.mako(filename="/invalid.mako")
     def invalidInput(self):
     @cherrypy.expose
     @cherrypy.tools.mako(filename="/invalid.mako")
     def invalidInput(self):

@@ -112,11 +128,9 @@ class InvirtWeb(View):
     @cherrypy.tools.mako(filename="/list.mako")
     def list(self, result=None):
         """Handler for list requests."""
     @cherrypy.tools.mako(filename="/list.mako")
     def list(self, result=None):
         """Handler for list requests."""

-        checkpoint.checkpoint('Getting list dict')

         d = getListDict(cherrypy.request.login, cherrypy.request.state)
         if result is not None:
             d['result'] = result
         d = getListDict(cherrypy.request.login, cherrypy.request.state)
         if result is not None:
             d['result'] = result

-        checkpoint.checkpoint('Got list dict')

         return d
     index=list
 
         return d
     index=list
 

@@ -273,7 +287,6 @@ console will suffer artifacts.
                                           cherrypy.request.state,
                                           machine_id=machine_id).machine
             d = infoDict(cherrypy.request.login, cherrypy.request.state, machine)
                                           cherrypy.request.state,
                                           machine_id=machine_id).machine
             d = infoDict(cherrypy.request.login, cherrypy.request.state, machine)

-            checkpoint.checkpoint('Got infodict')

             return d
         index = info
 
             return d
         index = info
 

@@ -353,12 +366,12 @@ console will suffer artifacts.
         def command(self, command_name, machine_id, **kwargs):
             """Handler for running commands like boot and delete on a VM."""
             back = kwargs.get('back')
         def command(self, command_name, machine_id, **kwargs):
             """Handler for running commands like boot and delete on a VM."""
             back = kwargs.get('back')

+            if command_name == 'delete':
+                back = 'list'

             try:
                 d = controls.commandResult(cherrypy.request.login,
                                            cherrypy.request.state,
                                            command_name, machine_id, kwargs)
             try:
                 d = controls.commandResult(cherrypy.request.login,
                                            cherrypy.request.state,
                                            command_name, machine_id, kwargs)

-                if d['command'] == 'Delete VM':
-                    back = 'list'

             except InvalidInput, err:
                 if not back:
                     raise
             except InvalidInput, err:
                 if not back:
                     raise

@@ -379,22 +392,56 @@ console will suffer artifacts.
             else:
                 raise InvalidInput('back', back, 'Not a known back page.')
 
             else:
                 raise InvalidInput('back', back, 'Not a known back page.')
 

-    machine = MachineView()
+        atmulti = ajaxterm.Multiplex()
+        atsessions = {}
+        atsessions_lock = threading.Lock()

 
 

-class Checkpoint:
-    def __init__(self):
-        self.start_time = time.time()
-        self.checkpoints = []
+        @cherrypy.expose
+        @cherrypy.tools.mako(filename="/terminal.mako")
+        def terminal(self, machine_id):
+            machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
+
+            status = controls.statusInfo(machine)
+            has_vnc = hasVnc(status)

 
 

-    def checkpoint(self, s):
-        self.checkpoints.append((s, time.time()))
+            d = dict(on=status,
+                     has_vnc=has_vnc,
+                     machine=machine,
+                     hostname=cherrypy.request.local.name)
+            return d

 
 

-    def __str__(self):
-        return ('Timing info:\n%s\n' %
-                '\n'.join(['%s: %s' % (d, t - self.start_time) for
-                           (d, t) in self.checkpoints]))
+        @cherrypy.expose
+        @cherrypy.tools.require_POST()
+        @cherrypy.tools.gzip()
+        def at(self, machine_id, k=None, c=0, force=0):
+            machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
+            with self.atsessions_lock:
+                if machine_id in self.atsessions:
+                    term = self.atsessions[machine_id]
+                else:
+                    print >>sys.stderr, "spawning new session for terminal to ",machine_id
+                    term = self.atmulti.create(
+                        ["ssh", "-e","none", "-l", machine.name, config.console.hostname]
+                        )
+                    # Clear out old sessions when fd is reused
+                    for key in self.atsessions:
+                        if self.atsessions[key] == term:
+                            del self.atsessions[key]
+                    self.atsessions[machine_id] = term
+                if k:
+                    self.atmulti.proc_write(term,k)
+                time.sleep(0.002)
+                dump=self.atmulti.dump(term,c,int(force))
+                cherrypy.response.headers['Content-Type']='text/xml'
+                if isinstance(dump,str):
+                    return dump
+                else:
+                    print "Removing session for", machine_id
+                    del self.atsessions[machine_id]
+                    return '<?xml version="1.0"?><idem></idem>'
+
+    machine = MachineView()

 
 

-checkpoint = Checkpoint()

 
 class Defaults:
     """Class to store default values for fields."""
 
 class Defaults:
     """Class to store default values for fields."""

@@ -428,37 +475,29 @@ def hasVnc(status):
 
 def getListDict(username, state):
     """Gets the list of local variables used by list.tmpl."""
 
 def getListDict(username, state):
     """Gets the list of local variables used by list.tmpl."""

-    checkpoint.checkpoint('Starting')

     machines = state.machines
     machines = state.machines

-    checkpoint.checkpoint('Got my machines')

     on = {}
     has_vnc = {}
     installing = {}
     xmlist = state.xmlist
     on = {}
     has_vnc = {}
     installing = {}
     xmlist = state.xmlist

-    checkpoint.checkpoint('Got uptimes')

     for m in machines:
         if m not in xmlist:
             has_vnc[m] = 'Off'
             m.uptime = None
         else:
             m.uptime = xmlist[m]['uptime']
     for m in machines:
         if m not in xmlist:
             has_vnc[m] = 'Off'
             m.uptime = None
         else:
             m.uptime = xmlist[m]['uptime']

+            installing[m] = bool(xmlist[m].get('autoinstall'))

             if xmlist[m]['console']:
                 has_vnc[m] = True
             elif m.type.hvm:
                 has_vnc[m] = "WTF?"
             else:
                 has_vnc[m] = "ParaVM"
             if xmlist[m]['console']:
                 has_vnc[m] = True
             elif m.type.hvm:
                 has_vnc[m] = "WTF?"
             else:
                 has_vnc[m] = "ParaVM"

-            if xmlist[m].get('autoinstall'):
-                installing[m] = True
-            else:
-                installing[m] = False

     max_memory = validation.maxMemory(username, state)
     max_disk = validation.maxDisk(username)
     max_memory = validation.maxMemory(username, state)
     max_disk = validation.maxDisk(username)

-    checkpoint.checkpoint('Got max mem/disk')

     defaults = Defaults(max_memory=max_memory,
                         max_disk=max_disk,
                         owner=username)
     defaults = Defaults(max_memory=max_memory,
                         max_disk=max_disk,
                         owner=username)

-    checkpoint.checkpoint('Got defaults')

     def sortkey(machine):
         return (machine.owner != username, machine.owner, machine.name)
     machines = sorted(machines, key=sortkey)
     def sortkey(machine):
         return (machine.owner != username, machine.owner, machine.name)
     machines = sorted(machines, key=sortkey)

@@ -588,7 +627,6 @@ def modifyDict(username, state, machine_id, fields):
 def infoDict(username, state, machine):
     """Get the variables used by info.tmpl."""
     status = controls.statusInfo(machine)
 def infoDict(username, state, machine):
     """Get the variables used by info.tmpl."""
     status = controls.statusInfo(machine)

-    checkpoint.checkpoint('Getting status info')

     has_vnc = hasVnc(status)
     if status is None:
         main_status = dict(name=machine.name,
     has_vnc = hasVnc(status)
     if status is None:
         main_status = dict(name=machine.name,

@@ -602,7 +640,6 @@ def infoDict(username, state, machine):
         uptime = datetime.timedelta(seconds=int(time.time()-start_time))
         cpu_time_float = float(main_status.get('cpu_time', 0))
         cputime = datetime.timedelta(seconds=int(cpu_time_float))
         uptime = datetime.timedelta(seconds=int(time.time()-start_time))
         cpu_time_float = float(main_status.get('cpu_time', 0))
         cputime = datetime.timedelta(seconds=int(cpu_time_float))

-    checkpoint.checkpoint('Status')

     display_fields = [('name', 'Name'),
                       ('description', 'Description'),
                       ('owner', 'Owner'),
     display_fields = [('name', 'Name'),
                       ('description', 'Description'),
                       ('owner', 'Owner'),

@@ -648,11 +685,7 @@ def infoDict(username, state, machine):
             pass
             #fields.append((disp, None))
 
             pass
             #fields.append((disp, None))
 

-    checkpoint.checkpoint('Got fields')
-
-

     max_mem = validation.maxMemory(machine.owner, state, machine, False)
     max_mem = validation.maxMemory(machine.owner, state, machine, False)

-    checkpoint.checkpoint('Got mem')

     max_disk = validation.maxDisk(machine.owner, machine)
     defaults = Defaults()
     for name in 'machine_id name description administrator owner memory contact'.split():
     max_disk = validation.maxDisk(machine.owner, machine)
     defaults = Defaults()
     for name in 'machine_id name description administrator owner memory contact'.split():

@@ -660,7 +693,6 @@ def infoDict(username, state, machine):
             setattr(defaults, name, getattr(machine, name))
     defaults.type = machine.type.type_id
     defaults.disk = "%0.2f" % (machine.disks[0].size/1024.)
             setattr(defaults, name, getattr(machine, name))
     defaults.type = machine.type.type_id
     defaults.disk = "%0.2f" % (machine.disks[0].size/1024.)

-    checkpoint.checkpoint('Got defaults')

     d = dict(user=username,
              on=status is not None,
              machine=machine,
     d = dict(user=username,
              on=status is not None,
              machine=machine,