OpenSecurity/bin/cygwin.py
changeset 135 c9499f5166c7
parent 110 490a78181935
child 143 36948a118f71
     1.1 --- a/OpenSecurity/bin/cygwin.py	Wed Apr 02 10:41:00 2014 +0100
     1.2 +++ b/OpenSecurity/bin/cygwin.py	Tue Apr 29 15:40:48 2014 +0100
     1.3 @@ -199,14 +199,14 @@
     1.4          return Cygwin.execute(Cygwin.cygwin_bash, command, wait_return, window, stdin = stdin, stdout = stdout, stderr = stderr)
     1.5      
     1.6      @staticmethod
     1.7 -    def cmdExecute(command, wait_return=True, window = False, bash_opts=''):
     1.8 +    def cmdExecute(command, wait_return=True, window = False):
     1.9          command = ' /c ' + command 
    1.10          return Cygwin.execute(Cygwin.win_cmd, command, wait_return, window)
    1.11  
    1.12      # executes command over ssh on guest vm
    1.13      @staticmethod
    1.14      def sshExecute(command, address, user_name, certificate, wait_return=True, window = False):
    1.15 -        command = ' -v -i "' + certificate + '" ' + user_name + '@' + address + ' ' + command        
    1.16 +        command = ' -v -o StrictHostKeyChecking=no -i "' + certificate + '" ' + user_name + '@' + address + ' ' + command        
    1.17          return Cygwin.execute(Cygwin.cygwin_ssh, command, wait_return, window)     
    1.18      
    1.19      #machineFolder + '/' + vm_name + '/dvm_key
    1.20 @@ -218,7 +218,7 @@
    1.21      @staticmethod
    1.22      def sshExecuteX11(command, address, user_name, certificate, wait_return=True):
    1.23          #return call('"'+ Cygwin.cygwin_bash +'" -l -c "' + 'DISPLAY=:0.0 ssh -Y -i \\\"' + certificate +'\\\" ' + user_name + '@' + address + ' ' + command + '"', shell=True)
    1.24 -        return Cygwin.bashExecute('DISPLAY=:0.0 ssh -Y -i \\\"' + certificate +'\\\" ' + user_name + '@' + address + ' ' + command + '')
    1.25 +        return Cygwin.bashExecute('DISPLAY=:0.0 ssh -Y -o StrictHostKeyChecking=no -i \\\"' + certificate +'\\\" ' + user_name + '@' + address + ' ' + command + '')
    1.26  
    1.27      @staticmethod
    1.28      def is_X11_running():
    1.29 @@ -279,4 +279,4 @@
    1.30      #print('C:\\Program Files\\OpenSecurity: ' + c.cygPath('C:\\Program Files\\OpenSecurity'))
    1.31      
    1.32      sys.exit(0)
    1.33 -    
    1.34 +