From 4a7e29b6eae34f34016c9b409bd887c74b949ca4 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 11 Aug 2017 03:21:35 +0200
Subject: [feature] add vpn list command

---
 src/leap/bitmask/vpn/service.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'src/leap/bitmask/vpn/service.py')

diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py
index 8bcee2e8..b0dcba86 100644
--- a/src/leap/bitmask/vpn/service.py
+++ b/src/leap/bitmask/vpn/service.py
@@ -189,6 +189,27 @@ class VPNService(HookableService):
         privilege.uninstall_helpers()
         return {'uninstall': 'ok'}
 
+    @defer.inlineCallbacks
+    def do_list(self):
+        bonafide = self.parent.getServiceNamed("bonafide")
+        _providers = yield bonafide.do_provider_list()
+        providers = [p['domain'] for p in _providers]
+        provider_dict = {} 
+        for provider in providers:
+            try:
+                config = yield bonafide.do_provider_read(provider, 'eip')
+            except ValueError:
+                continue
+            locations = config.locations
+            info = tuple([
+                ('[%s]' % locations[loc]['country_code'],
+                 locations[loc]['name'],
+                 '(UTC%s)' % locations[loc]['timezone'])
+                for loc in locations])
+            provider_dict[provider] = info
+        defer.returnValue(provider_dict)
+
+
     @defer.inlineCallbacks
     def _setup(self, provider):
         """Set up TunnelManager for a specified provider.
@@ -196,8 +217,8 @@ class VPNService(HookableService):
         :param provider: the provider to use, e.g. 'demo.bitmask.net'
         :type provider: str"""
 
-        bonafide = self.parent.getServiceNamed("bonafide")
-        config = yield bonafide.do_provider_read(provider, "eip")
+        bonafide = self.parent.getServiceNamed('bonafide')
+        config = yield bonafide.do_provider_read(provider, 'eip')
 
         sorted_gateways = GatewaySelector(
             config.gateways, config.locations).select_gateways()
-- 
cgit v1.2.3