SMTP should be getting up properly again

The latest changes on the platform caused the user agent to be
unable to download the smtp client certificate, receiving a 401 in
response. I added the authorization header to the call on the user
agent so that is fixed.

3 files changed, 8 insertions, 5 deletions

diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index 208dc271..a7da7614 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -122,7 +122,7 @@ class LeapSessionFactory(object):
         account = self._create_account(auth.uuid, soledad)
         incoming_mail_fetcher = self._create_incoming_mail_fetcher(nicknym, soledad, account, account_email)
 
-        smtp = LeapSmtp(self._provider, auth.username, auth.session_id, nicknym.keymanager)
+        smtp = LeapSmtp(self._provider, auth.username, auth.session_id, auth.token, nicknym.keymanager)
 
         return LeapSession(self._provider, auth, soledad, nicknym, account, incoming_mail_fetcher, smtp)
 
diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index 759a2920..3e2d1b21 100644
--- a/service/pixelated/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
@@ -26,11 +26,12 @@ logger = logging.getLogger(__name__)
 
 class LeapSmtp(object):
 
-    def __init__(self, provider, username, session_id, keymanager=None):
+    def __init__(self, provider, username, session_id, user_token, keymanager=None):
         self.local_smtp_port_number = random.randrange(12000, 16000)
         self._provider = provider
         self.username = username
         self.session_id = session_id
+        self.user_token = user_token
         self._keymanager = keymanager
         self._remote_hostname, self._remote_port = self._discover_remote_smtp_server()
         self._local_smtp_service_socket = None
@@ -58,12 +59,14 @@ class LeapSmtp(object):
 
         cert_url = '%s/%s/cert' % (self._provider.api_uri, self._provider.api_version)
         cookies = {"_session_id": self.session_id}
-
+        headers = {}
+        headers["Authorization"] = 'Token token="{0}"'.format(self.user_token)
         response = requests.get(
             cert_url,
             verify=LeapCertificate(self._provider).provider_api_cert,
             cookies=cookies,
-            timeout=self._provider.config.timeout_in_s)
+            timeout=self._provider.config.timeout_in_s,
+            headers=headers)
         response.raise_for_status()
 
         client_cert = response.content
diff --git a/service/test/unit/bitmask_libraries/test_smtp.py b/service/test/unit/bitmask_libraries/test_smtp.py
index 5987415c..535b1e7a 100644
--- a/service/test/unit/bitmask_libraries/test_smtp.py
+++ b/service/test/unit/bitmask_libraries/test_smtp.py
@@ -66,7 +66,7 @@ class LeapSmtpTest(AbstractLeapTest):
 
     @patch('pixelated.bitmask_libraries.smtp.setup_smtp_gateway')
     def test_that_start_calls_setup_smtp_gateway(self, gateway_mock):
-        smtp = LeapSmtp(self.provider, self.auth.username, self.auth.session_id, self.keymanager)
+        smtp = LeapSmtp(self.provider, self.auth.username, self.auth.session_id, self.auth.token, self.keymanager)
 
         port = 500
         smtp.local_smtp_port_number = port