Under the covers, the autoinstaller uses our own patched version of +xen-create-image, which is a tool based on debootstrap. If you log +into the serial console while the install is running, you can watch +it. +""", + '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 %s, using the name of the machine as your +username.""" % config.console.hostname, + 'HVM/ParaVM': """ +HVM machines use the virtualization features of the processor, while +ParaVM machines rely on a modified kernel to communicate directly with +the hypervisor. HVMs support boot CDs of any operating system, and +the VNC console applet. The three-minute autoinstaller produces +ParaVMs. ParaVMs typically are more efficient, and always support the +console server.
+ +More details are on the +wiki, including steps to prepare an HVM guest to boot as a ParaVM +(which you can skip by using the autoinstaller to begin with.)
+ +We recommend using a ParaVM when possible and an HVM when necessary.
+""",
+ 'CPU Weight': """
+Don't ask us! We're as mystified as you are.""",
+ 'Owner': """
+The owner field is used to determine quotas. It must be the name of a
+locker that you are an AFS administrator of. In particular, you or an
+AFS group you are a member of must have AFS rlidwka bits on the
+locker. You can check who administers the LOCKER locker using the
+commands 'attach LOCKER; fs la /mit/LOCKER' on Athena.) See also administrator.""",
+ 'Administrator': """
+The administrator field determines who can access the console and
+power on and off the machine. This can be either a user or a moira
+group.""",
+ 'Quotas': """
+Quotas are determined on a per-locker basis. Each locker may have a
+maximum of 512 mebibytes of active ram, 50 gibibytes of disk, and 4
+active machines.""",
+ 'Console': """
+Framebuffer: At a Linux boot prompt in your VM, try
+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 requires 512 MiB RAM and at least 7.5 GiB disk space (15 GiB or more recommended).
+Windows XP: This is the volume license CD image. You will need your own volume license key to complete the install. We do not have these available for the general MIT community; ask your department if they have one, or visit http://msca.mit.edu/ if you are staff/faculty to request one.
+"""
+ }
+
+ if not subject:
+ subject = sorted(help_mapping.keys())
+ if not isinstance(subject, list):
+ subject = [subject]
+
+ return dict(simple=simple,
+ subjects=subject,
+ mapping=help_mapping)
+ help._cp_config['tools.require_login.on'] = False
+
+ def parseCreate(self, fields):
+ kws = dict([(kw, fields.get(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split() if fields.get(kw)])
+ validate = validation.Validate(cherrypy.request.login, cherrypy.request.state, strict=True, **kws)
+ return dict(contact=cherrypy.request.login, name=validate.name, description=validate.description, memory=validate.memory,
+ disksize=validate.disksize, owner=validate.owner, machine_type=getattr(validate, 'vmtype', Defaults.type),
+ cdrom=getattr(validate, 'cdrom', None),
+ autoinstall=getattr(validate, 'autoinstall', None))
+
+ @cherrypy.expose
+ @cherrypy.tools.mako(filename="/list.mako")
+ @cherrypy.tools.require_POST()
+ def create(self, **fields):
+ """Handler for create requests."""
+ try:
+ parsed_fields = self.parseCreate(fields)
+ machine = controls.createVm(cherrypy.request.login, cherrypy.request.state, **parsed_fields)
+ except InvalidInput, err:
+ pass
+ else:
+ err = None
+ cherrypy.request.state.clear() #Changed global state
+ d = getListDict(cherrypy.request.login, cherrypy.request.state)
+ d['err'] = err
+ if err:
+ for field in fields.keys():
+ setattr(d['defaults'], field, fields.get(field))
+ else:
+ d['new_machine'] = parsed_fields['name']
+ return d
+
+ @cherrypy.expose
+ @cherrypy.tools.mako(filename="/helloworld.mako")
+ def helloworld(self, **kwargs):
+ return {'request': cherrypy.request, 'kwargs': kwargs}
+ helloworld._cp_config['tools.require_login.on'] = False
+
+ @cherrypy.expose
+ def errortest(self):
+ """Throw an error, to test the error-tracing mechanisms."""
+ raise RuntimeError("test of the emergency broadcast system")
+
+ class MachineView(View):
+ # This is hairy. Fix when CherryPy 3.2 is out. (rename to
+ # _cp_dispatch, and parse the argument as a list instead of
+ # string
+
+ def __getattr__(self, name):
+ try:
+ machine_id = int(name)
+ cherrypy.request.params['machine_id'] = machine_id
+ return self
+ except ValueError:
+ return None
+
+ @cherrypy.expose
+ @cherrypy.tools.mako(filename="/info.mako")
+ def info(self, machine_id):
+ """Handler for info on a single VM."""
+ machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
+ d = infoDict(cherrypy.request.login, cherrypy.request.state, machine)
+ checkpoint.checkpoint('Got infodict')
+ return d
+ index = info
+
+ @cherrypy.expose
+ @cherrypy.tools.mako(filename="/vnc.mako")
+ def vnc(self, machine_id):
+ """VNC applet page.
+
+ Note that due to same-domain restrictions, the applet connects to
+ the webserver, which needs to forward those requests to the xen
+ server. The Xen server runs another proxy that (1) authenticates
+ and (2) finds the correct port for the VM.
+
+ You might want iptables like:
+
+ -t nat -A PREROUTING -s ! 18.181.0.60 -i eth1 -p tcp -m tcp \
+ --dport 10003 -j DNAT --to-destination 18.181.0.60:10003
+ -t nat -A POSTROUTING -d 18.181.0.60 -o eth1 -p tcp -m tcp \
+ --dport 10003 -j SNAT --to-source 18.187.7.142
+ -A FORWARD -d 18.181.0.60 -i eth1 -o eth1 -p tcp -m tcp \
+ --dport 10003 -j ACCEPT
+
+ Remember to enable iptables!
+ echo 1 > /proc/sys/net/ipv4/ip_forward
+ """
+ machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
+
+ token = controls.vnctoken(machine)
+ 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)
+
+ d = dict(on=status,
+ has_vnc=has_vnc,
+ machine=machine,
+ hostname=cherrypy.request.local.name,
+ port=port,
+ authtoken=token)
+ return d
+ @cherrypy.expose
+ @cherrypy.tools.mako(filename="/command.mako")
+ @cherrypy.tools.require_POST()
+ def command(self, command_name, machine_id, **kwargs):
+ """Handler for running commands like boot and delete on a VM."""
+ back = kwargs.get('back', None)
+ try:
+ d = controls.commandResult(cherrypy.request.login, cherrypy.request.state, command_name, machine_id, kwargs)
+ if d['command'] == 'Delete VM':
+ back = 'list'
+ except InvalidInput, err:
+ if not back:
+ raise
+ print >> sys.stderr, err
+ result = err
+ else:
+ result = 'Success!'
+ if not back:
+ return d
+ if back == 'list':
+ cherrypy.request.state.clear() #Changed global state
+ raise cherrypy.InternalRedirect('/list?result=%s' % urllib.quote(result))
+ elif back == 'info':
+ raise cherrypy.HTTPRedirect(cherrypy.request.base + '/machine/%d/' % machine_id, status=303)
+ else:
+ raise InvalidInput('back', back, 'Not a known back page.')
+
+ machine = MachineView()
+
+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):
@@ -57,16 +303,6 @@ class Checkpoint:
checkpoint = Checkpoint()
-def jquote(string):
- return "'" + string.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n') + "'"
-
-def helppopup(subj):
- """Return HTML code for a (?) link to a specified help topic"""
- return ('(?)')
-
def makeErrorPre(old, addition):
if addition is None:
return
@@ -75,8 +311,8 @@ def makeErrorPre(old, addition):
else:
return '
STDERR:
' + str(addition) + '' -Template.sipb_xen_database = sipb_xen_database -Template.helppopup = staticmethod(helppopup) +Template.database = database +Template.config = config Template.err = None class JsonDict: @@ -103,13 +339,14 @@ class Defaults: cdrom = '' autoinstall = '' name = '' + description = '' type = 'linux-hvm' def __init__(self, max_memory=None, max_disk=None, **kws): if max_memory is not None: self.memory = min(self.memory, max_memory) if max_disk is not None: - self.max_disk = min(self.disk, max_disk) + self.disk = min(self.disk, max_disk) for key in kws: setattr(self, key, kws[key]) @@ -117,16 +354,6 @@ class Defaults: DEFAULT_HEADERS = {'Content-Type': 'text/html'} -def error(op, username, fields, err, emsg, traceback): - """Print an error page when a CodeError 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): """Print an error page when an InvalidInput exception occurs""" d = dict(op=op, user=username, err_field=err.err_field, @@ -144,33 +371,6 @@ def hasVnc(status): return 'location' in d 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, strict=True, **kws) - return dict(contact=username, name=validate.name, 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)) - -def create(username, state, fields): - """Handler for create requests.""" - try: - parsed_fields = parseCreate(username, state, fields) - machine = controls.createVm(username, state, **parsed_fields) - except InvalidInput, err: - pass - else: - err = None - state.clear() #Changed global state - d = getListDict(username, state) - d['err'] = err - if err: - for field in fields.keys(): - setattr(d['defaults'], field, fields.getfirst(field)) - else: - d['new_machine'] = parsed_fields['name'] - return templates.list(searchList=[d]) - def getListDict(username, state): """Gets the list of local variables used by list.tmpl.""" @@ -179,9 +379,9 @@ def getListDict(username, state): checkpoint.checkpoint('Got my machines') on = {} has_vnc = {} + installing = {} xmlist = state.xmlist checkpoint.checkpoint('Got uptimes') - can_clone = 'ice3' not in state.xmlist_raw for m in machines: if m not in xmlist: has_vnc[m] = 'Off' @@ -193,14 +393,17 @@ def getListDict(username, state): elif m.type.hvm: has_vnc[m] = "WTF?" else: - has_vnc[m] = "ParaVM"+helppopup("ParaVM Console") + has_vnc[m] = "ParaVM" + if xmlist[m].get('autoinstall'): + installing[m] = True + else: + installing[m] = False max_memory = validation.maxMemory(username, state) max_disk = validation.maxDisk(username) checkpoint.checkpoint('Got max mem/disk') defaults = Defaults(max_memory=max_memory, max_disk=max_disk, - owner=username, - cdrom='gutsy-i386') + owner=username) checkpoint.checkpoint('Got defaults') def sortkey(machine): return (machine.owner != username, machine.owner, machine.name) @@ -212,74 +415,24 @@ def getListDict(username, state): defaults=defaults, machines=machines, has_vnc=has_vnc, - can_clone=can_clone) + installing=installing) return d -def listVms(username, state, 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): - """VNC applet page. - - Note that due to same-domain restrictions, the applet connects to - the webserver, which needs to forward those requests to the xen - server. The Xen server runs another proxy that (1) authenticates - and (2) finds the correct port for the VM. - - You might want iptables like: - - -t nat -A PREROUTING -s ! 18.181.0.60 -i eth1 -p tcp -m tcp \ - --dport 10003 -j DNAT --to-destination 18.181.0.60:10003 - -t nat -A POSTROUTING -d 18.181.0.60 -o eth1 -p tcp -m tcp \ - --dport 10003 -j SNAT --to-source 18.187.7.142 - -A FORWARD -d 18.181.0.60 -i eth1 -o eth1 -p tcp -m tcp \ - --dport 10003 -j ACCEPT - - Remember to enable iptables! - echo 1 > /proc/sys/net/ipv4/ip_forward - """ - machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine - - TOKEN_KEY = "0M6W0U1IXexThi5idy8mnkqPKEq1LtEnlK/pZSn0cDrN" - - data = {} - data["user"] = username - data["machine"] = machine.name - data["expires"] = time.time()+(5*60) - pickled_data = cPickle.dumps(data) - m = hmac.new(TOKEN_KEY, digestmod=sha) - m.update(pickled_data) - token = {'data': pickled_data, 'digest': m.digest()} - token = cPickle.dumps(token) - token = base64.urlsafe_b64encode(token) - - status = controls.statusInfo(machine) - has_vnc = hasVnc(status) - - d = dict(user=username, - on=status, - has_vnc=has_vnc, - machine=machine, - hostname=state.environ.get('SERVER_NAME', 'localhost'), - authtoken=token) - return templates.vnc(searchList=[d]) - def getHostname(nic): """Find the hostname associated with a NIC. XXX this should be merged with the similar logic in DNS and DHCP. """ - if nic.hostname and '.' in nic.hostname: - return nic.hostname + if nic.hostname: + hostname = nic.hostname elif nic.machine: - return nic.machine.name + '.xvm.mit.edu' + hostname = nic.machine.name else: return None - + if '.' in hostname: + return hostname + else: + return hostname + '.' + config.dns.domains[0] def getNicInfo(data_dict, machine): """Helper function for info, get data on nics for a machine. @@ -295,8 +448,7 @@ def getNicInfo(data_dict, machine): nic_fields = [] for i in range(len(machine.nics)): nic_fields.extend([(x % i, y % i) for x, y in nic_fields_template]) - if not i: - data_dict['nic%s_hostname' % i] = getHostname(machine.nics[i]) + data_dict['nic%s_hostname' % i] = getHostname(machine.nics[i]) data_dict['nic%s_mac' % i] = machine.nics[i].mac_addr data_dict['nic%s_ip' % i] = machine.nics[i].ip if len(machine.nics) == 1: @@ -319,44 +471,15 @@ def getDiskInfo(data_dict, machine): data_dict['%s_size' % name] = "%0.1f GiB" % (disk.size / 1024.) return disk_fields -def command(username, state, fields): - """Handler for running commands like boot and delete on a VM.""" - back = fields.getfirst('back') - try: - d = controls.commandResult(username, state, fields) - if d['command'] == 'Delete VM': - back = 'list' - except InvalidInput, err: - if not back: - raise - print >> sys.stderr, err - result = err - else: - result = 'Success!' - if not back: - return templates.command(searchList=[d]) - if back == 'list': - state.clear() #Changed global state - 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': '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.') - def modifyDict(username, state, fields): """Modify a machine as specified by CGI arguments. 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 oldname = machine.name @@ -373,7 +496,7 @@ 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: @@ -381,19 +504,23 @@ def modifyDict(username, state, fields): update_acl = True if hasattr(validate, 'name'): machine.name = validate.name + for n in machine.nics: + if n.hostname == oldname: + n.hostname = 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])) @@ -403,7 +530,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) @@ -422,61 +549,9 @@ def modify(username, state, fields): info_dict['result'] = result return templates.info(searchList=[info_dict]) - -def helpHandler(username, state, fields): - """Handler for help messages.""" - simple = fields.getfirst('simple') - subjects = fields.getlist('subject') - - 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.""", - 'HVM/ParaVM': """ -HVM machines use the virtualization features of the processor, while -ParaVM machines use Xen's emulation of virtualization features. You -want an HVM virtualized machine.""", - 'CPU Weight': """ -Don't ask us! We're as mystified as you are.""", - 'Owner': """ -The owner field is used to determine quotas. It must be the name of a -locker that you are an AFS administrator of. In particular, you or an -AFS group you are a member of must have AFS rlidwka bits on the -locker. You can check who administers the LOCKER locker using the -commands 'attach LOCKER; fs la /mit/LOCKER' on Athena.) See also administrator.""", - 'Administrator': """ -The administrator field determines who can access the console and -power on and off the machine. This can be either a user or a moira -group.""", - 'Quotas': """ -Quotas are determined on a per-locker basis. Each locker may have a -maximum of 512 megabytes of active ram, 50 gigabytes of disk, and 4 -active machines.""", - 'Console': """ -Framebuffer: At a Linux boot prompt in your VM, try -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. -""" - } - - if not subjects: - subjects = sorted(help_mapping.keys()) - - d = dict(user=username, - simple=simple, - subjects=subjects, - mapping=help_mapping) - - 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.""" @@ -490,14 +565,14 @@ def infoDict(username, state, machine): cputime = None else: main_status = dict(status[1:]) + main_status['host'] = controls.listHost(machine) start_time = float(main_status.get('start_time', 0)) uptime = datetime.timedelta(seconds=int(time.time()-start_time)) cpu_time_float = float(main_status.get('cpu_time', 0)) cputime = datetime.timedelta(seconds=int(cpu_time_float)) checkpoint.checkpoint('Status') - 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'), @@ -505,20 +580,15 @@ def infoDict(username, state, machine): 'NIC_INFO', ('uptime', 'uptime'), ('cputime', 'CPU usage'), + ('host', 'Hosted on'), ('memory', 'RAM'), 'DISK_INFO', ('state', 'state (xen format)'), - ('cpu_weight', 'CPU weight'+helppopup('CPU Weight')), - ('on_reboot', 'Action on VM reboot'), - ('on_poweroff', 'Action on VM poweroff'), - ('on_crash', 'Action on VM crash'), - ('on_xend_start', 'Action on Xen start'), - ('on_xend_stop', 'Action on Xen stop'), - ('bootloader', 'Bootloader options'), ] 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 @@ -553,7 +623,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.) @@ -567,34 +637,31 @@ def infoDict(username, state, machine): ram=machine.memory, max_mem=max_mem, max_disk=max_disk, - owner_help=helppopup("Owner"), fields = fields) return d -def info(username, state, 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(_, __, ___): - """Throw an error, to test the error-tracing mechanisms.""" - raise CodeError("test of the emergency broadcast system") + return templates.unauth(searchList=[{'simple' : True, + 'hostname' : socket.getfqdn()}]) -mapping = dict(list=listVms, - vnc=vnc, - command=command, +def admin(username, state, path, fields): + if path == '': + return ({'Status': '303 See Other', + 'Location': 'admin/'}, + "You shouldn't see this message.") + if not username in getAfsGroupMembers(config.adminacl, 'athena.mit.edu'): + raise InvalidInput('username', username, + 'Not in admin group %s.' % config.adminacl) + newstate = State(username, isadmin=True) + newstate.environ = state.environ + return handler(username, newstate, path, fields) + +mapping = dict( modify=modify, - info=info, - create=create, - help=helpHandler, unauth=unauthFront, - errortest=throwError) + admin=admin, + overlord=admin) def printHeaders(headers): """Print a dictionary as HTTP headers.""" @@ -605,26 +672,38 @@ def printHeaders(headers): def send_error_mail(subject, body): import subprocess - to = 'xvm@mit.edu' + to = config.web.errormail mail = """To: %s -From: root@xvm.mit.edu +From: root@%s Subject: %s %s -""" % (to, subject, body) - p = subprocess.Popen(['/usr/sbin/sendmail', to], stdin=subprocess.PIPE) +""" % (to, config.web.hostname, subject, body) + p = subprocess.Popen(['/usr/sbin/sendmail', '-f', to, 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""" - 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] +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]) + exclude = config.web.errormail_exclude + if username not in exclude and '*' not in exclude: + send_error_mail('xvm error on %s for %s: %s' % (op, username, err), + details) + d['details'] = details + return templates.error(searchList=[d]) + +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): @@ -635,76 +714,55 @@ class App: self.state = State(self.username) self.state.environ = environ + random.seed() #sigh + def __iter__(self): + start_time = time.time() + database.clear_cache() sys.stderr = StringIO() 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', - self.environ['SCRIPT_NAME']+'/')]) + self.start("301 Moved Permanently", [('Location', './')]) 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): - sys.stderr = StringIO() - x = str(output) - print >> sys.stderr, x - print >> sys.stderr, 'XXX' - print >> sys.stderr, e - raise Exception() - output.addError(e) + if hasattr(output, 'addError'): + output.addError(e) + else: + # This only happens on redirects, so it'd be a pain to get + # the message to the user. Maybe in the response is useful. + output = output + '\n\nstderr:\n' + e output_string = str(output) checkpoint.checkpoint('output as a string') except Exception, err: - import traceback 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, traceback.format_exc()) - 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')]) - 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()) + import traceback + 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()) @@ -713,7 +771,7 @@ In case you're curious, the gory details are here. yield '
%s' % cgi.escape(str(checkpoint)) def constructor(): - connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen') + connect() return App def main():