1.1 --- a/OpenSecurity/bin/vmmanager.pyw Thu Aug 14 09:51:11 2014 +0100
1.2 +++ b/OpenSecurity/bin/vmmanager.pyw Fri Aug 22 09:35:02 2014 +0100
1.3 @@ -163,7 +163,7 @@
1.4 # return hosty system properties
1.5 @staticmethod
1.6 def getSystemProperties():
1.7 - result = Cygwin.checkResult(Cygwin.vboxExecute('list systemproperties'))
1.8 + result = Cygwin.vboxExecute('list systemproperties')
1.9 if result[1]=='':
1.10 return None
1.11 props = dict((k.strip(),v.strip().strip('"')) for k,v in (line.split(':', 1) for line in result[1].strip().splitlines()))
1.12 @@ -267,13 +267,13 @@
1.13
1.14 # list all existing VMs registered with VBox
1.15 def listVM(self):
1.16 - result = Cygwin.checkResult(Cygwin.vboxExecute('list vms'))[1]
1.17 + result = Cygwin.vboxExecute('list vms')[1]
1.18 vms = list(k.strip().strip('"') for k,_ in (line.split(' ') for line in result.splitlines()))
1.19 return vms
1.20
1.21 # list running VMs
1.22 def listRunningVMS(self):
1.23 - result = Cygwin.checkResult(Cygwin.vboxExecute('list runningvms'))[1]
1.24 + result = Cygwin.vboxExecute('list runningvms')[1]
1.25 vms = list(k.strip().strip('"') for k,_ in (line.split(' ') for line in result.splitlines()))
1.26 return vms
1.27
1.28 @@ -334,7 +334,7 @@
1.29 # return the RSDs connected to the host
1.30 @staticmethod
1.31 def getExistingRSDs():
1.32 - results = Cygwin.checkResult(Cygwin.vboxExecute('list usbhost'))[1]
1.33 + results = Cygwin.vboxExecute('list usbhost')[1]
1.34 results = results.split('Host USB Devices:')[1].strip()
1.35
1.36 items = list( "UUID:"+result for result in results.split('UUID:') if result != '')
1.37 @@ -392,13 +392,13 @@
1.38
1.39 # attach removable storage device to VM by provision of filter
1.40 def attachRSD(self, vm_name, rsd_filter):
1.41 - #return Cygwin.checkResult(Cygwin.vboxExecute('usbfilter add 0 --target ' + vm_name + ' --name OpenSecurityRSD --vendorid ' + rsd_filter.vendorid + ' --productid ' + rsd_filter.productid + ' --revision ' + rsd_filter.revision + ' --serialnumber ' + rsd_filter.serial))
1.42 - return Cygwin.checkResult(Cygwin.vboxExecute('controlvm ' + vm_name + ' usbattach ' + rsd_filter.uuid ))
1.43 + #return Cygwin.vboxExecute('usbfilter add 0 --target ' + vm_name + ' --name OpenSecurityRSD --vendorid ' + rsd_filter.vendorid + ' --productid ' + rsd_filter.productid + ' --revision ' + rsd_filter.revision + ' --serialnumber ' + rsd_filter.serial)
1.44 + return Cygwin.vboxExecute('controlvm ' + vm_name + ' usbattach ' + rsd_filter.uuid )
1.45
1.46 # detach removable storage from VM by
1.47 def detachRSD(self, vm_name, rsd_filter):
1.48 - #return Cygwin.checkResult(Cygwin.vboxExecute('usbfilter remove 0 --target ' + vm_name))
1.49 - return Cygwin.checkResult(Cygwin.vboxExecute('controlvm ' + vm_name + ' usbdetach ' + rsd_filter.uuid ))
1.50 + #return Cygwin.vboxExecute('usbfilter remove 0 --target ' + vm_name)
1.51 + return Cygwin.vboxExecute('controlvm ' + vm_name + ' usbdetach ' + rsd_filter.uuid )
1.52
1.53 # configures hostonly networking and DHCP server. requires admin rights
1.54 def configureHostNetworking(self):
1.55 @@ -408,10 +408,10 @@
1.56 #Cygwin.vboxExecute(cmd)
1.57 #cmd = 'vboxmanage hostonlyif create'
1.58 #Cygwin.vboxExecute(cmd)
1.59 - Cygwin.checkResult(Cygwin.vboxExecute('hostonlyif ipconfig \"VirtualBox Host-Only Ethernet Adapter\" --ip 192.168.56.1 --netmask 255.255.255.0'))
1.60 + Cygwin.vboxExecute('hostonlyif ipconfig \"VirtualBox Host-Only Ethernet Adapter\" --ip 192.168.56.1 --netmask 255.255.255.0')
1.61 #cmd = 'vboxmanage dhcpserver add'
1.62 #Cygwin.vboxExecute(cmd)
1.63 - Cygwin.checkResult(Cygwin.vboxExecute('dhcpserver modify --ifname \"VirtualBox Host-Only Ethernet Adapter\" --ip 192.168.56.100 --netmask 255.255.255.0 --lowerip 192.168.56.101 --upperip 192.168.56.200'))
1.64 + Cygwin.vboxExecute('dhcpserver modify --ifname \"VirtualBox Host-Only Ethernet Adapter\" --ip 192.168.56.100 --netmask 255.255.255.0 --lowerip 192.168.56.101 --upperip 192.168.56.200')
1.65
1.66 def isSDVMExisting(self, vm_name):
1.67 sdvms = self.listSDVM()
1.68 @@ -423,10 +423,10 @@
1.69 return
1.70 #remove eventually existing SDVM folder
1.71 machineFolder = Cygwin.cygPath(VMManager.machineFolder)
1.72 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"'))
1.73 - Cygwin.checkResult(Cygwin.vboxExecute('createvm --name ' + vm_name + ' --ostype Debian --register'))
1.74 - Cygwin.checkResult(Cygwin.vboxExecute('modifyvm ' + vm_name + ' --memory 768 --vram 10 --cpus 1 --usb on --usbehci on --nic1 hostonly --hostonlyadapter1 \"' + self.hostonlyIF['Name'] + '\" --nic2 nat'))
1.75 - Cygwin.checkResult(Cygwin.vboxExecute('storagectl ' + vm_name + ' --name SATA --add sata --portcount 2'))
1.76 + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"')
1.77 + Cygwin.vboxExecute('createvm --name ' + vm_name + ' --ostype Debian --register')
1.78 + Cygwin.vboxExecute('modifyvm ' + vm_name + ' --memory 768 --vram 10 --cpus 1 --usb on --usbehci on --nic1 hostonly --hostonlyadapter1 \"' + self.hostonlyIF['Name'] + '\" --nic2 nat')
1.79 + Cygwin.vboxExecute('storagectl ' + vm_name + ' --name SATA --add sata --portcount 2')
1.80
1.81 #create new SecurityDVM with automatically generated name from template (thread safe)
1.82 def newSDVM(self):
1.83 @@ -436,10 +436,10 @@
1.84 return vm_name
1.85
1.86 # attach storage image to controller
1.87 - def storageAttach(self, vm_name):
1.88 + def attachStorage(self, vm_name):
1.89 if self.isStorageAttached(vm_name):
1.90 - self.storageDetach(vm_name)
1.91 - Cygwin.checkResult(Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium \"'+ VMManager.machineFolder + '\SecurityDVM\SecurityDVM.vmdk\"'))
1.92 + self.detachStorage(vm_name)
1.93 + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium \"'+ VMManager.machineFolder + '\SecurityDVM\SecurityDVM.vmdk\"')
1.94
1.95 # return true if storage is attached
1.96 def isStorageAttached(self, vm_name):
1.97 @@ -447,12 +447,12 @@
1.98 return (info['SATA-0-0']!='none')
1.99
1.100 # detach storage from controller
1.101 - def storageDetach(self, vm_name):
1.102 + def detachStorage(self, vm_name):
1.103 if self.isStorageAttached(vm_name):
1.104 - Cygwin.checkResult(Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium none'))
1.105 + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium none')
1.106
1.107 def changeStorageType(self, filename, storage_type):
1.108 - Cygwin.checkResult(Cygwin.vboxExecute('modifyhd \"' + filename + '\" --type ' + storage_type))
1.109 + Cygwin.vboxExecute('modifyhd \"' + filename + '\" --type ' + storage_type)
1.110
1.111 # list storage snaphots for VM
1.112 def updateTemplate(self):
1.113 @@ -462,29 +462,29 @@
1.114 self.waitShutdown(self.vmRootName)
1.115
1.116 # check for updates
1.117 - self.genCertificateISO(self.vmRootName)
1.118 - self.attachCertificateISO(self.vmRootName)
1.119 + self.genCertificate(self.vmRootName)
1.120 + self.attachCertificate(self.vmRootName)
1.121
1.122 #templateUUID = self.getVMInfo(self.vmRootName)["SATA-ImageUUID-0-0"] #TODO: // verify value
1.123 templateUUID = self.getTemplateUUID()
1.124
1.125 - self.storageDetach(self.vmRootName)
1.126 + self.detachStorage(self.vmRootName)
1.127 self.removeSnapshots(templateUUID)
1.128
1.129 template_storage = VMManager.machineFolder + '\\' + self.vmRootName + '\\' + self.vmRootName + '.vmdk'
1.130 #TODO:// modify to take vm name as argument
1.131 self.changeStorageType(template_storage,'normal')
1.132 - self.storageAttach(self.vmRootName)
1.133 + self.attachStorage(self.vmRootName)
1.134 self.startVM(self.vmRootName)
1.135 - self.waitStartup(self.vmRootName, timeout_ms = 30000)
1.136 + self.waitStartup(self.vmRootName)
1.137
1.138 tmp_ip = self.getHostOnlyIP(self.vmRootName)
1.139 tmp_machine_folder = Cygwin.cygPath(VMManager.machineFolder)
1.140 - Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y update"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key'))
1.141 - Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y upgrade"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key'))
1.142 + Cygwin.sshExecute('"sudo apt-get -y update"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key')
1.143 + Cygwin.sshExecute('"sudo apt-get -y upgrade"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key')
1.144
1.145 #check if reboot is required
1.146 - result = Cygwin.checkResult(Cygwin.sshExecute('"if [ -f /var/run/reboot-required ]; then echo \\\"Yes\\\"; fi"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key'))
1.147 + result = Cygwin.sshExecute('"if [ -f /var/run/reboot-required ]; then echo \\\"Yes\\\"; fi"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key')
1.148 if "Yes" in result[1]:
1.149 self.stopVM(self.vmRootName)
1.150 self.waitShutdown(self.vmRootName)
1.151 @@ -494,9 +494,9 @@
1.152 #self.hibernateVM(self.vmRootName)
1.153 self.stopVM(self.vmRootName)
1.154 self.waitShutdown(self.vmRootName)
1.155 - self.storageDetach(self.vmRootName)
1.156 + self.detachStorage(self.vmRootName)
1.157 self.changeStorageType(template_storage,'immutable')
1.158 - self.storageAttach(self.vmRootName)
1.159 + self.attachStorage(self.vmRootName)
1.160
1.161 #self.start()
1.162
1.163 @@ -504,7 +504,7 @@
1.164 #"SATA-ImageUUID-0-0"="d0af827d-f13a-49be-8ac1-df20b13bda83"
1.165 @staticmethod
1.166 def getDiskImages():
1.167 - results = Cygwin.checkResult(Cygwin.vboxExecute('list hdds'))[1]
1.168 + results = Cygwin.vboxExecute('list hdds')[1]
1.169 results = results.replace('Parent UUID', 'Parent')
1.170 items = list( "UUID:"+result for result in results.split('UUID:') if result != '')
1.171
1.172 @@ -540,26 +540,26 @@
1.173
1.174 def removeImage(self, imageUUID):
1.175 logger.debug('removing snapshot ' + imageUUID)
1.176 - Cygwin.checkResult(Cygwin.vboxExecute('closemedium disk {' + imageUUID + '} --delete'))#[1]
1.177 + Cygwin.vboxExecute('closemedium disk {' + imageUUID + '} --delete')
1.178 # parse result 0%...10%...20%...30%...40%...50%...60%...70%...80%...90%...100%
1.179
1.180 #remove VM from the system. should be used on VMs returned by listSDVMs
1.181 def removeVM(self, vm_name):
1.182 logger.info('Removing ' + vm_name)
1.183
1.184 - Cygwin.checkResult(Cygwin.vboxExecute('unregistervm ' + vm_name + ' --delete'))
1.185 + Cygwin.vboxExecute('unregistervm ' + vm_name + ' --delete')
1.186 #TODO:// try to close medium if still existing
1.187 - #Cygwin.checkResult(Cygwin.vboxExecute('closemedium disk {' + hdd['UUID'] + '} --delete'))#[1]
1.188 + #Cygwin.vboxExecute('closemedium disk {' + hdd['UUID'] + '} --delete')
1.189 self.removeVMFolder(vm_name)
1.190
1.191 def removeVMFolder(self, vm_name):
1.192 machineFolder = Cygwin.cygPath(VMManager.machineFolder)
1.193 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"'))
1.194 + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"')
1.195
1.196 # start VM
1.197 def startVM(self, vm_name):
1.198 logger.info('Starting ' + vm_name)
1.199 - #TODO: modify to use Cygwin.checkResult() of make it retry 3 times
1.200 + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False')
1.201 result = Cygwin.vboxExecute('startvm ' + vm_name + ' --type headless' )
1.202 while 'successfully started' not in result[1]:
1.203 logger.error("Failed to start SDVM: " + vm_name + " retrying")
1.204 @@ -575,19 +575,23 @@
1.205 # stop VM
1.206 def stopVM(self, vm_name):
1.207 logger.info('Sending shutdown signal to ' + vm_name)
1.208 - Cygwin.checkResult(Cygwin.sshExecute( '"sudo shutdown -h now"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key' ))
1.209 + Cygwin.sshExecute( '"sudo shutdown -h now"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key' )
1.210 + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False')
1.211
1.212 # stop VM
1.213 def hibernateVM(self, vm_name):
1.214 logger.info('Sending hibernate-disk signal to ' + vm_name)
1.215 - Cygwin.checkResult(Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False))
1.216 + Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False)
1.217 + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False')
1.218
1.219 # poweroff VM
1.220 def poweroffVM(self, vm_name):
1.221 if not self.isVMRunning(vm_name):
1.222 return
1.223 logger.info('Powering off ' + vm_name)
1.224 - return Cygwin.checkResult(Cygwin.vboxExecute('controlvm ' + vm_name + ' poweroff'))
1.225 + Cygwin.vboxExecute('controlvm ' + vm_name + ' poweroff')
1.226 + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False')
1.227 +
1.228
1.229 # return the hostOnly IP for a running guest or the host
1.230 def getHostOnlyIP(self, vm_name):
1.231 @@ -596,7 +600,7 @@
1.232 return VMManager.hostonlyIF['IPAddress']
1.233 else:
1.234 logger.info('Getting hostOnly IP address ' + vm_name)
1.235 - result = Cygwin.checkResult(Cygwin.vboxExecute('guestproperty get ' + vm_name + ' /VirtualBox/GuestInfo/Net/0/V4/IP'))
1.236 + result = Cygwin.vboxExecute('guestproperty get ' + vm_name + ' /VirtualBox/GuestInfo/Net/0/V4/IP')
1.237 if result=='':
1.238 return None
1.239 result = result[1]
1.240 @@ -606,43 +610,54 @@
1.241
1.242 # return the description set for an existing VM
1.243 def getVMInfo(self, vm_name):
1.244 - results = Cygwin.checkResult(Cygwin.vboxExecute('showvminfo ' + vm_name + ' --machinereadable'))[1]
1.245 + results = Cygwin.vboxExecute('showvminfo ' + vm_name + ' --machinereadable')[1]
1.246 props = dict((k.strip().strip('"'),v.strip().strip('"')) for k,v in (line.split('=', 1) for line in results.splitlines()))
1.247 return props
1.248
1.249 #generates ISO containing authorized_keys for use with guest VM
1.250 - def genCertificateISO(self, vm_name):
1.251 + def genCertificate(self, vm_name):
1.252 machineFolder = Cygwin.cygPath(VMManager.machineFolder)
1.253 # remove .ssh folder if exists
1.254 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"'))
1.255 + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"')
1.256 # remove .ssh folder if exists
1.257 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"'))
1.258 + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"')
1.259 # create .ssh folder in vm_name
1.260 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"'))
1.261 + Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"')
1.262 # generate dvm_key pair in vm_name / .ssh
1.263 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/ssh-keygen -q -t rsa -N \\\"\\\" -C \\\"' + vm_name + '\\\" -f \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\"'))
1.264 + Cygwin.bashExecute('/usr/bin/ssh-keygen -q -t rsa -N \\\"\\\" -C \\\"' + vm_name + '\\\" -f \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\"')
1.265 # move out private key
1.266 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\" \\\"' + machineFolder + '/' + vm_name + '\\\"'))
1.267 + Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\" \\\"' + machineFolder + '/' + vm_name + '\\\"')
1.268 # set permissions for private key
1.269 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"'))
1.270 + Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"')
1.271 # rename public key to authorized_keys
1.272 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key.pub\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"'))
1.273 + Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key.pub\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"')
1.274 # set permissions for authorized_keys
1.275 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"'))
1.276 + Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"')
1.277 # generate iso image with .ssh/authorized keys
1.278 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/genisoimage -J -R -o \\\"' + machineFolder + '/' + vm_name + '/'+ vm_name + '.iso\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"'))
1.279 + Cygwin.bashExecute('/usr/bin/genisoimage -J -R -o \\\"' + machineFolder + '/' + vm_name + '/'+ vm_name + '.iso\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"')
1.280
1.281 # attaches generated ssh public cert to guest vm
1.282 - def attachCertificateISO(self, vm_name):
1.283 - result = Cygwin.checkResult(Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 1 --device 0 --type dvddrive --mtype readonly --medium \"' + VMManager.machineFolder + '\\' + vm_name + '\\'+ vm_name + '.iso\"'))
1.284 - return result
1.285 + def attachCertificate(self, vm_name):
1.286 + if self.isCertificateAttached(vm_name):
1.287 + self.detachCertificate(vm_name)
1.288 + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 1 --device 0 --type dvddrive --mtype readonly --medium \"' + VMManager.machineFolder + '\\' + vm_name + '\\'+ vm_name + '.iso\"')
1.289
1.290 + # return true if storage is attached
1.291 + def isCertificateAttached(self, vm_name):
1.292 + info = self.getVMInfo(vm_name)
1.293 + return (info['SATA-1-0']!='none')
1.294 +
1.295 + # detach storage from controller
1.296 + def detachCertificate(self, vm_name):
1.297 + if self.isCertificateAttached(vm_name):
1.298 + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 1 --device 0 --type hdd --medium none')
1.299 +
1.300 # wait for machine to come up
1.301 - def waitStartup(self, vm_name, timeout_ms = 1000):
1.302 - #Cygwin.checkResult(Cygwin.vboxExecute('guestproperty wait ' + vm_name + ' SDVMStarted --timeout ' + str(timeout_ms) + ' --fail-on-timeout', try_count = 60))
1.303 + def waitStartup(self, vm_name):
1.304 + #Cygwin.vboxExecute('guestproperty wait ' + vm_name + ' SDVMStarted --timeout ' + str(timeout_ms) + ' --fail-on-timeout', try_count = 60)
1.305 started = False
1.306 while not started:
1.307 - result = Cygwin.checkResult(Cygwin.vboxExecute('guestproperty get ' + vm_name + ' SDVMStarted'))[1]
1.308 + result = Cygwin.vboxExecute('guestproperty get ' + vm_name + ' SDVMStarted')[1]
1.309 if "Value: True" in result:
1.310 started = True
1.311 else:
1.312 @@ -657,7 +672,7 @@
1.313
1.314 #Small function to check if the mentioned location is a directory
1.315 def isDirectory(self, path):
1.316 - result = Cygwin.checkResult(Cygwin.cmdExecute('dir ' + path + ' | FIND ".."'))
1.317 + result = Cygwin.cmdExecute('dir ' + path + ' | FIND ".."')
1.318 return string.find(result[1], 'DIR',)
1.319
1.320 def genNetworkDrive(self):
1.321 @@ -798,7 +813,7 @@
1.322 else:
1.323 browser = '\\\"/usr/bin/chromium\\\"'
1.324 self.vmm.browsingManager.started.wait()
1.325 - result = Cygwin.checkResult(Cygwin.sshExecuteX11(browser, self.vmm.browsingManager.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vmm.browsingManager.vm_name + '/dvm_key'))
1.326 + result = Cygwin.sshExecuteX11(browser, self.vmm.browsingManager.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vmm.browsingManager.vm_name + '/dvm_key')
1.327 self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/')
1.328 except:
1.329 logger.info("BrowsingHandler closing. Restarting browsing SDVM.")
1.330 @@ -849,13 +864,13 @@
1.331
1.332 try:
1.333 self.vm_name = self.vmm.newSDVM()
1.334 - self.vmm.storageAttach(self.vm_name)
1.335 - self.vmm.genCertificateISO(self.vm_name)
1.336 - self.vmm.attachCertificateISO(self.vm_name)
1.337 + self.vmm.attachStorage(self.vm_name)
1.338 + self.vmm.genCertificate(self.vm_name)
1.339 + self.vmm.attachCertificate(self.vm_name)
1.340
1.341 self.vmm.startVM(self.vm_name)
1.342
1.343 - self.ip_addr = self.vmm.waitStartup(self.vm_name, timeout_ms=30000)
1.344 + self.ip_addr = self.vmm.waitStartup(self.vm_name)
1.345 if self.ip_addr == None:
1.346 logger.error("Failed to get ip address")
1.347 continue
1.348 @@ -893,11 +908,11 @@
1.349 self.appDataDir = Cygwin.cygPath(path)
1.350 logger.info("Restoring browser settings in AppData dir " + self.appDataDir)
1.351 # create OpenSecurity settings dir on local machine user home /AppData/Roaming
1.352 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity\\\"'))
1.353 + Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity\\\"')
1.354 # create chromium settings dir on local machine if not existing
1.355 - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity/chromium\\\"'))
1.356 + Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity/chromium\\\"')
1.357 # create chromium settings dir on remote machine if not existing
1.358 - Cygwin.checkResult(Cygwin.sshExecute('"mkdir -p \\\"/home/osecuser/.config\\\""', self.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key'))
1.359 + Cygwin.sshExecute('"mkdir -p \\\"/home/osecuser/.config\\\""', self.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key')
1.360 #restore settings on vm
1.361 self.vmm.restoreFile(self.appDataDir + '/OpenSecurity/chromium', '/home/osecuser/.config/')
1.362 self.started.set()
1.363 @@ -963,9 +978,9 @@
1.364 showTrayMessage('Mounting device...', 7000)
1.365 if (self.attachedRSDs and False) or (new_device not in self.attachedRSDs.values()):
1.366 new_sdvm = self.vmm.newSDVM()
1.367 - self.vmm.storageAttach(new_sdvm)
1.368 + self.vmm.attachStorage(new_sdvm)
1.369 self.vmm.startVM(new_sdvm)
1.370 - new_ip = self.vmm.waitStartup(new_sdvm, timeout_ms=30000)
1.371 + new_ip = self.vmm.waitStartup(new_sdvm)
1.372 if new_ip == None:
1.373 logger.error("Error getting IP address of SDVM. Cleaning up.")
1.374 self.vmm.poweroffVM(new_sdvm)