# HG changeset patch # User BarthaM@N3SIM1218.D03.arc.local # Date 1408696502 -3600 # Node ID 327f282364b9aab85d869cad71441cfa0b6dd0b5 # Parent 4162648fb1670f363ca148aa4613c02eda96a67d Removed checkResult method from cygwin.py. Created additional tests and force removal of certificate image. Modified the updateTemplate method. Fixed VM startup wait method. diff -r 4162648fb167 -r 327f282364b9 OpenSecurity/bin/cygwin.py --- a/OpenSecurity/bin/cygwin.py Thu Aug 14 09:51:11 2014 +0100 +++ b/OpenSecurity/bin/cygwin.py Fri Aug 22 09:35:02 2014 +0100 @@ -153,7 +153,7 @@ result, res_stdout, res_stderr = None, None, None try: # quote the executable otherwise we run into troubles - # when the path contains spaces and additonal arguments + # when the path contains spaces and additional arguments # are presented as well. # special: invoking bash as login shell here with # an unquoted command does not execute /etc/profile @@ -166,14 +166,15 @@ res_stdout, res_stderr = process.communicate() result = process.returncode logger.debug('Finished: ' + program + ' ' + ''.join(arguments)) - #result = process.wait() - #res_stdout = process.stdout.read(); - #res_stderr = process.stderr.read(); except Exception as ex: res_stderr = ''.join(str(ex.args)) result = 1 - + + if result != 0: + logger.error('Command failed:' + ''.join(res_stderr)) + raise OpenSecurityException('Command failed:' + ''.join(res_stderr)) + return result, res_stdout, res_stderr @staticmethod @@ -182,12 +183,17 @@ result = None while retry < try_count: if Cygwin.executeLock.acquire(True): - result = Cygwin.execute(Cygwin.vbox_man, command, wait_return, window) - Cygwin.executeLock.release() - if result[0] == 0: + try: + result = Cygwin.execute(Cygwin.vbox_man, command, wait_return, window) + except Exception as ex: + Cygwin.executeLock.release() + if (retry+1) == try_count: + raise ex + else: + Cygwin.executeLock.release() return result - retry+=1 - return result + retry+=1 + raise OpenSecurityException('Command max retry reached: ' + ''.join(command)) @staticmethod @@ -206,6 +212,8 @@ # executes command over ssh on guest vm @staticmethod def sshExecute(command, address, user_name, certificate, wait_return=True, window = False): + if command == None or address == None or user_name == None or certificate == None: + raise OpenSecurityException('Invalid parameter value') command = ' -v -o StrictHostKeyChecking=no -i "' + certificate + '" ' + user_name + '@' + address + ' ' + command return Cygwin.execute(Cygwin.cygwin_ssh, command, wait_return, window) @@ -248,9 +256,9 @@ @staticmethod def checkResult(result): - if result[0] != 0: - logger.error('Command failed:' + ''.join(result[2])) - raise OpenSecurityException('Command failed:' + ''.join(result[2])) + #if result[0] != 0: + # logger.error('Command failed:' + ''.join(result[2])) + # raise OpenSecurityException('Command failed:' + ''.join(result[2])) return result # start diff -r 4162648fb167 -r 327f282364b9 OpenSecurity/bin/vmmanager.pyw --- a/OpenSecurity/bin/vmmanager.pyw Thu Aug 14 09:51:11 2014 +0100 +++ b/OpenSecurity/bin/vmmanager.pyw Fri Aug 22 09:35:02 2014 +0100 @@ -163,7 +163,7 @@ # return hosty system properties @staticmethod def getSystemProperties(): - result = Cygwin.checkResult(Cygwin.vboxExecute('list systemproperties')) + result = Cygwin.vboxExecute('list systemproperties') if result[1]=='': return None props = dict((k.strip(),v.strip().strip('"')) for k,v in (line.split(':', 1) for line in result[1].strip().splitlines())) @@ -267,13 +267,13 @@ # list all existing VMs registered with VBox def listVM(self): - result = Cygwin.checkResult(Cygwin.vboxExecute('list vms'))[1] + result = Cygwin.vboxExecute('list vms')[1] vms = list(k.strip().strip('"') for k,_ in (line.split(' ') for line in result.splitlines())) return vms # list running VMs def listRunningVMS(self): - result = Cygwin.checkResult(Cygwin.vboxExecute('list runningvms'))[1] + result = Cygwin.vboxExecute('list runningvms')[1] vms = list(k.strip().strip('"') for k,_ in (line.split(' ') for line in result.splitlines())) return vms @@ -334,7 +334,7 @@ # return the RSDs connected to the host @staticmethod def getExistingRSDs(): - results = Cygwin.checkResult(Cygwin.vboxExecute('list usbhost'))[1] + results = Cygwin.vboxExecute('list usbhost')[1] results = results.split('Host USB Devices:')[1].strip() items = list( "UUID:"+result for result in results.split('UUID:') if result != '') @@ -392,13 +392,13 @@ # attach removable storage device to VM by provision of filter def attachRSD(self, vm_name, rsd_filter): - #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)) - return Cygwin.checkResult(Cygwin.vboxExecute('controlvm ' + vm_name + ' usbattach ' + rsd_filter.uuid )) + #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) + return Cygwin.vboxExecute('controlvm ' + vm_name + ' usbattach ' + rsd_filter.uuid ) # detach removable storage from VM by def detachRSD(self, vm_name, rsd_filter): - #return Cygwin.checkResult(Cygwin.vboxExecute('usbfilter remove 0 --target ' + vm_name)) - return Cygwin.checkResult(Cygwin.vboxExecute('controlvm ' + vm_name + ' usbdetach ' + rsd_filter.uuid )) + #return Cygwin.vboxExecute('usbfilter remove 0 --target ' + vm_name) + return Cygwin.vboxExecute('controlvm ' + vm_name + ' usbdetach ' + rsd_filter.uuid ) # configures hostonly networking and DHCP server. requires admin rights def configureHostNetworking(self): @@ -408,10 +408,10 @@ #Cygwin.vboxExecute(cmd) #cmd = 'vboxmanage hostonlyif create' #Cygwin.vboxExecute(cmd) - Cygwin.checkResult(Cygwin.vboxExecute('hostonlyif ipconfig \"VirtualBox Host-Only Ethernet Adapter\" --ip 192.168.56.1 --netmask 255.255.255.0')) + Cygwin.vboxExecute('hostonlyif ipconfig \"VirtualBox Host-Only Ethernet Adapter\" --ip 192.168.56.1 --netmask 255.255.255.0') #cmd = 'vboxmanage dhcpserver add' #Cygwin.vboxExecute(cmd) - 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')) + 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') def isSDVMExisting(self, vm_name): sdvms = self.listSDVM() @@ -423,10 +423,10 @@ return #remove eventually existing SDVM folder machineFolder = Cygwin.cygPath(VMManager.machineFolder) - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"')) - Cygwin.checkResult(Cygwin.vboxExecute('createvm --name ' + vm_name + ' --ostype Debian --register')) - 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')) - Cygwin.checkResult(Cygwin.vboxExecute('storagectl ' + vm_name + ' --name SATA --add sata --portcount 2')) + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"') + Cygwin.vboxExecute('createvm --name ' + vm_name + ' --ostype Debian --register') + Cygwin.vboxExecute('modifyvm ' + vm_name + ' --memory 768 --vram 10 --cpus 1 --usb on --usbehci on --nic1 hostonly --hostonlyadapter1 \"' + self.hostonlyIF['Name'] + '\" --nic2 nat') + Cygwin.vboxExecute('storagectl ' + vm_name + ' --name SATA --add sata --portcount 2') #create new SecurityDVM with automatically generated name from template (thread safe) def newSDVM(self): @@ -436,10 +436,10 @@ return vm_name # attach storage image to controller - def storageAttach(self, vm_name): + def attachStorage(self, vm_name): if self.isStorageAttached(vm_name): - self.storageDetach(vm_name) - Cygwin.checkResult(Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium \"'+ VMManager.machineFolder + '\SecurityDVM\SecurityDVM.vmdk\"')) + self.detachStorage(vm_name) + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium \"'+ VMManager.machineFolder + '\SecurityDVM\SecurityDVM.vmdk\"') # return true if storage is attached def isStorageAttached(self, vm_name): @@ -447,12 +447,12 @@ return (info['SATA-0-0']!='none') # detach storage from controller - def storageDetach(self, vm_name): + def detachStorage(self, vm_name): if self.isStorageAttached(vm_name): - Cygwin.checkResult(Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium none')) + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 0 --device 0 --type hdd --medium none') def changeStorageType(self, filename, storage_type): - Cygwin.checkResult(Cygwin.vboxExecute('modifyhd \"' + filename + '\" --type ' + storage_type)) + Cygwin.vboxExecute('modifyhd \"' + filename + '\" --type ' + storage_type) # list storage snaphots for VM def updateTemplate(self): @@ -462,29 +462,29 @@ self.waitShutdown(self.vmRootName) # check for updates - self.genCertificateISO(self.vmRootName) - self.attachCertificateISO(self.vmRootName) + self.genCertificate(self.vmRootName) + self.attachCertificate(self.vmRootName) #templateUUID = self.getVMInfo(self.vmRootName)["SATA-ImageUUID-0-0"] #TODO: // verify value templateUUID = self.getTemplateUUID() - self.storageDetach(self.vmRootName) + self.detachStorage(self.vmRootName) self.removeSnapshots(templateUUID) template_storage = VMManager.machineFolder + '\\' + self.vmRootName + '\\' + self.vmRootName + '.vmdk' #TODO:// modify to take vm name as argument self.changeStorageType(template_storage,'normal') - self.storageAttach(self.vmRootName) + self.attachStorage(self.vmRootName) self.startVM(self.vmRootName) - self.waitStartup(self.vmRootName, timeout_ms = 30000) + self.waitStartup(self.vmRootName) tmp_ip = self.getHostOnlyIP(self.vmRootName) tmp_machine_folder = Cygwin.cygPath(VMManager.machineFolder) - Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y update"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key')) - Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y upgrade"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key')) + Cygwin.sshExecute('"sudo apt-get -y update"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key') + Cygwin.sshExecute('"sudo apt-get -y upgrade"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key') #check if reboot is required - 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')) + result = Cygwin.sshExecute('"if [ -f /var/run/reboot-required ]; then echo \\\"Yes\\\"; fi"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key') if "Yes" in result[1]: self.stopVM(self.vmRootName) self.waitShutdown(self.vmRootName) @@ -494,9 +494,9 @@ #self.hibernateVM(self.vmRootName) self.stopVM(self.vmRootName) self.waitShutdown(self.vmRootName) - self.storageDetach(self.vmRootName) + self.detachStorage(self.vmRootName) self.changeStorageType(template_storage,'immutable') - self.storageAttach(self.vmRootName) + self.attachStorage(self.vmRootName) #self.start() @@ -504,7 +504,7 @@ #"SATA-ImageUUID-0-0"="d0af827d-f13a-49be-8ac1-df20b13bda83" @staticmethod def getDiskImages(): - results = Cygwin.checkResult(Cygwin.vboxExecute('list hdds'))[1] + results = Cygwin.vboxExecute('list hdds')[1] results = results.replace('Parent UUID', 'Parent') items = list( "UUID:"+result for result in results.split('UUID:') if result != '') @@ -540,26 +540,26 @@ def removeImage(self, imageUUID): logger.debug('removing snapshot ' + imageUUID) - Cygwin.checkResult(Cygwin.vboxExecute('closemedium disk {' + imageUUID + '} --delete'))#[1] + Cygwin.vboxExecute('closemedium disk {' + imageUUID + '} --delete') # parse result 0%...10%...20%...30%...40%...50%...60%...70%...80%...90%...100% #remove VM from the system. should be used on VMs returned by listSDVMs def removeVM(self, vm_name): logger.info('Removing ' + vm_name) - Cygwin.checkResult(Cygwin.vboxExecute('unregistervm ' + vm_name + ' --delete')) + Cygwin.vboxExecute('unregistervm ' + vm_name + ' --delete') #TODO:// try to close medium if still existing - #Cygwin.checkResult(Cygwin.vboxExecute('closemedium disk {' + hdd['UUID'] + '} --delete'))#[1] + #Cygwin.vboxExecute('closemedium disk {' + hdd['UUID'] + '} --delete') self.removeVMFolder(vm_name) def removeVMFolder(self, vm_name): machineFolder = Cygwin.cygPath(VMManager.machineFolder) - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"')) + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"') # start VM def startVM(self, vm_name): logger.info('Starting ' + vm_name) - #TODO: modify to use Cygwin.checkResult() of make it retry 3 times + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False') result = Cygwin.vboxExecute('startvm ' + vm_name + ' --type headless' ) while 'successfully started' not in result[1]: logger.error("Failed to start SDVM: " + vm_name + " retrying") @@ -575,19 +575,23 @@ # stop VM def stopVM(self, vm_name): logger.info('Sending shutdown signal to ' + vm_name) - Cygwin.checkResult(Cygwin.sshExecute( '"sudo shutdown -h now"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key' )) + Cygwin.sshExecute( '"sudo shutdown -h now"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key' ) + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False') # stop VM def hibernateVM(self, vm_name): logger.info('Sending hibernate-disk signal to ' + vm_name) - Cygwin.checkResult(Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False)) + Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(VMManager.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False) + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False') # poweroff VM def poweroffVM(self, vm_name): if not self.isVMRunning(vm_name): return logger.info('Powering off ' + vm_name) - return Cygwin.checkResult(Cygwin.vboxExecute('controlvm ' + vm_name + ' poweroff')) + Cygwin.vboxExecute('controlvm ' + vm_name + ' poweroff') + Cygwin.vboxExecute('guestproperty set ' + vm_name + ' SDVMStarted False') + # return the hostOnly IP for a running guest or the host def getHostOnlyIP(self, vm_name): @@ -596,7 +600,7 @@ return VMManager.hostonlyIF['IPAddress'] else: logger.info('Getting hostOnly IP address ' + vm_name) - result = Cygwin.checkResult(Cygwin.vboxExecute('guestproperty get ' + vm_name + ' /VirtualBox/GuestInfo/Net/0/V4/IP')) + result = Cygwin.vboxExecute('guestproperty get ' + vm_name + ' /VirtualBox/GuestInfo/Net/0/V4/IP') if result=='': return None result = result[1] @@ -606,43 +610,54 @@ # return the description set for an existing VM def getVMInfo(self, vm_name): - results = Cygwin.checkResult(Cygwin.vboxExecute('showvminfo ' + vm_name + ' --machinereadable'))[1] + results = Cygwin.vboxExecute('showvminfo ' + vm_name + ' --machinereadable')[1] props = dict((k.strip().strip('"'),v.strip().strip('"')) for k,v in (line.split('=', 1) for line in results.splitlines())) return props #generates ISO containing authorized_keys for use with guest VM - def genCertificateISO(self, vm_name): + def genCertificate(self, vm_name): machineFolder = Cygwin.cygPath(VMManager.machineFolder) # remove .ssh folder if exists - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"')) + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"') # remove .ssh folder if exists - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"')) + Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"') # create .ssh folder in vm_name - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"')) + Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"') # generate dvm_key pair in vm_name / .ssh - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/ssh-keygen -q -t rsa -N \\\"\\\" -C \\\"' + vm_name + '\\\" -f \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\"')) + Cygwin.bashExecute('/usr/bin/ssh-keygen -q -t rsa -N \\\"\\\" -C \\\"' + vm_name + '\\\" -f \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\"') # move out private key - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\" \\\"' + machineFolder + '/' + vm_name + '\\\"')) + Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key\\\" \\\"' + machineFolder + '/' + vm_name + '\\\"') # set permissions for private key - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"')) + Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/dvm_key\\\"') # rename public key to authorized_keys - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key.pub\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"')) + Cygwin.bashExecute('/usr/bin/mv \\\"' + machineFolder + '/' + vm_name + '/.ssh/dvm_key.pub\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"') # set permissions for authorized_keys - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"')) + Cygwin.bashExecute('/usr/bin/chmod 500 \\\"' + machineFolder + '/' + vm_name + '/.ssh/authorized_keys\\\"') # generate iso image with .ssh/authorized keys - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/genisoimage -J -R -o \\\"' + machineFolder + '/' + vm_name + '/'+ vm_name + '.iso\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"')) + Cygwin.bashExecute('/usr/bin/genisoimage -J -R -o \\\"' + machineFolder + '/' + vm_name + '/'+ vm_name + '.iso\\\" \\\"' + machineFolder + '/' + vm_name + '/.ssh\\\"') # attaches generated ssh public cert to guest vm - def attachCertificateISO(self, vm_name): - 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\"')) - return result + def attachCertificate(self, vm_name): + if self.isCertificateAttached(vm_name): + self.detachCertificate(vm_name) + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 1 --device 0 --type dvddrive --mtype readonly --medium \"' + VMManager.machineFolder + '\\' + vm_name + '\\'+ vm_name + '.iso\"') + # return true if storage is attached + def isCertificateAttached(self, vm_name): + info = self.getVMInfo(vm_name) + return (info['SATA-1-0']!='none') + + # detach storage from controller + def detachCertificate(self, vm_name): + if self.isCertificateAttached(vm_name): + Cygwin.vboxExecute('storageattach ' + vm_name + ' --storagectl SATA --port 1 --device 0 --type hdd --medium none') + # wait for machine to come up - def waitStartup(self, vm_name, timeout_ms = 1000): - #Cygwin.checkResult(Cygwin.vboxExecute('guestproperty wait ' + vm_name + ' SDVMStarted --timeout ' + str(timeout_ms) + ' --fail-on-timeout', try_count = 60)) + def waitStartup(self, vm_name): + #Cygwin.vboxExecute('guestproperty wait ' + vm_name + ' SDVMStarted --timeout ' + str(timeout_ms) + ' --fail-on-timeout', try_count = 60) started = False while not started: - result = Cygwin.checkResult(Cygwin.vboxExecute('guestproperty get ' + vm_name + ' SDVMStarted'))[1] + result = Cygwin.vboxExecute('guestproperty get ' + vm_name + ' SDVMStarted')[1] if "Value: True" in result: started = True else: @@ -657,7 +672,7 @@ #Small function to check if the mentioned location is a directory def isDirectory(self, path): - result = Cygwin.checkResult(Cygwin.cmdExecute('dir ' + path + ' | FIND ".."')) + result = Cygwin.cmdExecute('dir ' + path + ' | FIND ".."') return string.find(result[1], 'DIR',) def genNetworkDrive(self): @@ -798,7 +813,7 @@ else: browser = '\\\"/usr/bin/chromium\\\"' self.vmm.browsingManager.started.wait() - result = Cygwin.checkResult(Cygwin.sshExecuteX11(browser, self.vmm.browsingManager.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vmm.browsingManager.vm_name + '/dvm_key')) + result = Cygwin.sshExecuteX11(browser, self.vmm.browsingManager.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vmm.browsingManager.vm_name + '/dvm_key') self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/') except: logger.info("BrowsingHandler closing. Restarting browsing SDVM.") @@ -849,13 +864,13 @@ try: self.vm_name = self.vmm.newSDVM() - self.vmm.storageAttach(self.vm_name) - self.vmm.genCertificateISO(self.vm_name) - self.vmm.attachCertificateISO(self.vm_name) + self.vmm.attachStorage(self.vm_name) + self.vmm.genCertificate(self.vm_name) + self.vmm.attachCertificate(self.vm_name) self.vmm.startVM(self.vm_name) - self.ip_addr = self.vmm.waitStartup(self.vm_name, timeout_ms=30000) + self.ip_addr = self.vmm.waitStartup(self.vm_name) if self.ip_addr == None: logger.error("Failed to get ip address") continue @@ -893,11 +908,11 @@ self.appDataDir = Cygwin.cygPath(path) logger.info("Restoring browser settings in AppData dir " + self.appDataDir) # create OpenSecurity settings dir on local machine user home /AppData/Roaming - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity\\\"')) + Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity\\\"') # create chromium settings dir on local machine if not existing - Cygwin.checkResult(Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity/chromium\\\"')) + Cygwin.bashExecute('/usr/bin/mkdir -p \\\"' + self.appDataDir + '/OpenSecurity/chromium\\\"') # create chromium settings dir on remote machine if not existing - Cygwin.checkResult(Cygwin.sshExecute('"mkdir -p \\\"/home/osecuser/.config\\\""', self.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key')) + Cygwin.sshExecute('"mkdir -p \\\"/home/osecuser/.config\\\""', self.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key') #restore settings on vm self.vmm.restoreFile(self.appDataDir + '/OpenSecurity/chromium', '/home/osecuser/.config/') self.started.set() @@ -963,9 +978,9 @@ showTrayMessage('Mounting device...', 7000) if (self.attachedRSDs and False) or (new_device not in self.attachedRSDs.values()): new_sdvm = self.vmm.newSDVM() - self.vmm.storageAttach(new_sdvm) + self.vmm.attachStorage(new_sdvm) self.vmm.startVM(new_sdvm) - new_ip = self.vmm.waitStartup(new_sdvm, timeout_ms=30000) + new_ip = self.vmm.waitStartup(new_sdvm) if new_ip == None: logger.error("Error getting IP address of SDVM. Cleaning up.") self.vmm.poweroffVM(new_sdvm)