summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/vpn
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-03-05 00:08:24 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-03-05 00:08:40 +0100
commitd908a262680fa50ea2dcef9a866d9f03af65ce6f (patch)
tree711bc06e0cd3d31955463513b96dfb9db73bd446 /src/leap/bitmask/vpn
parent2a28f214684c3bc44ad52f262e4c162700155c8a (diff)
[bug] revert vpn options from config
bitmask-root is not able to parse some options, and is aborting the vpn connection in my tests. we need to debug that carefully, hardcoding some options for now and leaving this to be done post-0.9.5
Diffstat (limited to 'src/leap/bitmask/vpn')
-rw-r--r--src/leap/bitmask/vpn/service.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py
index c23397c..7bf2512 100644
--- a/src/leap/bitmask/vpn/service.py
+++ b/src/leap/bitmask/vpn/service.py
@@ -132,7 +132,16 @@ class VPNService(HookableService):
config = yield bonafide.do_provider_read(provider, "eip")
remotes = [(gw["ip_address"], gw["capabilities"]["ports"][0])
for gw in config.gateways]
- extra_flags = config.openvpn_configuration
+ # FIXME -- bitmask-root cannot parse some options!
+ # extra_flags = config.openvpn_configuration
+ # XXX picked manually from vpn-service.json
+ extra_flags = {
+ "auth": "SHA1",
+ "cipher": "AES-128-CBC",
+ "keepalive": "10 30",
+ "tls-cipher": "DHE-RSA-AES128-SHA",
+ }
+
prefix = os.path.join(self._basepath,
"leap/providers/{0}/keys".format(provider))