From 1d4a3d68869dd9c416b104399097a6bb0c1bace3 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Wed, 1 Feb 2017 14:49:45 +0100 Subject: [feature] new commands: get_cert --- src/leap/bitmask/core/dispatcher.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/leap/bitmask/core/dispatcher.py') diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py index 833741dd..a93c3ec5 100644 --- a/src/leap/bitmask/core/dispatcher.py +++ b/src/leap/bitmask/core/dispatcher.py @@ -201,12 +201,27 @@ class EIPCmd(SubCommand): except IndexError: raise DispatchError( 'wrong number of arguments: expected 1, got none') - d = eip.do_start(provider) + # TODO --- attempt to get active provider + # TODO or catch the exception and send error + provider = parts[2] + d = eip.start_vpn(provider) return d @register_method('dict') def do_STOP(self, eip, *parts): - d = eip.do_stop() + d = eip.stop_vpn() + return d + + @register_method('check') + def do_CHECK(self, eip, *parts): + d = eip.do_check() + return d + + @register_method('get_cert') + def do_GET_CERT(self, eip, *parts): + # TODO -- attempt to get active provider + provider = parts[2] + d = eip.do_get_cert(provider) return d @@ -513,7 +528,7 @@ def _format_error(failure): logger.failure('[DISPATCHER] Unexpected error:') except: logger.debug('[DISPATCHER] Unexpected error: %r' % failure.value) - logger.debug('%r' % failure) + print failure.getTraceback() # if needed, we could add here the exception type as an extra field return json.dumps({'error': failure.value.message, 'result': None}) -- cgit v1.2.3