From c1a35317fe4ebb82bf7d24dc5d8c171d29c9c501 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Mon, 29 Aug 2016 18:23:14 -0300 Subject: [#765] Move combined_ca_bundle to UA initialization With this change we don't have to create the combined_ca_bundle for every user at every login. To support this change, we started migrating away from the LeapCertificate class that was making the LeapProvider setup more brittle --- service/pixelated/bitmask_libraries/keymanager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'service/pixelated/bitmask_libraries/keymanager.py') diff --git a/service/pixelated/bitmask_libraries/keymanager.py b/service/pixelated/bitmask_libraries/keymanager.py index 78d6e935..46125a6c 100644 --- a/service/pixelated/bitmask_libraries/keymanager.py +++ b/service/pixelated/bitmask_libraries/keymanager.py @@ -28,9 +28,10 @@ class Keymanager(object): self._email = email_address self.keymanager = KeyManager(self._email, nicknym_url, soledad, - token=token, ca_cert_path=LeapCertificate(provider).provider_api_cert, api_uri=provider.api_uri, + token=token, ca_cert_path=provider.provider_api_cert, api_uri=provider.api_uri, api_version=provider.api_version, - uid=uuid, gpgbinary=leap_config.gpg_binary) + uid=uuid, gpgbinary=leap_config.gpg_binary, + combined_ca_bundle=provider.combined_ca_bundle) @defer.inlineCallbacks def generate_openpgp_key(self): -- cgit v1.2.3