From d8842e7e7ad415045bf230bc52efa90d3e717099 Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Thu, 11 Feb 2016 09:45:34 +0100
Subject: Redownload SMTP certficates if necessary

- Issue #591
- using leaps should_redownload for check
---
 service/pixelated/bitmask_libraries/session.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'service/pixelated/bitmask_libraries')

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()
 
-- 
cgit v1.2.3