Provider web certificate will always be bytestring now, requests complains otherwise

3 files changed, 23 insertions, 18 deletions

diff --git a/service/test/unit/bitmask_libraries/test_certs.py b/service/test/unit/bitmask_libraries/test_certs.py
index 150a1f14..f1e643c4 100644
--- a/service/test/unit/bitmask_libraries/test_certs.py
+++ b/service/test/unit/bitmask_libraries/test_certs.py
@@ -6,22 +6,27 @@ from mock import MagicMock, patch
 
 class CertsTest(unittest.TestCase):
 
+    def setUp(self):
+        config = MagicMock(leap_home='/some/leap/home')
+        self.provider = MagicMock(server_name=u'test.leap.net', config=config)
+
     def test_set_cert_and_fingerprint_sets_cert(self):
         LeapCertificate.set_cert_and_fingerprint('some cert', None)
 
-        self.assertIsNone(LeapCertificate.LEAP_FINGERPRINT)
-        self.assertEqual('some cert', LeapCertificate.LEAP_CERT)
+        certs = LeapCertificate(self.provider)
+
+        self.assertIsNone(certs.LEAP_FINGERPRINT)
+        self.assertEqual('some cert', certs.provider_web_cert)
 
     def test_set_cert_and_fingerprint_sets_fingerprint(self):
         LeapCertificate.set_cert_and_fingerprint(None, 'fingerprint')
 
-        self.assertEqual('fingerprint', LeapCertificate.LEAP_FINGERPRINT)
-        self.assertFalse(LeapCertificate.LEAP_CERT)
+        certs = LeapCertificate(self.provider)
 
-    def test_api_ca_bundle(self):
-        config = MagicMock(leap_home='/some/leap/home')
-        provider = MagicMock(server_name=u'test.leap.net', config=config)
+        self.assertEqual('fingerprint', LeapCertificate.LEAP_FINGERPRINT)
+        self.assertFalse(certs.provider_web_cert)
 
-        cert = LeapCertificate(provider).api_ca_bundle
+    def test_provider_api_cert(self):
+        certs = LeapCertificate(self.provider).provider_api_cert
 
-        self.assertEqual('/some/leap/home/providers/test.leap.net/keys/client/api.pem', cert)
+        self.assertEqual('/some/leap/home/providers/test.leap.net/keys/client/api.pem', certs)
diff --git a/service/test/unit/bitmask_libraries/test_nicknym.py b/service/test/unit/bitmask_libraries/test_nicknym.py
index 7e6518b9..ca3b348d 100644
--- a/service/test/unit/bitmask_libraries/test_nicknym.py
+++ b/service/test/unit/bitmask_libraries/test_nicknym.py
@@ -25,7 +25,7 @@ class NickNymTest(AbstractLeapTest):
     @patch('pixelated.bitmask_libraries.nicknym.KeyManager.__init__', return_value=None)
     def test_that_keymanager_is_created(self, keymanager_init_mock):
         # given
-        LeapCertificate.api_ca_bundle = '/some/path/to/provider_ca_cert'
+        LeapCertificate.provider_api_cert = '/some/path/to/provider_ca_cert'
         # when
         NickNym(self.provider,
                 self.config,
diff --git a/service/test/unit/bitmask_libraries/test_provider.py b/service/test/unit/bitmask_libraries/test_provider.py
index 320fece2..fabf5f87 100644
--- a/service/test/unit/bitmask_libraries/test_provider.py
+++ b/service/test/unit/bitmask_libraries/test_provider.py
@@ -134,14 +134,14 @@ VeJ6
 """
 
 
-CA_CERT = '/tmp/ca.crt'
-BOOTSTRAP_CA_CERT = '/tmp/bootstrap-ca.crt'
+PROVIDER_API_CERT = '/tmp/ca.crt'
+PROVIDER_WEB_CERT = '/tmp/bootstrap-ca.crt'
 
 
 class LeapProviderTest(AbstractLeapTest):
     def setUp(self):
         self.config = LeapConfig(leap_home='/tmp/foobar')
-        LeapCertificate.set_cert_and_fingerprint(BOOTSTRAP_CA_CERT, None)
+        LeapCertificate.set_cert_and_fingerprint(PROVIDER_WEB_CERT, None)
 
     def test_provider_fetches_provider_json(self):
         with HTTMock(provider_json_mock):
@@ -197,7 +197,7 @@ class LeapProviderTest(AbstractLeapTest):
         session = MagicMock(wraps=requests.session())
         session_func = MagicMock(return_value=session)
         get_func = MagicMock(wraps=requests.get)
-        LeapCertificate.LEAP_CERT = BOOTSTRAP_CA_CERT
+        LeapCertificate.LEAP_CERT = PROVIDER_WEB_CERT
 
         with patch('pixelated.bitmask_libraries.provider.requests.session', new=session_func):
             with patch('pixelated.bitmask_libraries.provider.requests.get', new=get_func):
@@ -205,18 +205,18 @@ class LeapProviderTest(AbstractLeapTest):
                     provider = LeapProvider('some-provider.test', self.config)
                     provider.fetch_valid_certificate()
 
-        session.get.assert_any_call('https://some-provider.test/ca.crt', verify=BOOTSTRAP_CA_CERT, timeout=15)
-        session.get.assert_any_call('https://some-provider.test/provider.json', verify=BOOTSTRAP_CA_CERT, timeout=15)
+        session.get.assert_any_call('https://some-provider.test/ca.crt', verify=PROVIDER_WEB_CERT, timeout=15)
+        session.get.assert_any_call('https://some-provider.test/provider.json', verify=PROVIDER_WEB_CERT, timeout=15)
 
     def test_that_provider_cert_is_used_to_fetch_soledad_json(self):
         get_func = MagicMock(wraps=requests.get)
-        LeapCertificate.api_ca_bundle = CA_CERT
+        LeapCertificate.provider_api_cert = PROVIDER_API_CERT
 
         with patch('pixelated.bitmask_libraries.provider.requests.get', new=get_func):
             with HTTMock(provider_json_mock, soledad_json_mock, not_found_mock):
                 provider = LeapProvider('some-provider.test', self.config)
                 provider.fetch_soledad_json()
-        get_func.assert_called_with('https://api.some-provider.test:4430/1/config/soledad-service.json', verify=CA_CERT, timeout=15)
+        get_func.assert_called_with('https://api.some-provider.test:4430/1/config/soledad-service.json', verify=PROVIDER_API_CERT, timeout=15)
 
     def test_that_leap_fingerprint_is_validated(self):
         session = MagicMock(wraps=requests.session())