diff options
author | Folker Bernitt <fbernitt@thoughtworks.com> | 2016-02-11 09:45:34 +0100 |
---|---|---|
committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2016-02-11 09:46:43 +0100 |
commit | d8842e7e7ad415045bf230bc52efa90d3e717099 (patch) | |
tree | 5dce965ce605b770d96e3485d829bb393be75e0e /service/pixelated/bitmask_libraries/session.py | |
parent | 92fde6a1669f7023dd5c32c1de6edd506633be85 (diff) |
Redownload SMTP certficates if necessary
- Issue #591
- using leaps should_redownload for check
Diffstat (limited to 'service/pixelated/bitmask_libraries/session.py')
-rw-r--r-- | service/pixelated/bitmask_libraries/session.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py index ef41fe6a..9e908ce5 100644 --- a/service/pixelated/bitmask_libraries/session.py +++ b/service/pixelated/bitmask_libraries/session.py @@ -29,6 +29,7 @@ from leap.auth import SRPAuth from .nicknym import NickNym from .smtp import LeapSMTPConfig from .soledad import SoledadFactory +import leap.common.certs as leap_certs from leap.common.events import ( register, unregister, @@ -127,7 +128,7 @@ class SmtpClientCertificate(object): self._user_path = user_path def cert_path(self): - if not self._is_cert_already_downloaded(): + if not self._is_cert_already_downloaded() or self._should_redownload(): self._download_smtp_cert() return self._smtp_client_cert_path() @@ -135,6 +136,9 @@ class SmtpClientCertificate(object): def _is_cert_already_downloaded(self): return os.path.exists(self._smtp_client_cert_path()) + def _should_redownload(self): + return leap_certs.should_redownload(self._smtp_client_cert_path()) + def _download_smtp_cert(self): cert_path = self._smtp_client_cert_path() |