X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/2125e869604558b82c61dfc788400a9a29fcc791..88448d9221a686ce71cb0f465888d84a1a6ece19:/code/main.py
diff --git a/code/main.py b/code/main.py
index 91ce41f..70e8912 100755
--- a/code/main.py
+++ b/code/main.py
@@ -6,6 +6,7 @@ import cPickle
import cgi
import datetime
import hmac
+import random
import sha
import simplejson
import sys
@@ -33,12 +34,23 @@ 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
+from webcommon import State
import controls
+from getafsgroups import getAfsGroupMembers
+from invirt import database
+from invirt.database import Machine, CDROM, session, connect, MachineAccess, Type, Autoinstall
+from invirt.config import structs as config
+from invirt.common import InvalidInput, CodeError
+
+def pathSplit(path):
+ if path.startswith('/'):
+ path = path[1:]
+ i = path.find('/')
+ if i == -1:
+ i = len(path)
+ return path[:i], path[i:]
class Checkpoint:
def __init__(self):
@@ -73,7 +85,8 @@ def makeErrorPre(old, addition):
else:
return 'STDERR:
' + str(addition) + '
'
-Template.sipb_xen_database = sipb_xen_database
+Template.database = database
+Template.config = config
Template.helppopup = staticmethod(helppopup)
Template.err = None
@@ -141,7 +154,7 @@ def parseCreate(username, state, fields):
cdrom=getattr(validate, 'cdrom', None),
autoinstall=getattr(validate, 'autoinstall', None))
-def create(username, state, fields):
+def create(username, state, path, fields):
"""Handler for create requests."""
try:
parsed_fields = parseCreate(username, state, fields)
@@ -204,14 +217,14 @@ def getListDict(username, state):
can_clone=can_clone)
return d
-def listVms(username, state, fields):
+def listVms(username, state, path, fields):
"""Handler for list requests."""
checkpoint.checkpoint('Getting list dict')
d = getListDict(username, state)
checkpoint.checkpoint('Got list dict')
return templates.list(searchList=[d])
-def vnc(username, state, fields):
+def vnc(username, state, path, fields):
"""VNC applet page.
Note that due to same-domain restrictions, the applet connects to
@@ -233,18 +246,12 @@ def vnc(username, state, fields):
"""
machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
- TOKEN_KEY = "0M6W0U1IXexThi5idy8mnkqPKEq1LtEnlK/pZSn0cDrN"
-
- data = {}
- data["user"] = username
- data["machine"] = machine.name
- data["expires"] = time.time()+(5*60)
- pickled_data = cPickle.dumps(data)
- m = hmac.new(TOKEN_KEY, digestmod=sha)
- m.update(pickled_data)
- token = {'data': pickled_data, 'digest': m.digest()}
- token = cPickle.dumps(token)
- token = base64.urlsafe_b64encode(token)
+ token = controls.vnctoken(machine)
+ 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)
@@ -254,6 +261,7 @@ def vnc(username, state, fields):
has_vnc=has_vnc,
machine=machine,
hostname=state.environ.get('SERVER_NAME', 'localhost'),
+ port=port,
authtoken=token)
return templates.vnc(searchList=[d])
@@ -265,7 +273,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
@@ -308,7 +316,7 @@ def getDiskInfo(data_dict, machine):
data_dict['%s_size' % name] = "%0.1f GiB" % (disk.size / 1024.)
return disk_fields
-def command(username, state, fields):
+def command(username, state, path, fields):
"""Handler for running commands like boot and delete on a VM."""
back = fields.getfirst('back')
try:
@@ -332,7 +340,7 @@ def command(username, state, fields):
elif back == 'info':
machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
return ({'Status': '303 See Other',
- 'Location': '/info?machine_id=%d' % machine.machine_id},
+ 'Location': 'info?machine_id=%d' % machine.machine_id},
"You shouldn't see this message.")
else:
raise InvalidInput('back', back, 'Not a known back page.')
@@ -343,7 +351,7 @@ def modifyDict(username, state, fields):
Return a list of local variables for modify.tmpl.
"""
olddisk = {}
- transaction = ctx.current.create_transaction()
+ session.begin()
try:
kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name description memory vmtype disksize'.split()])
validate = validation.Validate(username, state, **kws)
@@ -362,7 +370,7 @@ def modifyDict(username, state, fields):
if disk.size != disksize:
olddisk[disk.guest_device_name] = disksize
disk.size = disksize
- ctx.current.save(disk)
+ session.save_or_update(disk)
update_acl = False
if hasattr(validate, 'owner') and validate.owner != machine.owner:
@@ -378,13 +386,13 @@ def modifyDict(username, state, fields):
if hasattr(validate, 'contact'):
machine.contact = validate.contact
- ctx.current.save(machine)
+ session.save_or_update(machine)
if update_acl:
print >> sys.stderr, machine, machine.administrator
cache_acls.refreshMachine(machine)
- transaction.commit()
+ session.commit()
except:
- transaction.rollback()
+ session.rollback()
raise
for diskname in olddisk:
controls.resizeDisk(oldname, diskname, str(olddisk[diskname]))
@@ -394,7 +402,7 @@ def modifyDict(username, state, fields):
command="modify",
machine=machine)
-def modify(username, state, fields):
+def modify(username, state, path, fields):
"""Handler for modifying attributes of a machine."""
try:
modify_dict = modifyDict(username, state, fields)
@@ -414,7 +422,7 @@ def modify(username, state, fields):
return templates.info(searchList=[info_dict])
-def helpHandler(username, state, fields):
+def helpHandler(username, state, path, fields):
"""Handler for help messages."""
simple = fields.getfirst('simple')
subjects = fields.getlist('subject')
@@ -422,8 +430,8 @@ def helpHandler(username, state, 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
@@ -451,6 +459,10 @@ active machines.""",
setting fb=false to disable the framebuffer. If you don't,
your machine will run just fine, but the applet's display of the
console will suffer artifacts.
+""",
+ 'Windows': """
+Windows Vista: The Vista image is licensed for all MIT students and will automatically activate off the network; see the licensing confirmation e-mail for details. The installer req uires 512 MB RAM and at least 7.5 GB disk space (15 GB or more recommended).
+Windows XP: This is the volume license CD image. You will need your own volume license key to complete the install. We do not have these available for the general MIT community; ask your department if they have one.
"""
}
@@ -465,7 +477,7 @@ console will suffer artifacts.
return templates.help(searchList=[d])
-def badOperation(u, s, e):
+def badOperation(u, s, p, e):
"""Function called when accessing an unknown URI."""
return ({'Status': '404 Not Found'}, 'Invalid operation.')
@@ -481,6 +493,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))
@@ -497,6 +510,7 @@ def infoDict(username, state, machine):
'NIC_INFO',
('uptime', 'uptime'),
('cputime', 'CPU usage'),
+ ('host', 'Hosted on'),
('memory', 'RAM'),
'DISK_INFO',
('state', 'state (xen format)'),
@@ -564,18 +578,30 @@ def infoDict(username, state, machine):
fields = fields)
return d
-def info(username, state, fields):
+def info(username, state, path, fields):
"""Handler for info on a single VM."""
machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
d = infoDict(username, state, machine)
checkpoint.checkpoint('Got infodict')
return templates.info(searchList=[d])
-def unauthFront(_, _2, fields):
+def unauthFront(_, _2, _3, fields):
"""Information for unauth'd users."""
return templates.unauth(searchList=[{'simple' : True}])
-def throwError(_, __, ___):
+def admin(username, state, path, fields):
+ if path == '':
+ return ({'Status': '303 See Other',
+ 'Location': 'admin/'},
+ "You shouldn't see this message.")
+ if not username in getAfsGroupMembers(config.web.adminacl, 'athena.mit.edu'):
+ raise InvalidInput('username', username,
+ 'Not in admin group %s.' % config.web.adminacl)
+ newstate = State(username, isadmin=True)
+ newstate.environ = state.environ
+ return handler(username, newstate, path, fields)
+
+def throwError(_, __, ___, ____):
"""Throw an error, to test the error-tracing mechanisms."""
raise RuntimeError("test of the emergency broadcast system")
@@ -587,6 +613,8 @@ mapping = dict(list=listVms,
create=create,
help=helpHandler,
unauth=unauthFront,
+ admin=admin,
+ overlord=admin,
errortest=throwError)
def printHeaders(headers):
@@ -598,13 +626,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()
@@ -615,7 +643,8 @@ def show_error(op, username, fields, err, emsg, traceback):
d = dict(op=op, user=username, fields=fields,
errorMessage=str(err), stderr=emsg, traceback=traceback)
details = templates.error_raw(searchList=[d])
- if username not in ('price', 'ecprice', 'andersk'): #add yourself at will
+ exclude = config.web.errormail_exclude
+ if username not in exclude and '*' not in exclude:
send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
details)
d['details'] = details
@@ -625,6 +654,14 @@ def getUser(environ):
"""Return the current user based on the SSL environment variables"""
return environ.get('REMOTE_USER', None)
+def handler(username, state, path, fields):
+ operation, path = pathSplit(path)
+ if not operation:
+ operation = 'list'
+ print 'Starting', operation
+ fun = mapping.get(operation, badOperation)
+ return fun(username, state, path, fields)
+
class App:
def __init__(self, environ, start_response):
self.environ = environ
@@ -634,28 +671,23 @@ class App:
self.state = State(self.username)
self.state.environ = environ
+ random.seed() #sigh
+
def __iter__(self):
- sipb_xen_database.clear_cache()
+ start_time = time.time()
+ database.clear_cache()
sys.stderr = StringIO()
fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ)
operation = self.environ.get('PATH_INFO', '')
if not operation:
- self.start("301 Moved Permanently", [('Location',
- self.environ['SCRIPT_NAME']+'/')])
+ self.start("301 Moved Permanently", [('Location', './')])
return
if self.username is None:
operation = 'unauth'
- if operation.startswith('/'):
- operation = operation[1:]
- if not operation:
- operation = 'list'
- print 'Starting', operation
- start_time = time.time()
- fun = mapping.get(operation, badOperation)
try:
checkpoint.checkpoint('Before')
- output = fun(self.username, self.state, fields)
+ output = handler(self.username, self.state, operation, fields)
checkpoint.checkpoint('After')
headers = dict(DEFAULT_HEADERS)
@@ -664,14 +696,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:
@@ -698,7 +728,7 @@ class App:
yield '%s
' % cgi.escape(str(checkpoint))
def constructor():
- connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+ connect()
return App
def main():