X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/a67a5a723afbe322f9727c7e1d83072b59a93299..7ab93691b4b6a45e99f78b37796413c5f24629a4:/code/main.py

diff --git a/code/main.py b/code/main.py
index 7513973..8506ee5 100755
--- a/code/main.py
+++ b/code/main.py
@@ -6,12 +6,12 @@ import cPickle
 import cgi
 import datetime
 import hmac
+import random
 import sha
 import simplejson
 import sys
 import time
 import urllib
-import random
 from StringIO import StringIO
 
 def revertStandardError():
@@ -34,13 +34,14 @@ if __name__ == '__main__':
 
 import templates
 from Cheetah.Template import Template
-import sipb_xen_database
-from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
 import validation
 import cache_acls
 from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers
+import sipb_xen_database as database
+from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
+from invirt.config import structs as config
 
 def pathSplit(path):
     if path.startswith('/'):
@@ -83,7 +84,7 @@ def makeErrorPre(old, addition):
     else:
         return '<p>STDERR:</p><pre>' + str(addition) + '</pre>'
 
-Template.sipb_xen_database = sipb_xen_database
+Template.database = database
 Template.helppopup = staticmethod(helppopup)
 Template.err = None
 
@@ -255,6 +256,11 @@ def vnc(username, state, path, fields):
     token = {'data': pickled_data, 'digest': m.digest()}
     token = cPickle.dumps(token)
     token = base64.urlsafe_b64encode(token)
+    host = controls.listHost(machine)
+    if host:
+        port = 10003 + [h.hostname for h in config.hosts].index(host)
+    else:
+        port = 5900 # dummy
 
     status = controls.statusInfo(machine)
     has_vnc = hasVnc(status)
@@ -264,6 +270,7 @@ def vnc(username, state, path, fields):
              has_vnc=has_vnc,
              machine=machine,
              hostname=state.environ.get('SERVER_NAME', 'localhost'),
+             port=port,
              authtoken=token)
     return templates.vnc(searchList=[d])
 
@@ -275,7 +282,7 @@ def getHostname(nic):
     if nic.hostname and '.' in nic.hostname:
         return nic.hostname
     elif nic.machine:
-        return nic.machine.name + '.xvm.mit.edu'
+        return nic.machine.name + '.' + config.dns.domains[0]
     else:
         return None
 
@@ -432,8 +439,8 @@ def helpHandler(username, state, path, fields):
     help_mapping = {'ParaVM Console': """
 ParaVM machines do not support local console access over VNC.  To
 access the serial console of these machines, you can SSH with Kerberos
-to console.xvm.mit.edu, using the name of the machine as your
-username.""",
+to console.%s, using the name of the machine as your
+username.""" % config.dns.domains[0],
                     'HVM/ParaVM': """
 HVM machines use the virtualization features of the processor, while
 ParaVM machines use Xen's emulation of virtualization features.  You
@@ -491,6 +498,7 @@ def infoDict(username, state, machine):
         cputime = None
     else:
         main_status = dict(status[1:])
+        main_status['host'] = controls.listHost(machine)
         start_time = float(main_status.get('start_time', 0))
         uptime = datetime.timedelta(seconds=int(time.time()-start_time))
         cpu_time_float = float(main_status.get('cpu_time', 0))
@@ -507,6 +515,7 @@ def infoDict(username, state, machine):
                       'NIC_INFO',
                       ('uptime', 'uptime'),
                       ('cputime', 'CPU usage'),
+                      ('host', 'Hosted on'),
                       ('memory', 'RAM'),
                       'DISK_INFO',
                       ('state', 'state (xen format)'),
@@ -620,13 +629,13 @@ def printHeaders(headers):
 def send_error_mail(subject, body):
     import subprocess
 
-    to = 'xvm@mit.edu'
+    to = config.web.errormail
     mail = """To: %s
-From: root@xvm.mit.edu
+From: root@%s
 Subject: %s
 
 %s
-""" % (to, subject, body)
+""" % (to, config.web.hostname, subject, body)
     p = subprocess.Popen(['/usr/sbin/sendmail', to], stdin=subprocess.PIPE)
     p.stdin.write(mail)
     p.stdin.close()
@@ -668,7 +677,7 @@ class App:
 
     def __iter__(self):
         start_time = time.time()
-        sipb_xen_database.clear_cache()
+        database.clear_cache()
         sys.stderr = StringIO()
         fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ)
         operation = self.environ.get('PATH_INFO', '')
@@ -689,14 +698,12 @@ class App:
                 headers.update(new_headers)
             e = revertStandardError()
             if e:
-                if isinstance(output, basestring):
-                    sys.stderr = StringIO()
-                    x = str(output)
-                    print >> sys.stderr, x
-                    print >> sys.stderr, 'XXX'
-                    print >> sys.stderr, e
-                    raise Exception()
-                output.addError(e)
+                if hasattr(output, 'addError'):
+                    output.addError(e)
+                else:
+                    # This only happens on redirects, so it'd be a pain to get
+                    # the message to the user.  Maybe in the response is useful.
+                    output = output + '\n\nstderr:\n' + e
             output_string =  str(output)
             checkpoint.checkpoint('output as a string')
         except Exception, err:
@@ -723,7 +730,7 @@ class App:
             yield '<pre>%s</pre>' % cgi.escape(str(checkpoint))
 
 def constructor():
-    connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+    connect()
     return App
 
 def main():