From 530e10214a6f018909714b288d997df13ab4f9df Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 8 Aug 2012 06:53:10 +0900
Subject: check for bad permissions on vpn key files

---
 src/leap/eip/conductor.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/leap/eip/conductor.py')

diff --git a/src/leap/eip/conductor.py b/src/leap/eip/conductor.py
index 243f1fde..3f40f068 100644
--- a/src/leap/eip/conductor.py
+++ b/src/leap/eip/conductor.py
@@ -5,15 +5,16 @@ from __future__ import (division, unicode_literals, print_function)
 #import threading
 from functools import partial
 import logging
-import os
 
 from leap.util.coroutines import spawn_and_watch_process
 
-
+# XXX import eip.config as eipconfig
 from leap.eip.config import (get_config, build_ovpn_command,
                              check_or_create_default_vpnconf,
+                             check_vpn_keys,
                              EIPNoPkexecAvailable,
-                             EIPNoPolkitAuthAgentAvailable)
+                             EIPNoPolkitAuthAgentAvailable,
+                             EIPInitBadKeyFilePermError)
 from leap.eip.vpnwatcher import EIPConnectionStatus, status_watcher
 from leap.eip.vpnmanager import OpenVPNManager, ConnectionRefusedError
 
@@ -21,6 +22,7 @@ logger = logging.getLogger(name=__name__)
 
 
 # TODO Move exceptions to their own module
+# eip.exceptions
 
 class EIPNoCommandError(Exception):
     pass
@@ -98,11 +100,14 @@ to be triggered for each one of them.
 
         self.missing_pkexec = False
         self.missing_auth_agent = False
+        self.bad_keyfile_perms = False
+
         self.command = None
         self.args = None
 
         self.autostart = True
         self._get_or_create_config()
+        self._check_vpn_keys()
 
     def _set_autostart(self):
         config = self.config
@@ -170,6 +175,16 @@ to be triggered for each one of them.
         self._set_ovpn_command()
         self._check_ovpn_config()
 
+    def _check_vpn_keys(self):
+        """
+        checks for correct permissions on vpn keys
+        """
+        try:
+            check_vpn_keys(self.config)
+        except EIPInitBadKeyFilePermError:
+            logger.error('error while checking vpn keys')
+            self.bad_keyfile_perms = True
+
     def _launch_openvpn(self):
         """
         invocation of openvpn binaries in a subprocess.
-- 
cgit v1.2.3