1.1 --- a/OpenSecurity/bin/vmmanager.py	Thu Jan 09 10:44:42 2014 +0100
     1.2 +++ b/OpenSecurity/bin/vmmanager.py	Mon Jan 27 15:12:33 2014 +0000
     1.3 @@ -15,6 +15,9 @@
     1.4  import time
     1.5  import string
     1.6  
     1.7 +#import shutil
     1.8 +#import stat
     1.9 +
    1.10  
    1.11  DEBUG = True
    1.12  class VMManagerException(Exception):
    1.13 @@ -284,6 +287,57 @@
    1.14      #generates ISO containing authorized_keys for use with guest VM
    1.15      def genCertificateISO(self, vm_name):
    1.16          machineFolder = self.getDefaultMachineFolder()
    1.17 +
    1.18 +        ## create a SSH key pair in a machine subfolder
    1.19 +        #vm_folder = os.path.join(machineFolder, vm_name)
    1.20 +        #ssh_folder = os.path.join(vm_folder, '.ssh')
    1.21 +        #try:
    1.22 +        #    os.mkdir(ssh_folder)
    1.23 +        #except:
    1.24 +        #    pass
    1.25 +        #ssh_keyfile = os.path.join(ssh_folder, 'dvm_key')
    1.26 +        #
    1.27 +        # delete old key file (if existing)
    1.28 +        #try:
    1.29 +        #    os.remove(ssh_keyfile)
    1.30 +        #except:
    1.31 +        #    pass
    1.32 +        #
    1.33 +        ## create new key file    
    1.34 +        #try:
    1.35 +        #    p = Cygwin()(['/bin/ssh-keygen', '-q', '-t', 'rsa', '-N', '', '-C', vm_name, '-f', ssh_keyfile])
    1.36 +        #    p.wait()
    1.37 +        #except:
    1.38 +        #    sys.stderr.write('failed to create a new SSH key pair as: ' + ssh_keyfile + '\n')
    1.39 +        #    return
    1.40 +        #try:
    1.41 +        #    os.chmod(ssh_keyfile,  stat.S_IREAD)
    1.42 +        #except:
    1.43 +        #    pass
    1.44 +        #
    1.45 +        ## move out private key
    1.46 +        #try:
    1.47 +        #    os.rename(ssh_keyfile, os.path.join(vm_folder, 'dvm_key'))
    1.48 +        #except : 
    1.49 +        #    sys.stderr.write('failed to move private SSH key\n')
    1.50 +        #    return
    1.51 +        #
    1.52 +        ## rename public key to 'authorized_keys'
    1.53 +        #try:
    1.54 +        #    os.rename(ssh_keyfile + '.pub', os.path.join(ssh_folder, 'authorized_keys'))
    1.55 +        #except:
    1.56 +        #    sys.stderr.write('failed to rename public key to "authorized_keys"\n')
    1.57 +        #    return
    1.58 +        #
    1.59 +        ## generate ISO image  
    1.60 +        #iso_file = os.path.join(vm_folder, vm_name + '.iso')
    1.61 +        #try:
    1.62 +        #    p = Cygwin()(['/bin/genisoimage', '-J', '-R', '-o', iso_file, ssh_folder])
    1.63 +        #    p.wait()
    1.64 +        #except:
    1.65 +        #    sys.stderr.write('failed to create ISO image.\n')
    1.66 +        #    return
    1.67 +
    1.68          # create .ssh folder in vm_name
    1.69          cmd = self.cygwin_path+'bash.exe --login -c \"mkdir -p \\\"' + machineFolder + '\\' + vm_name + '\\.ssh\\\"\"'
    1.70          self.execute(cmd)
    1.71 @@ -468,4 +522,4 @@
    1.72      time.sleep(60)
    1.73      #cmd = "c:\\cygwin64\\bin\\bash.exe --login -c \"/bin/ls\""
    1.74      #man.execute(cmd)
    1.75 -    
    1.76 \ No newline at end of file
    1.77 +