X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/9a58d0785024a99e409fe95cba99391676c026f2..cabbf7ab8e35de060f6f4e3f75670558ad25d9b5:/code/main.py
diff --git a/code/main.py b/code/main.py
index ce523cb..073f81d 100755
--- a/code/main.py
+++ b/code/main.py
@@ -41,7 +41,7 @@ import sipb_xen_database
from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
import validation
import cache_acls
-from webcommon import InvalidInput, CodeError, g
+from webcommon import InvalidInput, CodeError, state
import controls
class Checkpoint:
@@ -119,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])
@@ -142,49 +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. Max 22 chars, alnum plus \'-\' and \'_\'.')
- name = name.lower()
+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))
- 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')
- vm_type = validation.validVmType(vm_type)
-
- cdrom = fields.getfirst('cdrom')
- if cdrom is not None and not CDROM.get(cdrom):
- raise CodeError("Invalid cdrom type '%s'" % cdrom)
-
- clone_from = fields.getfirst('clone_from')
- if clone_from and clone_from != 'ice3':
- raise CodeError("Invalid clone image '%s'" % clone_from)
-
- return dict(contact=user, name=name, memory=memory, disk_size=disk_size,
- owner=owner, machine_type=vm_type, cdrom=cdrom, clone_from=clone_from)
-
-def create(user, fields):
+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():
@@ -194,15 +170,16 @@ def create(user, fields):
return templates.list(searchList=[d])
-def getListDict(user):
+def getListDict(username, state):
"""Gets the list of local variables used by list.tmpl."""
checkpoint.checkpoint('Starting')
- machines = g.machines
+ machines = state.machines
checkpoint.checkpoint('Got my machines')
on = {}
has_vnc = {}
- xmlist = g.xmlist
+ 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'
@@ -215,34 +192,35 @@ def getListDict(user):
has_vnc[m] = "WTF?"
else:
has_vnc[m] = "ParaVM"+helppopup("ParaVM Console")
- max_memory = validation.maxMemory(user)
- max_disk = validation.maxDisk(user)
+ 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')
def sortkey(machine):
- return (machine.owner != user, machine.owner, machine.name)
+ return (machine.owner != username, machine.owner, machine.name)
machines = sorted(machines, key=sortkey)
- d = dict(user=user,
- cant_add_vm=validation.cantAddVm(user),
+ 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)
+ has_vnc=has_vnc,
+ 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
@@ -262,12 +240,12 @@ def vnc(user, fields):
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)
@@ -280,7 +258,7 @@ def vnc(user, fields):
status = controls.statusInfo(machine)
has_vnc = hasVnc(status)
- d = dict(user=user,
+ d = dict(user=username,
on=status,
has_vnc=has_vnc,
machine=machine,
@@ -339,36 +317,36 @@ def getDiskInfo(data_dict, machine):
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'))
+ 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.
@@ -376,28 +354,20 @@ def modifyDict(user, fields):
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
+ if hasattr(validate, 'memory'):
+ machine.memory = validate.memory
- vm_type = validation.validVmType(fields.getfirst('vmtype'))
- if vm_type is not None:
- machine.type = vm_type
+ if hasattr(validate, 'vmtype'):
+ machine.type = validate.vmtype
- disksize = validation.testDisk(user, fields.getfirst('disk'))
- if disksize is not None:
- disksize = validation.validDisk(user, disksize, machine)
+ if hasattr(validate, 'disksize'):
+ disksize = validate.disksize
disk = machine.disks[0]
if disk.size != disksize:
olddisk[disk.guest_device_name] = disksize
@@ -405,19 +375,20 @@ def modifyDict(user, fields):
ctx.current.save(disk)
update_acl = False
- if owner is not None and owner != machine.owner:
- machine.owner = owner
+ if hasattr(validate, 'owner') and validate.owner != machine.owner:
+ machine.owner = validate.owner
update_acl = True
- if name is not None:
+ if hasattr(validate, 'name'):
machine.name = name
- if admin is not None and admin != machine.administrator:
- machine.administrator = admin
+ if hasattr(validate, 'admin') and validate.admin != machine.administrator:
+ machine.administrator = validate.admin
update_acl = True
- if contact is not None:
- machine.contact = contact
+ 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:
@@ -425,24 +396,24 @@ def modifyDict(user, fields):
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():
@@ -451,7 +422,7 @@ def modify(user, fields):
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')
@@ -494,7 +465,7 @@ 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)
@@ -506,7 +477,7 @@ 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')
@@ -577,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,
+ d = dict(user=username,
on=status is not None,
machine=machine,
defaults=defaults,
@@ -599,14 +570,14 @@ def infoDict(user, machine):
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(_, fields):
+def unauthFront(_, _2, fields):
"""Information for unauth'd users."""
return templates.unauth(searchList=[{'simple' : True}])
@@ -626,14 +597,16 @@ def printHeaders(headers):
print
-def getUser():
+def getUser(environ):
"""Return the current user based on the SSL environment variables"""
- email = os.environ.get('SSL_CLIENT_S_DN_Email', None)
+ email = environ.get('SSL_CLIENT_S_DN_Email', None)
if email is None:
return None
- return email.split("@")[0]
+ 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)
@@ -641,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)
@@ -650,24 +623,31 @@ 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
if fields.has_key('timedebug'):
- print '%s
' % checkpoint
+ 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.'
@@ -687,17 +667,15 @@ if __name__ == '__main__':
logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
logging.getLogger('sqlalchemy.orm.unitofwork').setLevel(logging.INFO)
- u = getUser()
- g.user = u
+ 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 u is None:
+ if username is None:
operation = 'unauth'
-
if operation.startswith('/'):
operation = operation[1:]
if not operation:
@@ -705,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)