Merge remote-tracking branch 'refs/remotes/kali/feature/install-bitmask-root-to-local-path' into develop

2 files changed, 27 insertions, 2 deletions

diff --git a/src/leap/bitmask/util/__init__.py b/src/leap/bitmask/util/__init__.py
index c35be99e..25b86874 100644
--- a/src/leap/bitmask/util/__init__.py
+++ b/src/leap/bitmask/util/__init__.py
@@ -110,3 +110,22 @@ def make_address(user, provider):
     :type provider: basestring
     """
     return "%s@%s" % (user, provider)
+
+
+def force_eval(items):
+    """
+    Return a sequence that evaluates any callable in the sequence,
+    instantiating it beforehand if the item is a class, and
+    leaves the non-callable items without change.
+    """
+    def do_eval(thing):
+        if isinstance(thing, type):
+            return thing()()
+        if callable(thing):
+            return thing()
+        return thing
+
+    if isinstance(items, (list, tuple)):
+        return map(do_eval, items)
+    else:
+        return do_eval(items)
diff --git a/src/leap/bitmask/util/privilege_policies.py b/src/leap/bitmask/util/privilege_policies.py
index 9d1e2c9a..adc3503f 100644
--- a/src/leap/bitmask/util/privilege_policies.py
+++ b/src/leap/bitmask/util/privilege_policies.py
@@ -24,6 +24,8 @@ import platform
 
 from abc import ABCMeta, abstractmethod
 
+from leap.bitmask.config import flags
+
 logger = logging.getLogger(__name__)
 
 
@@ -71,6 +73,8 @@ class LinuxPolicyChecker(PolicyChecker):
     """
     LINUX_POLKIT_FILE = ("/usr/share/polkit-1/actions/"
                          "se.leap.bitmask.policy")
+    LINUX_POLKIT_FILE_BUNDLE = ("/usr/share/polkit-1/actions/"
+                                "se.leap.bitmask.bundle.policy")
 
     @classmethod
     def get_polkit_path(self):
@@ -79,7 +83,8 @@ class LinuxPolicyChecker(PolicyChecker):
 
         :rtype: str
         """
-        return self.LINUX_POLKIT_FILE
+        return (self.LINUX_POLKIT_FILE_BUNDLE if flags.STANDALONE
+                else self.LINUX_POLKIT_FILE)
 
     def is_missing_policy_permissions(self):
     # FIXME this name is quite confusing, it does not have anything to do with
@@ -90,4 +95,5 @@ class LinuxPolicyChecker(PolicyChecker):
 
         :rtype: bool
         """
-        return not os.path.isfile(self.LINUX_POLKIT_FILE)
+        path = self.get_polkit_path()
+        return not os.path.isfile(path)