X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/2679b6ea15e3cec298488a17ad845d0d5064beb2..daa95318e6cee597593b33f77a99cd224c8be893:/code/main.py diff --git a/code/main.py b/code/main.py index 80761ae..2740a74 100755 --- a/code/main.py +++ b/code/main.py @@ -31,8 +31,6 @@ if __name__ == '__main__': import atexit atexit.register(printError) -sys.path.append('/home/ecprice/.local/lib/python2.5/site-packages') - import templates from Cheetah.Template import Template import sipb_xen_database @@ -41,6 +39,15 @@ import validation import cache_acls from webcommon import InvalidInput, CodeError, State import controls +from getafsgroups import getAfsGroupMembers + +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): @@ -136,14 +143,14 @@ def hasVnc(status): return False def parseCreate(username, state, fields): - kws = dict([(kw, fields.getfirst(kw)) for kw in 'name description owner memory disksize vmtype cdrom clone_from'.split()]) + 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) @@ -206,14 +213,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 @@ -310,7 +317,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: @@ -396,7 +403,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) @@ -416,7 +423,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') @@ -467,7 +474,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.') @@ -566,18 +573,25 @@ 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 overlord(username, state, path, fields): + if not username in getAfsGroupMembers('system:xvm', 'athena.mit.edu'): + raise InvalidInput('username', username, 'Not an overlord.') + newstate = State(username, overlord=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") @@ -589,6 +603,7 @@ mapping = dict(list=listVms, create=create, help=helpHandler, unauth=unauthFront, + overlord=overlord, errortest=throwError) def printHeaders(headers): @@ -617,19 +632,23 @@ 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]) - send_error_mail('xvm error on %s for %s: %s' % (op, username, err), - details) + if username not in ('price', 'ecprice', 'andersk'): #add yourself at will + send_error_mail('xvm error on %s for %s: %s' % (op, username, err), + details) d['details'] = details return templates.error(searchList=[d]) def getUser(environ): """Return the current user based on the SSL environment variables""" - email = environ.get('SSL_CLIENT_S_DN_Email', None) - if email is None: - return None - if not email.endswith('@MIT.EDU'): - return None - return email[:-8] + 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): @@ -641,6 +660,8 @@ class App: self.state.environ = environ def __iter__(self): + start_time = time.time() + sipb_xen_database.clear_cache() sys.stderr = StringIO() fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ) operation = self.environ.get('PATH_INFO', '') @@ -650,17 +671,10 @@ class App: 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)