From 79e9f3c69b4eb061490d6a12a52888abc429542e Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Mon, 18 Sep 2017 19:53:17 +0200 Subject: [feat] detect if pkexec is present in the system Check it before starting the vpn. - Resolves: #8895 --- src/leap/bitmask/vpn/privilege.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/leap/bitmask/vpn/privilege.py') diff --git a/src/leap/bitmask/vpn/privilege.py b/src/leap/bitmask/vpn/privilege.py index 458f690..dd8d29a 100644 --- a/src/leap/bitmask/vpn/privilege.py +++ b/src/leap/bitmask/vpn/privilege.py @@ -109,7 +109,7 @@ class LinuxPolicyChecker(object): :returns: a list of the paths where pkexec is to be found :rtype: list """ - if not self._is_pkexec_in_system(): + if not is_pkexec_in_system(): log.warn('System has no pkexec') raise NoPkexecAvailable() @@ -181,12 +181,12 @@ class LinuxPolicyChecker(object): return is_running - @classmethod - def _is_pkexec_in_system(self): - """ - Checks the existence of the pkexec binary in system. - """ - pkexec_path = which('pkexec') - if len(pkexec_path) == 0: - return False - return True + +def is_pkexec_in_system(): + """ + Checks the existence of the pkexec binary in system. + """ + pkexec_path = which('pkexec') + if len(pkexec_path) == 0: + return False + return True -- cgit v1.2.3