X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/cabbf7ab8e35de060f6f4e3f75670558ad25d9b5..d7764c68cddf71645439f295c31532e528231051:/code/main.py?ds=sidebyside diff --git a/code/main.py b/code/main.py index 073f81d..e4727a8 100755 --- a/code/main.py +++ b/code/main.py @@ -6,7 +6,7 @@ import cPickle import cgi import datetime import hmac -import os +import random import sha import simplejson import sys @@ -18,7 +18,7 @@ def revertStandardError(): """Move stderr to stdout, and return the contents of the old stderr.""" errio = sys.stderr if not isinstance(errio, StringIO): - return None + return '' sys.stderr = sys.stdout errio.seek(0) return errio.read() @@ -31,18 +31,25 @@ def printError(): if __name__ == '__main__': import atexit atexit.register(printError) - sys.stderr = StringIO() - -sys.path.append('/home/ecprice/.local/lib/python2.5/site-packages') 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 InvalidInput, CodeError, 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 + +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): @@ -77,7 +84,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 @@ -105,6 +113,7 @@ class Defaults: cdrom = '' autoinstall = '' name = '' + description = '' type = 'linux-hvm' def __init__(self, max_memory=None, max_disk=None, **kws): @@ -119,12 +128,6 @@ class Defaults: DEFAULT_HEADERS = {'Content-Type': 'text/html'} -def error(op, username, fields, err, emsg): - """Print an error page when a CodeError occurs""" - d = dict(op=op, user=username, errorMessage=str(err), - stderr=emsg) - return templates.error(searchList=[d]) - def invalidInput(op, username, fields, err, emsg): """Print an error page when an InvalidInput exception occurs""" d = dict(op=op, user=username, err_field=err.err_field, @@ -143,24 +146,24 @@ def hasVnc(status): return False def parseCreate(username, state, fields): - kws = dict([(kw, fields.getfirst(kw)) for kw in 'name owner memory disksize vmtype cdrom clone_from'.split()]) - validate = validation.Validate(username, state, **kws) - return dict(contact=username, name=validate.name, memory=validate.memory, + kws = dict([(kw, fields.getfirst(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split()]) + validate = validation.Validate(username, state, strict=True, **kws) + return dict(contact=username, name=validate.name, description=validate.description, memory=validate.memory, disksize=validate.disksize, owner=validate.owner, machine_type=validate.vmtype, cdrom=getattr(validate, 'cdrom', None), - clone_from=getattr(validate, 'clone_from', 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) - machine = controls.createVm(username, **parsed_fields) + machine = controls.createVm(username, state, **parsed_fields) except InvalidInput, err: pass else: err = None state.clear() #Changed global state - d = getListDict(username) + d = getListDict(username, state) d['err'] = err if err: for field in fields.keys(): @@ -213,14 +216,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 @@ -254,6 +257,11 @@ def vnc(username, state, 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) @@ -262,7 +270,8 @@ def vnc(username, state, fields): on=status, has_vnc=has_vnc, machine=machine, - hostname=os.environ.get('SERVER_NAME', 'localhost'), + hostname=state.environ.get('SERVER_NAME', 'localhost'), + port=port, authtoken=token) return templates.vnc(searchList=[d]) @@ -274,7 +283,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 @@ -317,7 +326,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: @@ -335,13 +344,13 @@ def command(username, state, fields): return templates.command(searchList=[d]) if back == 'list': state.clear() #Changed global state - d = getListDict(username) + d = getListDict(username, state) d['result'] = result return templates.list(searchList=[d]) elif back == 'info': machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine - return ({'Status': '302', - 'Location': '/info?machine_id=%d' % machine.machine_id}, + return ({'Status': '303 See Other', + 'Location': 'info?machine_id=%d' % machine.machine_id}, "You shouldn't see this message.") else: raise InvalidInput('back', back, 'Not a known back page.') @@ -352,12 +361,11 @@ 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 memory vmtype disksize'.split()]) + 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) machine = validate.machine - print >> sys.stderr, machine, machine.administrator, kws['admin'] oldname = machine.name if hasattr(validate, 'memory'): @@ -372,27 +380,29 @@ 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: machine.owner = validate.owner update_acl = True if hasattr(validate, 'name'): - machine.name = name + machine.name = validate.name + if hasattr(validate, 'description'): + machine.description = validate.description if hasattr(validate, 'admin') and validate.admin != machine.administrator: machine.administrator = validate.admin update_acl = True 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])) @@ -402,7 +412,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) @@ -413,7 +423,7 @@ def modify(username, state, fields): machine = modify_dict['machine'] result = 'Success!' err = None - info_dict = infoDict(username, machine) + info_dict = infoDict(username, state, machine) info_dict['err'] = err if err: for field in fields.keys(): @@ -422,7 +432,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') @@ -430,8 +440,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 @@ -459,6 +469,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).
%s' % cgi.escape(checkpoint) - except Exception, err: - if not fields.has_key('js'): - if isinstance(err, CodeError): - print 'Content-Type: text/html\n' - e = revertStandardError() - print error(operation, state.username, fields, err, e) - sys.exit(1) - if isinstance(err, InvalidInput): - print 'Content-Type: text/html\n' - e = revertStandardError() - print invalidInput(operation, state.username, fields, err, e) - sys.exit(1) - print 'Content-Type: text/plain\n' - print 'Uh-oh! We experienced an error.' - print 'Please email xvm-dev@mit.edu with the contents of this page.' - print '----' - e = revertStandardError() - print e - print '----' - raise - -if __name__ == '__main__': - fields = cgi.FieldStorage() + yield '
%s' % cgi.escape(str(checkpoint)) - if fields.has_key('sqldebug'): - import logging - logging.basicConfig() - logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO) - logging.getLogger('sqlalchemy.orm.unitofwork').setLevel(logging.INFO) +def constructor(): + connect() + return App - username = getUser(os.environ) - state.username = username - operation = os.environ.get('PATH_INFO', '') - if not operation: - print "Status: 301 Moved Permanently" - print 'Location: ' + os.environ['SCRIPT_NAME']+'/\n' - sys.exit(0) - if username is None: - operation = 'unauth' - if operation.startswith('/'): - operation = operation[1:] - if not operation: - operation = 'list' +def main(): + from flup.server.fcgi_fork import WSGIServer + WSGIServer(constructor()).run() - if os.getenv("SIPB_XEN_PROFILE"): - import profile - profile.run('main(operation, username, state, fields)', 'log-'+operation) - else: - main(operation, username, state, fields) +if __name__ == '__main__': + main()