STDERR:
' + str(addition) + '' +Template.sipb_xen_database = sipb_xen_database Template.helppopup = staticmethod(helppopup) Template.err = None @@ -96,8 +103,10 @@ class Defaults: memory = 256 disk = 4.0 cdrom = '' + autoinstall = '' name = '' - vmtype = 'hvm' + 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) @@ -110,15 +119,15 @@ class Defaults: DEFAULT_HEADERS = {'Content-Type': 'text/html'} -def error(op, user, fields, err, emsg): +def error(op, username, fields, err, emsg): """Print an error page when a CodeError occurs""" - d = dict(op=op, user=user, errorMessage=str(err), + d = dict(op=op, user=username, errorMessage=str(err), stderr=emsg) return templates.error(searchList=[d]) -def invalidInput(op, user, fields, err, emsg): +def invalidInput(op, username, fields, err, emsg): """Print an error page when an InvalidInput exception occurs""" - d = dict(op=op, user=user, err_field=err.err_field, + d = dict(op=op, user=username, err_field=err.err_field, err_value=str(err.err_value), stderr=emsg, errorMessage=str(err)) return templates.invalid(searchList=[d]) @@ -133,46 +142,25 @@ def hasVnc(status): return 'location' in d return False -def parseCreate(user, fields): - name = fields.getfirst('name') - if not validation.validMachineName(name): - raise InvalidInput('name', name, 'You must provide a machine name.') - name = name.lower() - - if Machine.get_by(name=name): - raise InvalidInput('name', name, - "Name already exists.") - - owner = validation.testOwner(user, fields.getfirst('owner')) - - memory = fields.getfirst('memory') - memory = validation.validMemory(owner, memory, on=True) - - disk_size = fields.getfirst('disk') - disk_size = validation.validDisk(owner, disk_size) - - vm_type = fields.getfirst('vmtype') - if vm_type not in ('hvm', 'paravm'): - raise CodeError("Invalid vm type '%s'" % vm_type) - is_hvm = (vm_type == 'hvm') - - cdrom = fields.getfirst('cdrom') - if cdrom is not None and not CDROM.get(cdrom): - raise CodeError("Invalid cdrom type '%s'" % cdrom) - return dict(contact=user, name=name, memory=memory, disk_size=disk_size, - owner=owner, is_hvm=is_hvm, cdrom=cdrom) - -def create(user, fields): +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, **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(user, fields) - machine = controls.createVm(**parsed_fields) + parsed_fields = parseCreate(username, state, fields) + machine = controls.createVm(username, **parsed_fields) except InvalidInput, err: pass else: err = None - g.clear() #Changed global state - d = getListDict(user) + state.clear() #Changed global state + d = getListDict(username) d['err'] = err if err: for field in fields.keys(): @@ -182,48 +170,57 @@ def create(user, fields): return templates.list(searchList=[d]) -def getListDict(user): - machines = g.machines +def getListDict(username, state): + """Gets the list of local variables used by list.tmpl.""" + checkpoint.checkpoint('Starting') + machines = state.machines checkpoint.checkpoint('Got my machines') on = {} has_vnc = {} - on = g.uptimes + xmlist = state.xmlist checkpoint.checkpoint('Got uptimes') + can_clone = 'ice3' not in state.xmlist_raw for m in machines: - m.uptime = g.uptimes.get(m) - if not on[m]: + if m not in xmlist: has_vnc[m] = 'Off' - elif m.type.hvm: - has_vnc[m] = True + m.uptime = None else: - has_vnc[m] = "ParaVM"+helppopup("paravm_console") - max_memory = validation.maxMemory(user) - max_disk = validation.maxDisk(user) + m.uptime = xmlist[m]['uptime'] + if xmlist[m]['console']: + has_vnc[m] = True + elif m.type.hvm: + has_vnc[m] = "WTF?" + else: + has_vnc[m] = "ParaVM"+helppopup("ParaVM Console") + 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=user, + owner=username, cdrom='gutsy-i386') checkpoint.checkpoint('Got defaults') - d = dict(user=user, - cant_add_vm=validation.cantAddVm(user), + def sortkey(machine): + return (machine.owner != username, machine.owner, machine.name) + machines = sorted(machines, key=sortkey) + d = dict(user=username, + cant_add_vm=validation.cantAddVm(username, state), max_memory=max_memory, max_disk=max_disk, defaults=defaults, machines=machines, has_vnc=has_vnc, - uptimes=g.uptimes, - cdroms=CDROM.select()) + can_clone=can_clone) return d -def listVms(user, fields): +def listVms(username, state, fields): """Handler for list requests.""" checkpoint.checkpoint('Getting list dict') - d = getListDict(user) + d = getListDict(username, state) checkpoint.checkpoint('Got list dict') return templates.list(searchList=[d]) - -def vnc(user, fields): + +def vnc(username, state, fields): """VNC applet page. Note that due to same-domain restrictions, the applet connects to @@ -234,21 +231,21 @@ def vnc(user, fields): 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 + --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 + --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.testMachineId(user, fields.getfirst('machine_id')) - + machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine + TOKEN_KEY = "0M6W0U1IXexThi5idy8mnkqPKEq1LtEnlK/pZSn0cDrN" data = {} - data["user"] = user + data["user"] = username data["machine"] = machine.name data["expires"] = time.time()+(5*60) pickled_data = cPickle.dumps(data) @@ -257,11 +254,11 @@ def vnc(user, fields): 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=user, + + d = dict(user=username, on=status, has_vnc=has_vnc, machine=machine, @@ -270,10 +267,14 @@ def vnc(user, fields): 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 elif nic.machine: - return nic.machine.name + '.servers.csail.mit.edu' + return nic.machine.name + '.xvm.mit.edu' else: return None @@ -311,158 +312,173 @@ def getDiskInfo(data_dict, machine): disk_fields = [] for disk in machine.disks: name = disk.guest_device_name - disk_fields.extend([(x % name, y % name) for x, y in + disk_fields.extend([(x % name, y % name) for x, y in disk_fields_template]) data_dict['%s_size' % name] = "%0.1f GiB" % (disk.size / 1024.) return disk_fields -def command(user, 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(user, fields) + d = controls.commandResult(username, state, fields) if d['command'] == 'Delete VM': back = 'list' except InvalidInput, err: if not back: raise - #print >> sys.stderr, err + print >> sys.stderr, err result = err else: result = 'Success!' if not back: return templates.command(searchList=[d]) if back == 'list': - g.clear() #Changed global state - d = getListDict(user) + state.clear() #Changed global state + d = getListDict(username) d['result'] = result return templates.list(searchList=[d]) elif back == 'info': - machine = validation.testMachineId(user, fields.getfirst('machine_id')) - d = infoDict(user, machine) - d['result'] = result - return templates.info(searchList=[d]) + machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine + return ({'Status': '302', + '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(user, fields): +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() try: - machine = validation.testMachineId(user, fields.getfirst('machine_id')) - owner = validation.testOwner(user, fields.getfirst('owner'), machine) - admin = validation.testAdmin(user, fields.getfirst('administrator'), - machine) - contact = validation.testContact(user, fields.getfirst('contact'), - machine) - name = validation.testName(user, fields.getfirst('name'), machine) + kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name memory vmtype disksize'.split()]) + validate = validation.Validate(username, state, **kws) + machine = validate.machine + print >> sys.stderr, machine, machine.administrator, kws['admin'] oldname = machine.name - command = "modify" - - memory = fields.getfirst('memory') - if memory is not None: - memory = validation.validMemory(user, memory, machine, on=False) - machine.memory = memory - - disksize = validation.testDisk(user, fields.getfirst('disk')) - if disksize is not None: - disksize = validation.validDisk(user, disksize, machine) + + if hasattr(validate, 'memory'): + machine.memory = validate.memory + + if hasattr(validate, 'vmtype'): + machine.type = validate.vmtype + + if hasattr(validate, 'disksize'): + disksize = validate.disksize disk = machine.disks[0] if disk.size != disksize: olddisk[disk.guest_device_name] = disksize disk.size = disksize ctx.current.save(disk) - - if owner is not None: - machine.owner = owner - if name is not None: + + update_acl = False + if hasattr(validate, 'owner') and validate.owner != machine.owner: + machine.owner = validate.owner + update_acl = True + if hasattr(validate, 'name'): machine.name = name - if admin is not None: - machine.administrator = admin - if contact is not None: - machine.contact = contact - + 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) + if update_acl: + print >> sys.stderr, machine, machine.administrator + cache_acls.refreshMachine(machine) transaction.commit() except: transaction.rollback() raise for diskname in olddisk: controls.resizeDisk(oldname, diskname, str(olddisk[diskname])) - if name is not None: - controls.renameMachine(machine, oldname, name) - return dict(user=user, - command=command, + if hasattr(validate, 'name'): + controls.renameMachine(machine, oldname, validate.name) + return dict(user=username, + command="modify", machine=machine) - -def modify(user, fields): + +def modify(username, state, fields): """Handler for modifying attributes of a machine.""" try: - modify_dict = modifyDict(user, fields) + modify_dict = modifyDict(username, state, fields) except InvalidInput, err: result = None - machine = validation.testMachineId(user, fields.getfirst('machine_id')) + machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine else: machine = modify_dict['machine'] result = 'Success!' err = None - info_dict = infoDict(user, machine) + info_dict = infoDict(username, machine) info_dict['err'] = err if err: for field in fields.keys(): setattr(info_dict['defaults'], field, fields.getfirst(field)) info_dict['result'] = result return templates.info(searchList=[info_dict]) - -def helpHandler(user, fields): + +def helpHandler(username, state, fields): """Handler for help messages.""" simple = fields.getfirst('simple') subjects = fields.getlist('subject') - - help_mapping = dict(paravm_console=""" -ParaVM machines do not support console access over VNC. To access -these machines, you either need to boot with a liveCD and ssh in or -hope that the sipb-xen maintainers add support for serial consoles.""", - hvm_paravm=""" + + 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=""" + 'CPU Weight': """ Don't ask us! We're as mystified as you are.""", - owner=""" + 'Owner': """ The owner field is used to determine quotas. It must be the name of a +href="help?subject=Quotas">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 see who administers the LOCKER locker using the -command 'fs la /mit/LOCKER' on Athena.) See also administrator.""", - administrator=""" +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 quota may have a + '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.""" - ) - +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=user, + + d = dict(user=username, simple=simple, subjects=subjects, mapping=help_mapping) - + return templates.help(searchList=[d]) - + def badOperation(u, e): + """Function called when accessing an unknown URI.""" raise CodeError("Unknown operation") -def infoDict(user, machine): +def infoDict(username, machine): + """Get the variables used by info.tmpl.""" status = controls.statusInfo(machine) checkpoint.checkpoint('Getting status info') has_vnc = hasVnc(status) @@ -491,7 +507,7 @@ def infoDict(user, machine): ('memory', 'RAM'), 'DISK_INFO', ('state', 'state (xen format)'), - ('cpu_weight', 'CPU weight'+helppopup('cpu_weight')), + ('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'), @@ -509,14 +525,14 @@ def infoDict(user, machine): nic_fields = getNicInfo(machine_info, machine) nic_point = display_fields.index('NIC_INFO') - display_fields = (display_fields[:nic_point] + nic_fields + + display_fields = (display_fields[:nic_point] + nic_fields + display_fields[nic_point+1:]) disk_fields = getDiskInfo(machine_info, machine) disk_point = display_fields.index('DISK_INFO') - display_fields = (display_fields[:disk_point] + disk_fields + + display_fields = (display_fields[:disk_point] + disk_fields + display_fields[disk_point+1:]) - + main_status['memory'] += ' MiB' for field, disp in display_fields: if field in ('uptime', 'cputime') and locals()[field] is not None: @@ -532,16 +548,16 @@ def infoDict(user, machine): checkpoint.checkpoint('Got fields') - max_mem = validation.maxMemory(user, machine, False) + max_mem = validation.maxMemory(machine.owner, state, machine, False) checkpoint.checkpoint('Got mem') - max_disk = validation.maxDisk(user, machine) + max_disk = validation.maxDisk(machine.owner, machine) defaults = Defaults() for name in 'machine_id name 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.) checkpoint.checkpoint('Got defaults') - d = dict(user=user, - cdroms=CDROM.select(), + d = dict(user=username, on=status is not None, machine=machine, defaults=defaults, @@ -550,37 +566,47 @@ def infoDict(user, machine): ram=machine.memory, max_mem=max_mem, max_disk=max_disk, - owner_help=helppopup("owner"), + owner_help=helppopup("Owner"), fields = fields) return d -def info(user, fields): +def info(username, state, fields): """Handler for info on a single VM.""" - machine = validation.testMachineId(user, fields.getfirst('machine_id')) - d = infoDict(user, machine) + machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine + d = infoDict(username, machine) checkpoint.checkpoint('Got infodict') return templates.info(searchList=[d]) +def unauthFront(_, _2, fields): + """Information for unauth'd users.""" + return templates.unauth(searchList=[{'simple' : True}]) + mapping = dict(list=listVms, vnc=vnc, command=command, modify=modify, info=info, create=create, - help=helpHandler) + help=helpHandler, + unauth=unauthFront) def printHeaders(headers): + """Print a dictionary as HTTP headers.""" for key, value in headers.iteritems(): print '%s: %s' % (key, value) print -def getUser(): +def getUser(environ): """Return the current user based on the SSL environment variables""" - username = os.environ['SSL_CLIENT_S_DN_Email'].split("@")[0] - return username + 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 main(operation, user, fields): +def main(operation, username, state, fields): start_time = time.time() fun = mapping.get(operation, badOperation) @@ -588,7 +614,7 @@ def main(operation, user, fields): connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen') try: checkpoint.checkpoint('Before') - output = fun(u, fields) + output = fun(username, state, fields) checkpoint.checkpoint('After') headers = dict(DEFAULT_HEADERS) @@ -597,27 +623,35 @@ def main(operation, user, fields): 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) printHeaders(headers) output_string = str(output) checkpoint.checkpoint('output as a string') print output_string - print '
%s' % checkpoint + if fields.has_key('timedebug'): + print '
%s' % cgi.escape(checkpoint) except Exception, err: if not fields.has_key('js'): if isinstance(err, CodeError): print 'Content-Type: text/html\n' e = revertStandardError() - print error(operation, u, fields, err, e) + print error(operation, state.username, fields, err, e) sys.exit(1) if isinstance(err, InvalidInput): print 'Content-Type: text/html\n' e = revertStandardError() - print invalidInput(operation, u, fields, err, e) + print invalidInput(operation, state.username, fields, err, e) sys.exit(1) print 'Content-Type: text/plain\n' print 'Uh-oh! We experienced an error.' - print 'Please email sipb-xen@mit.edu with the contents of this page.' + print 'Please email xvm-dev@mit.edu with the contents of this page.' print '----' e = revertStandardError() print e @@ -626,14 +660,22 @@ def main(operation, user, fields): if __name__ == '__main__': fields = cgi.FieldStorage() - u = getUser() - g.user = u + + if fields.has_key('sqldebug'): + import logging + logging.basicConfig() + logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO) + logging.getLogger('sqlalchemy.orm.unitofwork').setLevel(logging.INFO) + + username = getUser(os.environ) + state.username = username operation = os.environ.get('PATH_INFO', '') if not operation: print "Status: 301 Moved Permanently" print 'Location: ' + os.environ['SCRIPT_NAME']+'/\n' sys.exit(0) - + if username is None: + operation = 'unauth' if operation.startswith('/'): operation = operation[1:] if not operation: @@ -641,6 +683,6 @@ if __name__ == '__main__': if os.getenv("SIPB_XEN_PROFILE"): import profile - profile.run('main(operation, u, fields)', 'log-'+operation) + profile.run('main(operation, username, state, fields)', 'log-'+operation) else: - main(operation, u, fields) + main(operation, username, state, fields)