Merge remote-tracking branch 'kali/feature/openvpn_verbosity' into develop

2 files changed, 42 insertions, 11 deletions

diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py
index 526f1ba4..dadbf859 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/services/eip/vpnlaunchers.py
@@ -352,7 +352,7 @@ class LinuxVPNLauncher(VPNLauncher):
         return None
 
     def get_vpn_command(self, eipconfig=None, providerconfig=None,
-                        socket_host=None, socket_port="unix"):
+                        socket_host=None, socket_port="unix", openvpn_verb=1):
         """
         Returns the platform dependant vpn launching command. It will
         look for openvpn in the regular paths and algo in
@@ -375,6 +375,9 @@ class LinuxVPNLauncher(VPNLauncher):
                             socket, or port otherwise
         :type socket_port: str
 
+        :param openvpn_verb: openvpn verbosity wanted
+        :type openvpn_verb: int
+
         :return: A VPN command ready to be launched
         :rtype: list
         """
@@ -404,7 +407,7 @@ class LinuxVPNLauncher(VPNLauncher):
             args.append(openvpn)
             openvpn = first(pkexec)
 
-        # TODO: handle verbosity
+        args += ['--verb', '%d' % (openvpn_verb,)]
 
         gateway_selector = VPNGatewaySelector(eipconfig)
         gateways = gateway_selector.get_gateways()
@@ -604,7 +607,7 @@ class DarwinVPNLauncher(VPNLauncher):
         return self.COCOASUDO, args
 
     def get_vpn_command(self, eipconfig=None, providerconfig=None,
-                        socket_host=None, socket_port="unix"):
+                        socket_host=None, socket_port="unix", openvpn_verb=1):
         """
         Returns the platform dependant vpn launching command
 
@@ -623,6 +626,9 @@ class DarwinVPNLauncher(VPNLauncher):
                             socket, or port otherwise
         :type socket_port: str
 
+        :param openvpn_verb: openvpn verbosity wanted
+        :type openvpn_verb: int
+
         :return: A VPN command ready to be launched
         :rtype: list
         """
@@ -651,7 +657,7 @@ class DarwinVPNLauncher(VPNLauncher):
         openvpn = first(openvpn_possibilities)
         args = [openvpn]
 
-        # TODO: handle verbosity
+        args += ['--verb', '%d' % (openvpn_verb,)]
 
         gateway_selector = VPNGatewaySelector(eipconfig)
         gateways = gateway_selector.get_gateways()
@@ -768,9 +774,10 @@ class WindowsVPNLauncher(VPNLauncher):
     OPENVPN_BIN = 'openvpn_leap.exe'
 
     # XXX UPDOWN_FILES ... we do not have updown files defined yet!
+    # (and maybe we won't)
 
     def get_vpn_command(self, eipconfig=None, providerconfig=None,
-                        socket_host=None, socket_port="9876"):
+                        socket_host=None, socket_port="9876", openvpn_verb=1):
         """
         Returns the platform dependant vpn launching command. It will
         look for openvpn in the regular paths and algo in
@@ -780,14 +787,20 @@ class WindowsVPNLauncher(VPNLauncher):
 
         :param eipconfig: eip configuration object
         :type eipconfig: EIPConfig
+
         :param providerconfig: provider specific configuration
         :type providerconfig: ProviderConfig
+
         :param socket_host: either socket path (unix) or socket IP
         :type socket_host: str
+
         :param socket_port: either string "unix" if it's a unix
         socket, or port otherwise
         :type socket_port: str
 
+        :param openvpn_verb: the openvpn verbosity wanted
+        :type openvpn_verb: int
+
         :return: A VPN command ready to be launched
         :rtype: list
         """
@@ -810,8 +823,7 @@ class WindowsVPNLauncher(VPNLauncher):
 
         openvpn = first(openvpn_possibilities)
         args = []
-
-        # TODO: handle verbosity
+        args += ['--verb', '%d' % (openvpn_verb,)]
 
         gateway_selector = VPNGatewaySelector(eipconfig)
         gateways = gateway_selector.get_gateways()
diff --git a/src/leap/services/eip/vpnprocess.py b/src/leap/services/eip/vpnprocess.py
index c4bdb30c..5b07a3cf 100644
--- a/src/leap/services/eip/vpnprocess.py
+++ b/src/leap/services/eip/vpnprocess.py
@@ -80,7 +80,9 @@ class VPN(object):
     TERMINATE_MAXTRIES = 10
     TERMINATE_WAIT = 1  # secs
 
-    def __init__(self):
+    OPENVPN_VERB = "openvpn_verb"
+
+    def __init__(self, **kwargs):
         """
         Instantiate empty attributes and get a copy
         of a QObject containing the QSignals that we will pass along
@@ -92,6 +94,8 @@ class VPN(object):
         self._reactor = reactor
         self._qtsigs = VPNSignals()
 
+        self._openvpn_verb = kwargs.get(self.OPENVPN_VERB, None)
+
     @property
     def qtsigs(self):
         return self._qtsigs
@@ -108,9 +112,12 @@ class VPN(object):
         """
         self._stop_pollers()
         kwargs['qtsigs'] = self.qtsigs
+        kwargs['openvpn_verb'] = self._openvpn_verb
 
         # start the main vpn subprocess
         vpnproc = VPNProcess(*args, **kwargs)
+                             #qtsigs=self.qtsigs,
+                             #openvpn_verb=self._openvpn_verb)
 
         if vpnproc.get_openvpn_process():
             logger.info("Another vpn process is running. Will try to stop it.")
@@ -566,7 +573,12 @@ class VPNManager(object):
                 # we should check that cmdline BEGINS
                 # with openvpn or with our wrapper
                 # (pkexec / osascript / whatever)
-                if "openvpn" in ' '.join(p.cmdline):
+
+                # This needs more work, see #3268, but for the moment
+                # we need to be able to filter out arguments in the form
+                # --openvpn-foo, since otherwise we are shooting ourselves
+                # in the feet.
+                if any(map(lambda s: s.startswith("openvpn"), p.cmdline)):
                     openvpn_process = p
                     break
             except psutil.error.AccessDenied:
@@ -645,7 +657,7 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
     """
 
     def __init__(self, eipconfig, providerconfig, socket_host, socket_port,
-                 qtsigs):
+                 qtsigs, openvpn_verb):
         """
         :param eipconfig: eip configuration object
         :type eipconfig: EIPConfig
@@ -663,6 +675,10 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
         :param qtsigs: a QObject containing the Qt signals used to notify the
                        UI.
         :type qtsigs: QObject
+
+        :param openvpn_verb: the desired level of verbosity in the
+                             openvpn invocation
+        :type openvpn_verb: int
         """
         VPNManager.__init__(self, qtsigs=qtsigs)
         leap_assert_type(eipconfig, EIPConfig)
@@ -682,6 +698,8 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
         self._last_status = None
         self._alive = False
 
+        self._openvpn_verb = openvpn_verb
+
     # processProtocol methods
 
     def connectionMade(self):
@@ -757,7 +775,8 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
             eipconfig=self._eipconfig,
             providerconfig=self._providerconfig,
             socket_host=self._socket_host,
-            socket_port=self._socket_port)
+            socket_port=self._socket_port,
+            openvpn_verb=self._openvpn_verb)
         return map(str, cmd)
 
     # shutdown