1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Fri Sep 05 12:28:30 2014 +0100
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Wed Sep 24 16:40:43 2014 +0100
     1.3 @@ -34,9 +34,9 @@
     1.4  # imports
     1.5  
     1.6  import json
     1.7 -import os
     1.8 +#import os
     1.9  import os.path
    1.10 -import subprocess
    1.11 +#import subprocess
    1.12  import sys
    1.13  import tempfile
    1.14  import web
    1.15 @@ -102,9 +102,12 @@
    1.16          global gvm_mgr
    1.17          try:
    1.18              proxy = None
    1.19 +            wpad = None
    1.20              if 'ProxyServer' in args:
    1.21                  proxy = args['ProxyServer']
    1.22 -            result = gvm_mgr.handleBrowsingRequest(proxy)
    1.23 +            if 'ProxyAutoConfigURL' in args:
    1.24 +                wpad = args['ProxyAutoConfigURL']
    1.25 +            result = gvm_mgr.handleBrowsingRequest(proxy, wpad)
    1.26              return result
    1.27          except:
    1.28              raise web.internalerror()
    1.29 @@ -258,7 +261,7 @@
    1.30          global gvm_mgr
    1.31          command = '/' + command
    1.32          showTrayMessage('Launching application in isolated VM...', 7000)
    1.33 -        result = Cygwin.sshExecuteX11(command, gvm_mgr.getHostOnlyIP(name), 'osecuser', Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/' + name + '/dvm_key'  )
    1.34 +        Cygwin.sshExecuteX11(command, gvm_mgr.getHostOnlyIP(name), 'osecuser', Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/' + name + '/dvm_key'  )
    1.35          return 'Command ' + str(command) + ' started on VM "' + name + '" with IP ' + gvm_mgr.getHostOnlyIP(name)
    1.36      
    1.37