From b1fe205ebb5248104b365f372a72659b2471812e Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 30 Aug 2016 16:58:33 -0300 Subject: [#765] Move combined certificates to the leap folder Since we are creating the combined certificates at the beginning of the UA and using it for multiple users, it makes more sense to create it in the leap folder instead of on a temporary file This bundle will be updated on every UA start --- service/pixelated/bitmask_libraries/provider.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (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 97becac8..96935fbc 100644 --- a/service/pixelated/bitmask_libraries/provider.py +++ b/service/pixelated/bitmask_libraries/provider.py @@ -38,6 +38,10 @@ class LeapProvider(object): def provider_api_cert(self): return str(os.path.join(leap_config.leap_home, 'providers', self.server_name, 'keys', 'client', 'api.pem')) + @property + def combined_cerfificates_path(self): + return str(os.path.join(leap_config.leap_home, 'providers', self.server_name, 'keys', 'client', 'ca_bundle')) + @property def api_uri(self): return self.provider_json.get('api_uri') @@ -182,16 +186,12 @@ class LeapProvider(object): elif not self.provider_api_cert: return leap_ca_bundle - tmp_file = tempfile.NamedTemporaryFile(delete=False) - - with open(tmp_file.name, 'w') as fout: + with open(self.combined_cerfificates_path, 'w') as fout: fin = fileinput.input(files=(leap_ca_bundle, self.provider_api_cert)) for line in fin: fout.write(line) fin.close() - self.combined_ca_bundle = tmp_file.name - def setup_ca_bundle(self): path = os.path.join(leap_config.leap_home, 'providers', self.server_name, 'keys', 'client') if not os.path.isdir(path): -- cgit v1.2.3