summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-03 18:16:31 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:40:36 +0100
commit409a4c663ec3c0b4a394fcaa6d4b1c6b527f8522 (patch)
tree35be6241476c972f2ff4a3f97e8a2f6f46f3f988
parent5103c1c46dadb15af0327c8069d4c321f4f93d4f (diff)
[feature] eip start/stop working
-rw-r--r--src/leap/bitmask/vpn/eip.py1
-rw-r--r--src/leap/bitmask/vpn/helpers/__init__.py1
-rw-r--r--src/leap/bitmask/vpn/service.py6
3 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/bitmask/vpn/eip.py b/src/leap/bitmask/vpn/eip.py
index d6736629..b080aa65 100644
--- a/src/leap/bitmask/vpn/eip.py
+++ b/src/leap/bitmask/vpn/eip.py
@@ -44,6 +44,7 @@ class EIPManager(object):
print(Fore.BLUE + "Firewall: starting..." + Fore.RESET)
fw_ok = self._firewall.start()
if not fw_ok:
+ print(Fore.RED + "Firewall: problem!")
return False
print(Fore.GREEN + "Firewall: started" + Fore.RESET)
diff --git a/src/leap/bitmask/vpn/helpers/__init__.py b/src/leap/bitmask/vpn/helpers/__init__.py
index 1f46fd79..dc249286 100644
--- a/src/leap/bitmask/vpn/helpers/__init__.py
+++ b/src/leap/bitmask/vpn/helpers/__init__.py
@@ -14,6 +14,7 @@ if IS_LINUX:
helper_from = _config.get_bitmask_helper_path()
polkit_from = _config.get_bitmask_polkit_policy_path()
copyfile(helper_from, helper_to)
+ os.chmod(helper_to, 0744)
copyfile(polkit_from, polkit_to)
def uninstall():
diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py
index 72fd2bbf..3edae352 100644
--- a/src/leap/bitmask/vpn/service.py
+++ b/src/leap/bitmask/vpn/service.py
@@ -65,15 +65,13 @@ class EIPService(HookableService):
self._setup(domain)
self._eip.start()
self._started = True
- return "Starting"
+ return {'result': 'started'}
def stop_vpn(self):
if self._started:
self._eip.stop()
self._started = False
- return "Stopping"
- else:
- return "Not started"
+ return {'result': 'stopped'}
def do_status(self):
# TODO -- get status from a dedicated STATUS CLASS