diff options
author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2016-08-30 16:58:33 -0300 |
---|---|---|
committer | Tulio Casagrande <tcasagra@thoughtworks.com> | 2016-08-30 17:04:45 -0300 |
commit | b1fe205ebb5248104b365f372a72659b2471812e (patch) | |
tree | a89e9f6ca60d401038abe9f7b37c1d10d6e7c659 /service/pixelated/bitmask_libraries/provider.py | |
parent | 86db68912fc1fb0d1253a6a4b18a6f481756bc4d (diff) |
[#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
Diffstat (limited to 'service/pixelated/bitmask_libraries/provider.py')
-rw-r--r-- | service/pixelated/bitmask_libraries/provider.py | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ -39,6 +39,10 @@ class LeapProvider(object): 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): |