import cgi
import datetime
import hmac
-import os
import sha
import simplejson
import sys
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])
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:
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
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():
"""Information for unauth'd users."""
return templates.unauth(searchList=[{'simple' : True}])
+def throwError(_, __, ___):
+ """Throw an error, to test the error-tracing mechanisms."""
+ raise RuntimeError("This is a test of the emergency broadcast system.")
+
mapping = dict(list=listVms,
vnc=vnc,
command=command,
info=info,
create=create,
help=helpHandler,
- unauth=unauthFront)
+ unauth=unauthFront,
+ errortest=throwError)
def printHeaders(headers):
"""Print a dictionary as HTTP 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"""
self.username = getUser(environ)
self.state = State(self.username)
+ self.state.environ = environ
def __iter__(self):
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',
- os.environ['SCRIPT_NAME']+'/')])
+ self.environ['SCRIPT_NAME']+'/')])
return
if self.username is None:
operation = 'unauth'
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.'
+ send_error_mail('xvm error: %s' % (err,),
+ '%s\n' % (traceback.format_exc(),))
+ yield '''Uh-oh! We experienced an error.
+Sorry about that. We've gotten mail about it.
+
+Feel free to poke us at xvm@mit.edu if this bug is
+consistently biting you and we don't seem to be fixing it.
+
+In case you're curious, the gory details are here.
----
%s
----
%s
----''' % (str(err), traceback.format_exc())
- self.start('200 OK', headers.items())
+ status = headers.setdefault('Status', '200 OK')
+ del headers['Status']
+ self.start(status, headers.items())
yield output_string
if fields.has_key('timedebug'):
yield '<pre>%s</pre>' % cgi.escape(str(checkpoint))