From 9b6c6f7e84790a3da8470b94cc8c029d9ad67777 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 23 Aug 2016 18:13:48 -0300 Subject: Changes soledad json download order Soledad json must only be downloaded after we fetch the api provider certificate, we can't make the request for it before having this cert --- service/pixelated/bitmask_libraries/provider.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'service/pixelated/bitmask_libraries/provider.py') diff --git a/service/pixelated/bitmask_libraries/provider.py b/service/pixelated/bitmask_libraries/provider.py index 07791624..cd4af7e2 100644 --- a/service/pixelated/bitmask_libraries/provider.py +++ b/service/pixelated/bitmask_libraries/provider.py @@ -30,7 +30,6 @@ class LeapProvider(object): self.server_name = server_name self.local_ca_crt = '%s/ca.crt' % leap_config.leap_home self.provider_json = self.fetch_provider_json() - self.soledad_json = self.fetch_soledad_json() @property def api_uri(self): @@ -66,6 +65,9 @@ class LeapProvider(object): if 'mx' not in self.services: raise Exception + def download_soledad_json(self): + self.soledad_json = self.fetch_soledad_json() + def download_certificate(self, filename=None): """ Downloads the server certificate, validates it against the provided fingerprint and stores it to file -- cgit v1.2.3