1.1 --- a/OpenSecurity/bin/vmmanager.pyw	Thu Jul 17 10:20:10 2014 +0100
     1.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Fri Jul 18 13:45:09 2014 +0100
     1.3 @@ -674,9 +674,9 @@
     1.4          return network_drives
     1.5      
     1.6      # handles browsing request    
     1.7 -    def handleBrowsingRequest(self):
     1.8 +    def handleBrowsingRequest(self, proxy):
     1.9          showTrayMessage('Starting Secure Browsing...', 7000)
    1.10 -        handler = BrowsingHandler(self)
    1.11 +        handler = BrowsingHandler(self, proxy)
    1.12          handler.start()
    1.13          return 'ok'
    1.14      
    1.15 @@ -723,14 +723,21 @@
    1.16  #handles browsing session creation 
    1.17  class BrowsingHandler(threading.Thread):
    1.18      vmm = None
    1.19 -    def __init__(self, vmmanager):
    1.20 -         threading.Thread.__init__(self)
    1.21 -         self.vmm = vmmanager
    1.22 +    proxy = None
    1.23 +    def __init__(self, vmmanager, proxy):
    1.24 +        threading.Thread.__init__(self)
    1.25 +        self.vmm = vmmanager
    1.26 +        self.proxy = proxy
    1.27          
    1.28      def run(self):
    1.29          #browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
    1.30 -        browser = '\\\"/usr/bin/chromium\\\"'
    1.31 +        #browser = '\\\"/usr/bin/chromium\\\"'
    1.32 +        
    1.33          try:
    1.34 +            if self.proxy:
    1.35 +                browser = '\\\"export http_proxy='+self.proxy+'; /usr/bin/chromium\\\"'
    1.36 +            else:
    1.37 +                browser = '\\\"/usr/bin/chromium\\\"'
    1.38              self.vmm.browsingManager.started.wait() 
    1.39              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.40              self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/')
    1.41 @@ -899,7 +906,7 @@
    1.42                      new_sdvm = self.vmm.newSDVM()
    1.43                      self.vmm.storageAttach(new_sdvm)
    1.44                      self.vmm.startVM(new_sdvm)
    1.45 -                    new_ip = self.vmm.waitStartup(new_sdvm)
    1.46 +                    new_ip = self.vmm.waitStartup(new_sdvm, timeout_ms=30000)
    1.47                      if new_ip == None:
    1.48                          logger.error("Error getting IP address of SDVM. Cleaning up.")
    1.49                          self.vmm.poweroffVM(new_sdvm)