1.1 --- a/OpenSecurity/bin/vmmanager.pyw	Fri Sep 05 12:28:30 2014 +0100
     1.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Wed Sep 24 16:40:43 2014 +0100
     1.3 @@ -740,9 +740,9 @@
     1.4          return network_drives
     1.5      
     1.6      # handles browsing request    
     1.7 -    def handleBrowsingRequest(self, proxy):
     1.8 +    def handleBrowsingRequest(self, proxy, wpad):
     1.9          showTrayMessage('Starting Secure Browsing...', 7000)
    1.10 -        handler = BrowsingHandler(self, proxy)
    1.11 +        handler = BrowsingHandler(self, proxy, wpad)
    1.12          handler.start()
    1.13          return 'ok'
    1.14      
    1.15 @@ -958,20 +958,25 @@
    1.16  class BrowsingHandler(threading.Thread):
    1.17      vmm = None
    1.18      proxy = None
    1.19 -    def __init__(self, vmmanager, proxy):
    1.20 +    wpad = None
    1.21 +    def __init__(self, vmmanager, proxy, wpad):
    1.22          threading.Thread.__init__(self)
    1.23          self.vmm = vmmanager
    1.24          self.proxy = proxy
    1.25 +        self.wpad = wpad
    1.26          
    1.27      def run(self):
    1.28          #browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
    1.29          #browser = '\\\"/usr/bin/chromium\\\"'
    1.30          
    1.31          try:
    1.32 -            if self.proxy:
    1.33 +            if self.wpad:
    1.34 +                browser = '\\\"/usr/bin/chromium --proxy-pac-url=\\\"'+self.wpad+'\\\"\\\"'
    1.35 +            elif self.proxy:
    1.36                  browser = '\\\"export http_proxy='+self.proxy+'; /usr/bin/chromium\\\"'
    1.37              else:
    1.38                  browser = '\\\"/usr/bin/chromium\\\"'
    1.39 +                
    1.40              self.vmm.browsingManager.started.wait() 
    1.41              result = Cygwin.sshExecuteX11(browser, self.vmm.browsingManager.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vmm.browsingManager.vm_name + '/dvm_key')
    1.42              self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/')