fix #89

Author: gijzelaerr

eduvpn/openvpn.py

@@ -85,7 +85,7 @@ def ovpn_to_nm(config, uuid, display_name, username=None):
                 'ipv6': {'method': 'auto'},
                 'vpn': {'data': {'auth': config.get('auth', 'SHA256'),
                                  'cipher': config.get('cipher', 'AES-256-CBC'),
-                                 'comp-lzo': config.get('auth', 'adaptive'),
+                                 'comp-lzo': config.get('comp-lzo', 'adaptive'),
                                  'connection-type': config.get('connection-type', 'tls'),
                                  'dev': 'tun',
                                  'remote': ",".join(":".join(r) for r in config['remote']),
@@ -97,10 +97,13 @@ def ovpn_to_nm(config, uuid, display_name, username=None):
 
     # 2 factor auth enabled
     if 'auth-user-pass' in config:
+        assert username
         logger.info("looks like 2 factor authentication is enabled, enabling this in NM config")
         settings['vpn']['data']['cert-pass-flags'] = '0'
         settings['vpn']['data']['connection-type'] = 'password-tls'
         settings['vpn']['data']['password-flags'] = '2'
         settings['vpn']['data']['username'] = username
+    else:
+        assert not username
 
     return settings

tests/test_openvpn.py

@@ -3,9 +3,8 @@
 # Copyright: 2017, The Commons Conservancy eduVPN Programme
 # SPDX-License-Identifier: GPL-3.0+
 
-from os import path
 import unittest
-from eduvpn.openvpn import format_like_ovpn, parse_ovpn
+from eduvpn.openvpn import format_like_ovpn, parse_ovpn, ovpn_to_nm
 
 from tests.mock_config import mock_config
 
@@ -15,4 +14,15 @@ def test_format_like_ovpn(self):
         format_like_ovpn('test', 'test', 'test')
 
     def test_parse_ovpn(self):
-        parse_ovpn(mock_config)
+        _ = parse_ovpn(mock_config)
+
+    def test_ovpn_to_nm(self):
+        config = parse_ovpn(mock_config)
+        _ = ovpn_to_nm(config=config, uuid='test_uuid', display_name='test name')
+
+    def test_ovpn_to_nm_2fa(self):
+        config = parse_ovpn(mock_config)
+        config['auth-user-pass'] = True
+        username = 'test_user'
+        nm_dict = ovpn_to_nm(config=config, uuid='test_uuid', display_name='test name', username=username)
+        self.assertEqual(username, nm_dict['vpn']['data']['username'], username)