From 53fa2c134ab2c96376276aa1c0ed74db0aaba218 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Mon, 10 Dec 2012 23:20:09 +0900
Subject: get cipher config from eip-service

---
 src/leap/util/misc.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/leap/util/misc.py

(limited to 'src/leap/util/misc.py')

diff --git a/src/leap/util/misc.py b/src/leap/util/misc.py
new file mode 100644
index 00000000..3c26892b
--- /dev/null
+++ b/src/leap/util/misc.py
@@ -0,0 +1,16 @@
+"""
+misc utils
+"""
+
+
+class ImproperlyConfigured(Exception):
+    """
+    """
+
+
+def null_check(value, value_name):
+    try:
+        assert value is not None
+    except AssertionError:
+        raise ImproperlyConfigured(
+            "%s parameter cannot be None" % value_name)
-- 
cgit v1.2.3


From 6e9c63f47b98fbfcd3a5104fbfa5cc9d9ffe5143 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 17 Jan 2013 07:31:59 +0900
Subject: osx fixed already running instance check

---
 src/leap/util/misc.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/leap/util/misc.py')

diff --git a/src/leap/util/misc.py b/src/leap/util/misc.py
index 3c26892b..aa3ebe25 100644
--- a/src/leap/util/misc.py
+++ b/src/leap/util/misc.py
@@ -1,6 +1,9 @@
 """
 misc utils
 """
+import psutil
+
+from leap.base.constants import OPENVPN_BIN
 
 
 class ImproperlyConfigured(Exception):
@@ -14,3 +17,20 @@ def null_check(value, value_name):
     except AssertionError:
         raise ImproperlyConfigured(
             "%s parameter cannot be None" % value_name)
+        
+def get_openvpn_pids():
+    # binary name might change
+
+    openvpn_pids = []
+    for p in psutil.process_iter():
+        try:
+            # XXX Not exact!
+            # Will give false positives.
+            # we should check that cmdline BEGINS
+            # with openvpn or with our wrapper
+            # (pkexec / osascript / whatever)
+            if OPENVPN_BIN in ' '.join(p.cmdline):
+                openvpn_pids.append(p.pid)
+        except psutil.error.AccessDenied:
+            pass
+    return openvpn_pids
-- 
cgit v1.2.3


From 9cdc193c587631986e579c1ba37a8b982be01238 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 24 Jan 2013 18:47:41 +0900
Subject: all tests green again

plus:

* added soledad test requirements
* removed soledad from run_tests run (+1K tests failing)
* added option to run All tests to run_tests script
* pep8 cleanup
---
 src/leap/util/misc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/leap/util/misc.py')

diff --git a/src/leap/util/misc.py b/src/leap/util/misc.py
index aa3ebe25..d869a1ba 100644
--- a/src/leap/util/misc.py
+++ b/src/leap/util/misc.py
@@ -17,7 +17,8 @@ def null_check(value, value_name):
     except AssertionError:
         raise ImproperlyConfigured(
             "%s parameter cannot be None" % value_name)
-        
+
+
 def get_openvpn_pids():
     # binary name might change
 
-- 
cgit v1.2.3