From: Anders Kaseorg Date: Sun, 7 Oct 2007 06:45:37 +0000 (-0400) Subject: Add cdrom_image parameter; do some simple regex sanity checking. X-Git-Tag: sipb-xen-database/8~12 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/8fffbd0901b55badc06724322a34e898af443dfe Add cdrom_image parameter; do some simple regex sanity checking. svn path=/trunk/packages/sipb-xen-database/sipb-xen-database/; revision=109 --- diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index 0c30eff..451762d 100644 --- a/client/etc/xen/sipb-database +++ b/client/etc/xen/sipb-database @@ -1,16 +1,27 @@ # -*- mode: python; -*- import sipb_xen_database.models as models from sipb_xen_database import connect +import re +import sys connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen') -# `machine_name' should get passed in from the xm create call + +# 'machine_name', and optionally 'cdrom_image', should get passed in +# from the xm create call + +def check(b): + if not b: + exit(1) machine = models.Machine.get_by(name=machine_name) +check(machine is not None) machine_type = models.Type.get_by(type_id=machine.type_id) memory = machine.memory maxmem = memory +check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name)) name = machine.name +check(re.match('^[0-9a-f-]+$', machine.uuid)) uuid = machine.uuid vcpus = machine.cpus @@ -39,20 +50,25 @@ apic = machine_type.apic vif = [] for n in machine.nics: + check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip)) d = '%smac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip) vif.append(d) disk = [] for d in machine.disks: + check(re.match('^[A-Za-z0-9]+$', d.guest_device_name)) device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name) disk.append(dspec) -restart = 'destroy' -if machine.autorestart: - restart = 'restart' +if 'cdrom_image' in locals(): + check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', cdrom_image)) + disk.append('file:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r') + boot = 'd' on_poweroff = 'destroy' on_reboot = 'restart' -on_crash = restart +on_crash = 'destroy' +if machine.autorestart: + on_crash = 'restart'