From 0bb8cca027ab32a54f6792ab1b1368e2f1845368 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 3 Aug 2012 10:46:22 +0900
Subject: check also for a suitable polkit-authentication-agent running

fix #382.
---
 src/leap/baseapp/mainwindow.py | 10 ++++++++++
 src/leap/baseapp/permcheck.py  |  7 +++++++
 src/leap/eip/conductor.py      |  6 +++++-
 src/leap/eip/config.py         | 13 +++++++++----
 4 files changed, 31 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index cd6600b4..0e2f4e1d 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -77,6 +77,16 @@ class LeapWindow(QMainWindow):
 
         print('debugmode:%s' % self.debugmode)
 
+        if self.conductor.missing_auth_agent is True:
+            dialog = ErrorDialog()
+            dialog.warningMessage(
+                'We could not find any authentication '
+                'agent in your system.<br/>'
+                'Make sure you have '
+                '<b>polkit-gnome-authentication-agent-1</b> '
+                'running and try again.',
+                'error')
+
         if self.conductor.missing_pkexec is True:
             dialog = ErrorDialog()
             dialog.warningMessage(
diff --git a/src/leap/baseapp/permcheck.py b/src/leap/baseapp/permcheck.py
index 58748761..6b74cb6e 100644
--- a/src/leap/baseapp/permcheck.py
+++ b/src/leap/baseapp/permcheck.py
@@ -1,3 +1,4 @@
+import commands
 import os
 
 from leap.util.fileutil import which
@@ -8,3 +9,9 @@ def is_pkexec_in_system():
     if not pkexec_path:
         return False
     return os.access(pkexec_path, os.X_OK)
+
+
+def is_auth_agent_running():
+    return bool(
+        commands.getoutput(
+            'ps aux | grep polkit-[g]nome-authentication-agent-1'))
diff --git a/src/leap/eip/conductor.py b/src/leap/eip/conductor.py
index eeb7f8f8..7b927143 100644
--- a/src/leap/eip/conductor.py
+++ b/src/leap/eip/conductor.py
@@ -10,7 +10,7 @@ from leap.util.coroutines import spawn_and_watch_process
 
 
 from leap.eip.config import (get_config, build_ovpn_command,
-                             EIPNoPkexecAvailable)
+                             EIPNoPkexecAvailable, EIPNoPolkitAuthAgentAvailable)
 from leap.eip.vpnwatcher import EIPConnectionStatus, status_watcher
 from leap.eip.vpnmanager import OpenVPNManager, ConnectionRefusedError
 
@@ -90,6 +90,7 @@ to be triggered for each one of them.
         self.proto = None
 
         self.missing_pkexec = False
+        self.missing_auth_agent = False
         self.command = None
         self.args = None
 
@@ -132,6 +133,9 @@ to be triggered for each one of them.
             try:
                 command, args = build_ovpn_command(config,
                                                    debug=self.debug)
+            except EIPNoPolkitAuthAgentAvailable:
+                command = args = None
+                self.missing_auth_agent = True
             except EIPNoPkexecAvailable:
                 command = args = None
                 self.missing_pkexec = True
diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py
index 4577837a..9583720e 100644
--- a/src/leap/eip/config.py
+++ b/src/leap/eip/config.py
@@ -4,13 +4,18 @@ import os
 import platform
 
 from leap.util.fileutil import which, mkdir_p
-from leap.baseapp.permcheck import is_pkexec_in_system
+from leap.baseapp.permcheck import (is_pkexec_in_system,
+                                    is_auth_agent_running)
 
 
 class EIPNoPkexecAvailable(Exception):
     pass
 
 
+class EIPNoPolkitAuthAgentAvailable(Exception):
+    pass
+
+
 def build_ovpn_options(daemon=False):
     """
     build a list of options
@@ -34,6 +39,7 @@ def build_ovpn_options(daemon=False):
 
     opts = []
     opts.append('--persist-tun')
+    opts.append('--persist-key')
 
     # set user and group
     opts.append('--user')
@@ -104,9 +110,8 @@ def build_ovpn_command(config, debug=False):
         if not is_pkexec_in_system():
             raise EIPNoPkexecAvailable
 
-        #TBD --
-        #if not is_auth_agent_running()
-        # raise EIPNoPolkitAuthAgentAvailable
+        if not is_auth_agent_running():
+            raise EIPNoPolkitAuthAgentAvailable
 
         command.append('pkexec')
 
-- 
cgit v1.2.3