From 9c1d1bd3da383a22702abae4470513be34572d3d Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Thu, 20 Apr 2017 14:43:30 +0200 Subject: [bug] fix enabling of vpn service - Resolves: #8845 --- src/leap/bitmask/core/dispatcher.py | 4 ++-- src/leap/bitmask/vpn/service.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py index 52de62b6..fc17b76a 100644 --- a/src/leap/bitmask/core/dispatcher.py +++ b/src/leap/bitmask/core/dispatcher.py @@ -436,9 +436,9 @@ class CommandDispatcher(object): def do_VPN(self, *parts): vpn = self._get_service(self.subcommand_vpn.label) - if not vpn: - return _format_result({'vpn': 'disabled'}) subcmd = parts[1] + if subcmd != 'enable' and not vpn: + return _format_result({'vpn': 'disabled'}) dispatch = self.subcommand_vpn.dispatch if subcmd in ('enable', 'disable'): diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py index ec9e065b..b04ea9f6 100644 --- a/src/leap/bitmask/vpn/service.py +++ b/src/leap/bitmask/vpn/service.py @@ -90,6 +90,9 @@ class VPNService(HookableService): # TODO ----------------------------- # when shutting down the main bitmaskd daemon, this should be called. + if not self._vpn: + raise Exception('VPN was not running') + if self._started: self._vpn.stop() self._started = False -- cgit v1.2.3