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.
+"""
+ }
+
+ 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
+
+ @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
def pathSplit(path):
if path.startswith('/'):
@@ -64,16 +173,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
@@ -82,8 +181,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: @@ -117,7 +216,7 @@ class Defaults: 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]) @@ -146,7 +245,7 @@ def parseCreate(username, state, fields): 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, + disksize=validate.disksize, owner=validate.owner, machine_type=getattr(validate, 'vmtype', Defaults.type), cdrom=getattr(validate, 'cdrom', None), autoinstall=getattr(validate, 'autoinstall', None)) @@ -197,8 +296,7 @@ def getListDict(username, state): 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) @@ -213,13 +311,6 @@ def getListDict(username, state): can_clone=can_clone) return d -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, path, fields): """VNC applet page. @@ -242,18 +333,12 @@ def vnc(username, state, path, fields): """ 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) + 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) @@ -263,6 +348,7 @@ def vnc(username, state, path, fields): has_vnc=has_vnc, machine=machine, hostname=state.environ.get('SERVER_NAME', 'localhost'), + port=port, authtoken=token) return templates.vnc(searchList=[d]) @@ -271,13 +357,16 @@ def getHostname(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. @@ -293,8 +382,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: @@ -352,7 +440,7 @@ def modifyDict(username, state, fields): 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 description memory vmtype disksize'.split()]) validate = validation.Validate(username, state, **kws) @@ -371,7 +459,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: @@ -379,6 +467,9 @@ 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: @@ -387,13 +478,12 @@ def modifyDict(username, state, fields): 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])) @@ -422,58 +512,6 @@ def modify(username, state, path, fields): info_dict['result'] = result return templates.info(searchList=[info_dict]) - -def helpHandler(username, state, path, 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, p, e): """Function called when accessing an unknown URI.""" return ({'Status': '404 Not Found'}, 'Invalid operation.') @@ -490,13 +528,12 @@ 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'), @@ -506,16 +543,11 @@ 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 = {} @@ -582,16 +614,18 @@ def info(username, state, path, fields): def unauthFront(_, _2, _3, fields): """Information for unauth'd users.""" - return templates.unauth(searchList=[{'simple' : True}]) + return templates.unauth(searchList=[{'simple' : True, + 'hostname' : socket.getfqdn()}]) -def overlord(username, state, path, fields): +def admin(username, state, path, fields): if path == '': return ({'Status': '303 See Other', - 'Location': 'overlord/'}, + 'Location': 'admin/'}, "You shouldn't see this message.") - if not username in getAfsGroupMembers('system:xvm', 'athena.mit.edu'): - raise InvalidInput('username', username, 'Not an overlord.') - newstate = State(username, overlord=True) + 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) @@ -599,15 +633,14 @@ 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, +mapping = dict(vnc=vnc, command=command, modify=modify, info=info, create=create, - help=helpHandler, unauth=unauthFront, - overlord=overlord, + admin=admin, + overlord=admin, errortest=throwError) def printHeaders(headers): @@ -619,14 +652,15 @@ 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() @@ -636,16 +670,13 @@ 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]) - if username not in ('price', 'ecprice', 'andersk'): #add yourself at will + 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 getUser(environ): - """Return the current user based on the SSL environment variables""" - return environ.get('REMOTE_USER', None) - def handler(username, state, path, fields): operation, path = pathSplit(path) if not operation: @@ -667,7 +698,7 @@ class App: def __iter__(self): start_time = time.time() - sipb_xen_database.clear_cache() + database.clear_cache() sys.stderr = StringIO() fields = cgi.FieldStorage(fp=self.environ['wsgi.input'], environ=self.environ) operation = self.environ.get('PATH_INFO', '') @@ -688,14 +719,12 @@ class App: headers.update(new_headers) 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: @@ -722,7 +751,7 @@ class App: yield '
%s' % cgi.escape(str(checkpoint)) def constructor(): - connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen') + connect() return App def main():