From 81613b2ef70e5d73b7c34eb4b78ee63189b45ab6 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 3 Aug 2012 09:42:14 +0900
Subject: pkexec check

---
 src/leap/baseapp/dialogs.py    | 22 ++++++++++++++++++++++
 src/leap/baseapp/mainwindow.py | 25 +++++++++++++++++++++----
 src/leap/baseapp/permcheck.py  | 10 ++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 src/leap/baseapp/dialogs.py
 create mode 100644 src/leap/baseapp/permcheck.py

(limited to 'src/leap/baseapp')

diff --git a/src/leap/baseapp/dialogs.py b/src/leap/baseapp/dialogs.py
new file mode 100644
index 00000000..d4e51a39
--- /dev/null
+++ b/src/leap/baseapp/dialogs.py
@@ -0,0 +1,22 @@
+from PyQt4.QtGui import (QDialog, QFrame, QPushButton, QLabel, QMessageBox)
+
+
+class ErrorDialog(QDialog):
+    def __init__(self, parent=None):
+        super(ErrorDialog, self).__init__(parent)
+
+        frameStyle = QFrame.Sunken | QFrame.Panel
+        self.warningLabel = QLabel()
+        self.warningLabel.setFrameStyle(frameStyle)
+        self.warningButton = QPushButton("QMessageBox.&warning()")
+
+    def warningMessage(self, msg, label):
+        msgBox = QMessageBox(QMessageBox.Warning,
+                             "QMessageBox.warning()", msg,
+                             QMessageBox.NoButton, self)
+        msgBox.addButton("&Ok", QMessageBox.AcceptRole)
+        msgBox.addButton("&Cancel", QMessageBox.RejectRole)
+        if msgBox.exec_() == QMessageBox.AcceptRole:
+            self.warningLabel.setText("Save Again")
+        else:
+            self.warningLabel.setText("Continue")
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index f2c48acc..fec49282 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -11,8 +11,9 @@ from PyQt4.QtGui import (QMainWindow, QWidget, QVBoxLayout, QMessageBox,
                          QTextBrowser, qApp)
 from PyQt4.QtCore import (pyqtSlot, pyqtSignal, QTimer)
 
+from leap.baseapp.dialogs import ErrorDialog
+from leap.eip.conductor import EIPConductor, EIPNoCommandError
 from leap.gui import mainwindow_rc
-from leap.eip.conductor import EIPConductor
 
 
 class LeapWindow(QMainWindow):
@@ -64,15 +65,24 @@ class LeapWindow(QMainWindow):
         # we pass a tuple of signals that will be
         # triggered when status changes.
         #
+        self.trayIcon.show()
         config_file = getattr(opts, 'config_file', None)
+
         self.conductor = EIPConductor(
             watcher_cb=self.newLogLine.emit,
             config_file=config_file,
             status_signals=(self.statusChange.emit, ))
 
-        self.trayIcon.show()
+        if self.conductor.missing_pkexec is True:
+            dialog = ErrorDialog()
+            dialog.warningMessage(
+                'We could not find <b>pkexec</b> in your '
+                'system.<br/> Do you want to try '
+                '<b>setuid workaround</b>? '
+                '(<i>DOES NOTHING YET</i>)',
+                'error')
 
-        self.setWindowTitle("Leap")
+        self.setWindowTitle("LEAP Client")
         self.resize(400, 300)
 
         self.set_statusbarMessage('ready')
@@ -316,7 +326,14 @@ technolust</i>")
         stub for running child process with vpn
         """
         if self.vpn_service_started is False:
-            self.conductor.connect()
+            try:
+                self.conductor.connect()
+            except EIPNoCommandError:
+                dialog = ErrorDialog()
+                dialog.warningMessage(
+                    'No suitable openvpn command found. '
+                    '<br/>(Might be a permissions problem)',
+                    'error')
             if self.debugmode:
                 self.startStopButton.setText('&Disconnect')
             self.vpn_service_started = True
diff --git a/src/leap/baseapp/permcheck.py b/src/leap/baseapp/permcheck.py
new file mode 100644
index 00000000..58748761
--- /dev/null
+++ b/src/leap/baseapp/permcheck.py
@@ -0,0 +1,10 @@
+import os
+
+from leap.util.fileutil import which
+
+
+def is_pkexec_in_system():
+    pkexec_path = which('pkexec')
+    if not pkexec_path:
+        return False
+    return os.access(pkexec_path, os.X_OK)
-- 
cgit v1.2.3