X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/d39b6ed13b5ba567d18a4bd0e9a3dfe67b3cc4ec..daa95318e6cee597593b33f77a99cd224c8be893:/code/main.py diff --git a/code/main.py b/code/main.py index 29b46db..2740a74 100755 --- a/code/main.py +++ b/code/main.py @@ -17,7 +17,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() @@ -30,9 +30,6 @@ 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 @@ -42,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): @@ -104,6 +110,7 @@ class Defaults: cdrom = '' autoinstall = '' name = '' + description = '' type = 'linux-hvm' def __init__(self, max_memory=None, max_disk=None, **kws): @@ -118,12 +125,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, @@ -142,14 +143,14 @@ 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()]) + 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, memory=validate.memory, + 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) @@ -212,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 @@ -316,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: @@ -339,7 +340,7 @@ def command(username, state, fields): return templates.list(searchList=[d]) elif back == 'info': machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine - return ({'Status': '302', + return ({'Status': '303 See Other', 'Location': '/info?machine_id=%d' % machine.machine_id}, "You shouldn't see this message.") else: @@ -353,7 +354,7 @@ def modifyDict(username, state, fields): olddisk = {} transaction = ctx.current.create_transaction() 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 oldname = machine.name @@ -378,6 +379,8 @@ def modifyDict(username, state, fields): update_acl = True if hasattr(validate, '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 @@ -400,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) @@ -420,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') @@ -471,9 +474,9 @@ 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.""" - raise CodeError("Unknown operation") + return ({'Status': '404 Not Found'}, 'Invalid operation.') def infoDict(username, state, machine): """Get the variables used by info.tmpl.""" @@ -495,6 +498,7 @@ def infoDict(username, state, machine): display_fields = """name uptime memory state cpu_weight on_reboot on_poweroff on_crash on_xend_start on_xend_stop bootloader""".split() display_fields = [('name', 'Name'), + ('description', 'Description'), ('owner', 'Owner'), ('administrator', 'Administrator'), ('contact', 'Contact'), @@ -516,6 +520,7 @@ def infoDict(username, state, machine): fields = [] machine_info = {} machine_info['name'] = machine.name + machine_info['description'] = machine.description machine_info['type'] = machine.type.hvm and 'HVM' or 'ParaVM' machine_info['owner'] = machine.owner machine_info['administrator'] = machine.administrator @@ -550,7 +555,7 @@ def infoDict(username, state, machine): checkpoint.checkpoint('Got mem') max_disk = validation.maxDisk(machine.owner, machine) defaults = Defaults() - for name in 'machine_id name administrator owner memory contact'.split(): + for name in 'machine_id name description administrator owner memory contact'.split(): setattr(defaults, name, getattr(machine, name)) defaults.type = machine.type.type_id defaults.disk = "%0.2f" % (machine.disks[0].size/1024.) @@ -568,17 +573,28 @@ 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 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") + mapping = dict(list=listVms, vnc=vnc, command=command, @@ -586,7 +602,9 @@ mapping = dict(list=listVms, info=info, create=create, help=helpHandler, - unauth=unauthFront) + unauth=unauthFront, + overlord=overlord, + errortest=throwError) def printHeaders(headers): """Print a dictionary as HTTP headers.""" @@ -594,15 +612,43 @@ def printHeaders(headers): print '%s: %s' % (key, value) print +def send_error_mail(subject, body): + import subprocess + + to = 'xvm@mit.edu' + mail = """To: %s +From: root@xvm.mit.edu +Subject: %s + +%s +""" % (to, subject, body) + p = subprocess.Popen(['/usr/sbin/sendmail', to], stdin=subprocess.PIPE) + p.stdin.write(mail) + p.stdin.close() + p.wait() + +def show_error(op, username, fields, err, emsg, traceback): + """Print an error page when an exception occurs""" + 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 + 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): @@ -614,8 +660,10 @@ 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) - print >> sys.stderr, fields operation = self.environ.get('PATH_INFO', '') if not operation: self.start("301 Moved Permanently", [('Location', @@ -623,24 +671,16 @@ 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) if isinstance(output, tuple): new_headers, output = output headers.update(new_headers) - print 'MOO2' e = revertStandardError() if e: if isinstance(output, basestring): @@ -655,27 +695,23 @@ class App: checkpoint.checkpoint('output as a string') except Exception, err: if not fields.has_key('js'): - if isinstance(err, CodeError): - self.start('500 Internal Server Error', [('Content-Type', 'text/html')]) - e = revertStandardError() - s = error(operation, self.username, fields, err, e) - yield str(s) - return if isinstance(err, InvalidInput): self.start('200 OK', [('Content-Type', 'text/html')]) e = revertStandardError() - yield str(invalidInput(operation, self.username, fields, err, e)) + yield str(invalidInput(operation, self.username, fields, + err, e)) return - self.start('500 Internal Server Error', [('Content-Type', 'text/plain')]) import traceback - yield '''Uh-oh! We experienced an error.' -Please email xvm-dev@mit.edu with the contents of this page.' ----- -%s ----- -%s -----''' % (str(err), traceback.format_exc()) - self.start('200 OK', headers.items()) + self.start('500 Internal Server Error', + [('Content-Type', 'text/html')]) + e = revertStandardError() + s = show_error(operation, self.username, fields, + err, e, traceback.format_exc()) + yield str(s) + return + status = headers.setdefault('Status', '200 OK') + del headers['Status'] + self.start(status, headers.items()) yield output_string if fields.has_key('timedebug'): yield '
%s
' % cgi.escape(str(checkpoint))