7 files changed, 186 insertions, 1 deletions
diff --git a/src/leap/util/__init__.py b/src/leap/util/__init__.py
index e69de29b..a70a9a8b 100644
--- a/src/leap/util/__init__.py
+++ b/src/leap/util/__init__.py
@@ -0,0 +1,9 @@
+import logging
+logger = logging.getLogger(__name__)
+
+try:
+    import pygeoip
+    HAS_GEOIP = True
+except ImportError:
+    logger.debug('PyGeoIP not found. Disabled Geo support.')
+    HAS_GEOIP = False
diff --git a/src/leap/util/certs.py b/src/leap/util/certs.py
new file mode 100644
index 00000000..f0f790e9
--- /dev/null
+++ b/src/leap/util/certs.py
@@ -0,0 +1,18 @@
+import os
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def get_mac_cabundle():
+    # hackaround bundle error
+    # XXX this needs a better fix!
+    f = os.path.split(__file__)[0]
+    sep = os.path.sep
+    f_ = sep.join(f.split(sep)[:-2])
+    verify = os.path.join(f_, 'cacert.pem')
+    #logger.error('VERIFY PATH = %s' % verify)
+    exists = os.path.isfile(verify)
+    #logger.error('do exist? %s', exists)
+    if exists:
+        return verify
diff --git a/src/leap/util/geo.py b/src/leap/util/geo.py
new file mode 100644
index 00000000..54b29596
--- /dev/null
+++ b/src/leap/util/geo.py
@@ -0,0 +1,32 @@
+"""
+experimental geo support.
+not yet a feature.
+in debian, we rely on the (optional) geoip-database
+"""
+import os
+import platform
+
+from leap.util import HAS_GEOIP
+
+GEOIP = None
+
+if HAS_GEOIP:
+    import pygeoip  # we know we can :)
+
+    GEOIP_PATH = None
+
+    if platform.system() == "Linux":
+        PATH = "/usr/share/GeoIP/GeoIP.dat"
+        if os.path.isfile(PATH):
+            GEOIP_PATH = PATH
+        GEOIP = pygeoip.GeoIP(GEOIP_PATH, pygeoip.MEMORY_CACHE)
+
+
+def get_country_name(ip):
+    if not GEOIP:
+        return
+    try:
+        country = GEOIP.country_name_by_addr(ip)
+    except pygeoip.GeoIPError:
+        country = None
+    return country if country else "-"
diff --git a/src/leap/util/leap_argparse.py b/src/leap/util/leap_argparse.py
index 2f996a31..5b0775cc 100644
--- a/src/leap/util/leap_argparse.py
+++ b/src/leap/util/leap_argparse.py
@@ -37,5 +37,5 @@ Launches main LEAP Client""", epilog=epilog)
 
 def init_leapc_args():
     parser = build_parser()
-    opts = parser.parse_args()
+    opts, unknown = parser.parse_known_args()
     return parser, opts
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
diff --git a/src/leap/util/tests/test_translations.py b/src/leap/util/tests/test_translations.py
new file mode 100644
index 00000000..794daeba
--- /dev/null
+++ b/src/leap/util/tests/test_translations.py
@@ -0,0 +1,22 @@
+import unittest
+
+from leap.util import translations
+
+
+class TrasnlationsTestCase(unittest.TestCase):
+    """
+    tests for translation functions and classes
+    """
+
+    def setUp(self):
+        self.trClass = translations.LEAPTranslatable
+
+    def test_trasnlatable(self):
+        tr = self.trClass({"en": "house", "es": "casa"})
+        eq = self.assertEqual
+        eq(tr.tr(to="es"), "casa")
+        eq(tr.tr(to="en"), "house")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/src/leap/util/translations.py b/src/leap/util/translations.py
new file mode 100644
index 00000000..d782cfe4
--- /dev/null
+++ b/src/leap/util/translations.py
@@ -0,0 +1,84 @@
+import inspect
+import logging
+
+from PyQt4.QtCore import QCoreApplication
+from PyQt4.QtCore import QLocale
+
+logger = logging.getLogger(__name__)
+
+"""
+here I could not do all that I wanted.
+the context is not getting passed to the xml file.
+Looks like pylupdate4 is somehow a hack that does not
+parse too well the python ast.
+I guess we could generate the xml for ourselves as a last recourse.
+"""
+
+# XXX BIG NOTE:
+# RESIST the temptation to get the translate function
+# more compact, or have the Context argument passed as a variable
+# Its name HAS to be explicit due  to how the pylupdate parser
+# works.
+
+
+qtTranslate = QCoreApplication.translate
+
+
+def translate(*args, **kwargs):
+    """
+    our magic function.
+    translate(Context, text, comment)
+    """
+    if len(args) == 1:
+        obj = args[0]
+        if isinstance(obj, LEAPTranslatable) and hasattr(obj, 'tr'):
+            return obj.tr()
+
+    klsname = None
+    try:
+        # get class value from instance
+        # using live object inspection
+        prev_frame = inspect.stack()[1][0]
+        locals_ = inspect.getargvalues(prev_frame).locals
+        self = locals_.get('self')
+        if self:
+
+            # Trying to  get the class name
+            # but this is useless, the parser
+            # has already got the context.
+            klsname = self.__class__.__name__
+            #print 'KLSNAME  -- ', klsname
+    except:
+        logger.error('error getting stack frame')
+
+    if klsname and len(args) == 1:
+        nargs = (klsname,) + args
+        return qtTranslate(*nargs)
+
+    else:
+        #nargs = ('default', ) + args
+        #import pdb4qt; pdb4qt.set_trace() 
+        return qtTranslate(*args)
+
+
+class LEAPTranslatable(dict):
+    """
+    An extended dict that implements a .tr method
+    so it can be translated on the fly by our
+    magic  translate method
+    """
+
+    try:
+        locale = str(QLocale.system().name()).split('_')[0]
+    except:
+        logger.warning("could not get system locale!")
+        print "could not get system locale!"
+        locale = "en"
+
+    def tr(self, to=None):
+        if not to:
+            to = self.locale
+        _tr = self.get(to, None)
+        if not _tr:
+            _tr = self.get("en", None)
+        return _tr