From ef43dff37c6db915757184ad51bc017d45e70c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 13 Mar 2013 14:02:13 -0300
Subject: Notify the user of pkexec/polkit/openvpn checks

---
 src/leap/services/eip/vpnlaunchers.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'src/leap/services')

diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py
index 6f277481..9345c0b3 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/services/eip/vpnlaunchers.py
@@ -38,6 +38,18 @@ class VPNLauncherException(Exception):
     pass
 
 
+class OpenVPNNotFoundException(VPNLauncherException):
+    pass
+
+
+class EIPNoPolkitAuthAgentAvailable(VPNLauncherException):
+    pass
+
+
+class EIPNoPkexecAvailable(VPNLauncherException):
+    pass
+
+
 class VPNLauncher:
     """
     Abstract launcher class
@@ -45,7 +57,6 @@ class VPNLauncher:
 
     __metaclass__ = ABCMeta
 
-    # TODO: document parameters
     @abstractmethod
     def get_vpn_command(self, eipconfig=None, providerconfig=None,
                         socket_host=None, socket_port=None):
@@ -137,9 +148,9 @@ def _has_updown_scripts(path):
 
 
 def _is_auth_agent_running():
-    return bool(
+    return len(
         commands.getoutput(
-            'ps aux | grep polkit-[g]nome-authentication-agent-1'))
+            'ps aux | grep polkit-[g]nome-authentication-agent-1')) > 0
 
 
 class LinuxVPNLauncher(VPNLauncher):
@@ -181,7 +192,7 @@ class LinuxVPNLauncher(VPNLauncher):
 
         openvpn_possibilities = which(self.OPENVPN_BIN)
         if len(openvpn_possibilities) == 0:
-            raise VPNLauncherException("We couldn't find openvpn")
+            raise OpenVPNNotFoundException()
 
         openvpn = openvpn_possibilities[0]
         args = []
@@ -196,8 +207,10 @@ class LinuxVPNLauncher(VPNLauncher):
             else:
                 logger.warning("No polkit auth agent found. pkexec " +
                                "will use its own auth agent.")
+                raise EIPNoPolkitAuthAgentAvailable()
         else:
             logger.warning("System has no pkexec")
+            raise EIPNoPkexecAvailable()
 
         # TODO: handle verbosity
 
-- 
cgit v1.2.3