From d45338761e3e6774809fd827060928876aa6696c Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 29 Sep 2017 08:29:57 -0700 Subject: [bug] fixes needed to launch vpn on mac after refactor --- src/leap/bitmask/vpn/launcher.py | 5 +++++ src/leap/bitmask/vpn/launchers/darwin.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/leap/bitmask/vpn/launcher.py b/src/leap/bitmask/vpn/launcher.py index 6dd01596..e14be165 100644 --- a/src/leap/bitmask/vpn/launcher.py +++ b/src/leap/bitmask/vpn/launcher.py @@ -186,5 +186,10 @@ class VPNLauncher(object): '--key', vpnconfig.get_client_cert_path(providerconfig) ] + # TODO -- get platform specific launcher args + if IS_MAC: + args += [ + '--script-security', '2'] + command_and_args = [openvpn_path] + args return command_and_args diff --git a/src/leap/bitmask/vpn/launchers/darwin.py b/src/leap/bitmask/vpn/launchers/darwin.py index ed1c034c..08772dca 100644 --- a/src/leap/bitmask/vpn/launchers/darwin.py +++ b/src/leap/bitmask/vpn/launchers/darwin.py @@ -91,3 +91,6 @@ class DarwinVPNLauncher(VPNLauncher): def kill_previous_openvpn(): pass + + def terminate_or_kill(self, terminatefun, killfun, proc): + terminatefun() -- cgit v1.2.3