summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-25 18:53:49 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-27 12:49:57 -0300
commit9ba31164f032c304e07a063a3be3160985478982 (patch)
tree0115be8a872576a4eebcfb50502483da4991c66f /src/leap
parent4728ea9e5cbb0f7ed47e7ca609c0531a31c847e0 (diff)
Refactor to be consistent with other launchers.
This is done in order to make them similar and them merge as much as code as possible.
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/services/eip/vpnlaunchers.py78
1 files changed, 40 insertions, 38 deletions
diff --git a/src/leap/bitmask/services/eip/vpnlaunchers.py b/src/leap/bitmask/services/eip/vpnlaunchers.py
index daa0d81f..e27a48d9 100644
--- a/src/leap/bitmask/services/eip/vpnlaunchers.py
+++ b/src/leap/bitmask/services/eip/vpnlaunchers.py
@@ -132,7 +132,7 @@ class VPNLauncher(object):
Same as missing_updown_scripts but does not check for exec bit.
:rtype: list
"""
- leap_assert(kls.UPDOWN_FILES is not None,
+ leap_assert(kls.OTHER_FILES is not None,
"Need to define OTHER_FILES for this particular "
"auncher before calling this method")
file_exist = partial(_has_other_files, warn=False)
@@ -261,6 +261,7 @@ class LinuxVPNLauncher(VPNLauncher):
OPENVPN_DOWN_ROOT_BASE,
OPENVPN_DOWN_ROOT_FILE)
+ UP_SCRIPT = DOWN_SCRIPT = UP_DOWN_PATH
UPDOWN_FILES = (UP_DOWN_PATH,)
POLKIT_PATH = LinuxPolicyChecker.get_polkit_path()
OTHER_FILES = (POLKIT_PATH, )
@@ -357,16 +358,17 @@ class LinuxVPNLauncher(VPNLauncher):
"scripts will be run. DNS leaks are likely!")
return None
- def get_vpn_command(self, eipconfig=None, providerconfig=None,
- socket_host=None, socket_port="unix", openvpn_verb=1):
+ def get_vpn_command(self, eipconfig, providerconfig, socket_host,
+ socket_port="unix", openvpn_verb=1):
"""
Returns the platform dependant vpn launching command. It will
look for openvpn in the regular paths and algo in
- path_prefix/apps/eip/ (in case standalone is set)
+ path_prefix/apps/eip/ (in case that standalone is set)
Might raise:
- VPNLauncherException,
- OpenVPNNotFoundException.
+ EIPNoTunKextLoaded,
+ OpenVPNNotFoundException,
+ VPNLauncherException.
:param eipconfig: eip configuration object
:type eipconfig: EIPConfig
@@ -387,12 +389,8 @@ class LinuxVPNLauncher(VPNLauncher):
:return: A VPN command ready to be launched
:rtype: list
"""
- leap_assert(eipconfig, "We need an eip config")
leap_assert_type(eipconfig, EIPConfig)
- leap_assert(providerconfig, "We need a provider config")
leap_assert_type(providerconfig, ProviderConfig)
- leap_assert(socket_host, "We need a socket host!")
- leap_assert(socket_port, "We need a socket port!")
kwargs = {}
if flags.STANDALONE:
@@ -400,18 +398,12 @@ class LinuxVPNLauncher(VPNLauncher):
get_path_prefix(), "..", "apps", "eip")
openvpn_possibilities = which(self.OPENVPN_BIN, **kwargs)
-
if len(openvpn_possibilities) == 0:
raise OpenVPNNotFoundException()
openvpn = first(openvpn_possibilities)
args = []
- pkexec = self.maybe_pkexec()
- if pkexec:
- args.append(openvpn)
- openvpn = first(pkexec)
-
args += [
'--setenv', "LEAPOPENVPN", "1"
]
@@ -454,22 +446,23 @@ class LinuxVPNLauncher(VPNLauncher):
]
openvpn_configuration = eipconfig.get_openvpn_configuration()
-
for key, value in openvpn_configuration.items():
args += ['--%s' % (key,), value]
+ user = getpass.getuser()
+
##############################################################
# The down-root plugin fails in some situations, so we don't
# drop privs for the time being
##############################################################
# args += [
- # '--user', getpass.getuser(),
+ # '--user', user,
# '--group', grp.getgrgid(os.getgroups()[-1]).gr_name
# ]
if socket_port == "unix": # that's always the case for linux
args += [
- '--management-client-user', getpass.getuser()
+ '--management-client-user', user
]
args += [
@@ -478,37 +471,46 @@ class LinuxVPNLauncher(VPNLauncher):
'--script-security', '2'
]
- plugin_path = self.maybe_down_plugin()
- # If we do not have the down plugin neither in the bundle
- # nor in the system, we do not do updown scripts. The alternative
- # is leaving the user without the ability to restore dns and routes
- # to its original state.
+ if _has_updown_scripts(self.UP_SCRIPT):
+ args += [
+ '--up', '\"%s\"' % (self.UP_SCRIPT,),
+ ]
- if plugin_path and _has_updown_scripts(self.UP_DOWN_PATH):
+ if _has_updown_scripts(self.DOWN_SCRIPT):
args += [
- '--up', self.UP_DOWN_PATH,
- '--down', self.UP_DOWN_PATH,
- ##############################################################
- # For the time being we are disabling the usage of the
- # down-root plugin, because it doesn't quite work as
- # expected (i.e. it doesn't run route -del as root
- # when finishing, so it fails to properly
- # restart/quit)
- ##############################################################
- # '--plugin', plugin_path,
- # '\'script_type=down %s\'' % self.UP_DOWN_PATH
+ '--down', '\"%s\"' % (self.DOWN_SCRIPT,)
]
+ ###########################################################
+ # For the time being we are disabling the usage of the
+ # down-root plugin, because it doesn't quite work as
+ # expected (i.e. it doesn't run route -del as root
+ # when finishing, so it fails to properly
+ # restart/quit)
+ ###########################################################
+ # if _has_updown_scripts(self.OPENVPN_DOWN_PLUGIN):
+ # args += [
+ # '--plugin', self.OPENVPN_DOWN_ROOT,
+ # '\'%s\'' % self.DOWN_SCRIPT # for OSX
+ # '\'script_type=down %s\'' % self.DOWN_SCRIPT # for Linux
+ # ]
+
args += [
'--cert', eipconfig.get_client_cert_path(providerconfig),
'--key', eipconfig.get_client_cert_path(providerconfig),
'--ca', providerconfig.get_ca_cert_path()
]
+ command = [openvpn]
+ pkexec = self.maybe_pkexec()
+ if pkexec:
+ command.insert(0, first(pkexec))
+
+ command_and_args = command + args
logger.debug("Running VPN with command:")
- logger.debug("%s %s" % (openvpn, " ".join(args)))
+ logger.debug(" ".join(command_and_args))
- return [openvpn] + args
+ return command_and_args
def get_vpn_env(self):
"""