X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/cff8faf5438a6b098050d7b2a29bdae641b0ef72..46b517f360122c3c2d010bb059dd016cdd8a1b26:/code/main.py diff --git a/code/main.py b/code/main.py index ec14236..646f7d0 100755 --- a/code/main.py +++ b/code/main.py @@ -6,7 +6,6 @@ import cPickle import cgi import datetime import hmac -import os import sha import simplejson import sys @@ -18,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() @@ -31,7 +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') @@ -119,10 +117,14 @@ 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) +def 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]) + send_error_mail('xvm error on %s for %s: %s' % (op, username, err), + details) + d['details'] = details return templates.error(searchList=[d]) def invalidInput(op, username, fields, err, emsg): @@ -262,7 +264,7 @@ 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'), authtoken=token) return templates.vnc(searchList=[d]) @@ -340,7 +342,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: @@ -378,7 +380,7 @@ def modifyDict(username, state, fields): machine.owner = validate.owner update_acl = True if hasattr(validate, 'name'): - machine.name = name + machine.name = validate.name if hasattr(validate, 'admin') and validate.admin != machine.administrator: machine.administrator = validate.admin update_acl = True @@ -412,7 +414,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(): @@ -580,6 +582,10 @@ def unauthFront(_, _2, fields): """Information for unauth'd users.""" return templates.unauth(searchList=[{'simple' : True}]) +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, @@ -587,7 +593,8 @@ mapping = dict(list=listVms, info=info, create=create, help=helpHandler, - unauth=unauthFront) + unauth=unauthFront, + errortest=throwError) def printHeaders(headers): """Print a dictionary as HTTP headers.""" @@ -595,6 +602,20 @@ 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 getUser(environ): """Return the current user based on the SSL environment variables""" @@ -612,14 +633,15 @@ class App: self.username = getUser(environ) self.state = State(self.username) + self.state.environ = environ def __iter__(self): + 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', - os.environ['SCRIPT_NAME']+'/')]) + self.environ['SCRIPT_NAME']+'/')]) return if self.username is None: operation = 'unauth' @@ -655,27 +677,22 @@ 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)) 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 = 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))