Issue #499 Moved remote smtp configuration

We removed the common parts from the bitmask libraries smtp
and adapted the tests.
We also advanced the new mail sender implementation, but it
is coupled to the twisted.mail.smtp.User currently and we need
to adapt leap mail to remove this dependency

6 files changed, 70 insertions, 68 deletions

diff --git a/service/pixelated/adapter/services/mail_sender.py b/service/pixelated/adapter/services/mail_sender.py
index 1befd1cc..42cf13be 100644
--- a/service/pixelated/adapter/services/mail_sender.py
+++ b/service/pixelated/adapter/services/mail_sender.py
@@ -48,7 +48,12 @@ class MailSender(object):
         return defer.gatherResults(deferreds)
 
     def _create_outgoing_mail(self):
-        return OutgoingMail(self._from, self._keymanager, self._cert_path, self._cert_path, self._remote_smtp_host, self._remote_smtp_port)
+        return OutgoingMail(str(self._from), 
+                            self._keymanager, 
+                            unicode(self._cert_path), 
+                            unicode(self._cert_path), 
+                            str(self._remote_smtp_host), 
+                            int(self._remote_smtp_port))
 
 
 class LocalSmtpMailSender(object):
diff --git a/service/pixelated/bitmask_libraries/provider.py b/service/pixelated/bitmask_libraries/provider.py
index b7f82f8a..071b0bbf 100644
--- a/service/pixelated/bitmask_libraries/provider.py
+++ b/service/pixelated/bitmask_libraries/provider.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import json
+import os
 
 from leap.common.certs import get_digest
 import requests
@@ -95,6 +96,13 @@ class LeapProvider(object):
         if fingerprint.strip() != digest:
             raise Exception('Certificate fingerprints don\'t match! Expected [%s] but got [%s]' % (fingerprint.strip(), digest))
 
+    def smtp_info(self):
+        json_data = self.fetch_smtp_json()
+        hosts = json_data['hosts']
+        hostname = hosts.keys()[0]
+        host = hosts[hostname]
+        return host['hostname'], host['port']
+
     def _validated_get(self, url):
         session = requests.session()
         try:
@@ -130,3 +138,10 @@ class LeapProvider(object):
 
     def address_for(self, username):
         return '%s@%s' % (username, self.domain)
+
+    def _client_cert_path(self):
+        return os.path.join(
+            self.config.leap_home,
+            "providers",
+            self.domain,
+            "keys", "client", "smtp.pem")
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index e13e5863..4a503628 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -16,17 +16,18 @@
 import errno
 import traceback
 import sys
-
 import os
+import requests
+
+from twisted.internet import reactor, defer
+from pixelated.bitmask_libraries.certs import LeapCertificate
+from pixelated.adapter.mailstore import LeapMailStore
 from leap.mail.incoming.service import IncomingMail
-from twisted.internet import reactor
-from .nicknym import NickNym
 from leap.auth import SRPAuth
-from pixelated.adapter.mailstore import LeapMailStore
-from .soledad import SoledadSessionFactory
-from .smtp import LeapSmtp
 from leap.mail.imap.account import IMAPAccount
-from twisted.internet import defer
+from .nicknym import NickNym
+from .smtp import LeapSmtp
+from .soledad import SoledadSessionFactory
 
 from leap.common.events import (
     register,
@@ -149,12 +150,36 @@ class LeapSessionFactory(object):
 
         nicknym = self._create_nicknym(account_email, auth.token, auth.uuid, soledad)
 
+        self._download_smtp_cert(auth)
         smtp = LeapSmtp(self._provider, auth, nicknym.keymanager)
 
         # TODO: Create the new mail sender based on what we have in available LeapSmtp, e.g. the certs
 
         return LeapSession(self._provider, auth, mail_store, soledad, nicknym, smtp)
 
+    def _download_smtp_cert(self, auth):
+        cert_path = self._provider._client_cert_path()
+
+        if not os.path.exists(os.path.dirname(cert_path)):
+            os.makedirs(os.path.dirname(cert_path))
+
+        cert_url = '%s/%s/cert' % (self._provider.api_uri, self._provider.api_version)
+        cookies = {"_session_id": auth.session_id}
+        headers = {}
+        headers["Authorization"] = 'Token token="{0}"'.format(auth.token)
+        response = requests.get(
+            cert_url,
+            verify=LeapCertificate(self._provider).provider_api_cert,
+            cookies=cookies,
+            timeout=self._provider.config.timeout_in_s,
+            headers=headers)
+        response.raise_for_status()
+
+        client_cert = response.content
+
+        with open(cert_path, 'w') as f:
+            f.write(client_cert)
+
     def _lookup_session(self, key):
         global SESSIONS
         if key in SESSIONS:
diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index ff2792fb..63d2d310 100644
--- a/service/pixelated/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
@@ -33,57 +33,12 @@ class LeapSmtp(object):
         self.session_id = auth.session_id
         self.user_token = auth.token
         self._keymanager = keymanager
-        self._remote_hostname, self._remote_port = self._discover_remote_smtp_server()
+        self._remote_hostname, self._remote_port = provider.smtp_info()
         self._local_smtp_service_socket = None
         self._local_smtp_service = None
 
-    def smtp_info(self):
-        return ('localhost', self.local_smtp_port_number)
-
-    def _discover_remote_smtp_server(self):
-        json_data = self._provider.fetch_smtp_json()
-        hosts = json_data['hosts']
-        hostname = hosts.keys()[0]
-        host = hosts[hostname]
-
-        hostname = host['hostname']
-        port = host['port']
-
-        return hostname, port
-
-    def _download_client_certificates(self):
-        cert_path = self._client_cert_path()
-
-        if not os.path.exists(os.path.dirname(cert_path)):
-            os.makedirs(os.path.dirname(cert_path))
-
-        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,
-            headers=headers)
-        response.raise_for_status()
-
-        client_cert = response.content
-
-        with open(cert_path, 'w') as f:
-            f.write(client_cert)
-
-    def _client_cert_path(self):
-        return os.path.join(
-            self._provider.config.leap_home,
-            "providers",
-            self._provider.domain,
-            "keys", "client", "smtp.pem")
-
     def start(self):
-        self._download_client_certificates()
-        cert_path = self._client_cert_path()
+        cert_path = self._provider._client_cert_path()
         email = '%s@%s' % (self.username, self._provider.domain)
 
         self._local_smtp_service, self._local_smtp_service_socket = setup_smtp_gateway(
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py
index 23fd01d8..7c08d286 100644
--- a/service/pixelated/config/services.py
+++ b/service/pixelated/config/services.py
@@ -1,7 +1,7 @@
 from pixelated.adapter.mailstore.searchable_mailstore import SearchableMailStore
 from pixelated.adapter.services.mail_service import MailService
 from pixelated.adapter.model.mail import InputMail
-from pixelated.adapter.services.mail_sender import LocalSmtpMailSender
+from pixelated.adapter.services.mail_sender import LocalSmtpMailSender  # , MailSender
 from pixelated.adapter.search import SearchEngine
 from pixelated.adapter.services.draft_service import DraftService
 from pixelated.adapter.listeners.mailbox_indexer_listener import listen_all_mailboxes
@@ -55,11 +55,18 @@ class Services(object):
         self.search_engine = search_engine
 
     def setup_mail_service(self, leap_session, search_engine):
-        # if False:   FIXME
-        #    yield pixelated_mailboxes.add_welcome_mail_for_fresh_user()
+        smtp_host, smtp_port = leap_session.provider.smtp_info()
         pixelated_mail_sender = LocalSmtpMailSender(
             leap_session.account_email(),
             leap_session.smtp)
+
+        # pixelated_mail_sender = MailSender(
+        #     leap_session.account_email(),
+        #     leap_session.nicknym,
+        #     leap_session.provider.local_ca_crt,
+        #     smtp_host,
+        #     smtp_port)
+
         return MailService(
             pixelated_mail_sender,
             leap_session.mail_store,
diff --git a/service/test/unit/bitmask_libraries/test_smtp.py b/service/test/unit/bitmask_libraries/test_smtp.py
index 9481c488..182a0786 100644
--- a/service/test/unit/bitmask_libraries/test_smtp.py
+++ b/service/test/unit/bitmask_libraries/test_smtp.py
@@ -53,20 +53,13 @@ class LeapSmtpTest(AbstractLeapTest):
         }
         self.config.timeout_in_s = 15
 
-    def test_that_client_cert_gets_downloaded(self):
-        smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
-
-        with HTTMock(ca_cert_mock, not_found_mock):
-            smtp._download_client_certificates()
-
-            path = self._client_cert_path()
-            self.assertTrue(os.path.isfile(path))
-
     def _client_cert_path(self):
         return os.path.join(self.leap_home, 'providers', 'some-server.test', 'keys', 'client', 'smtp.pem')
 
     @patch('pixelated.bitmask_libraries.smtp.setup_smtp_gateway')
     def test_that_start_calls_setup_smtp_gateway(self, gateway_mock):
+        self.provider.smtp_info = MagicMock(return_value=('smtp.some-sever.test', 1234))
+        self.provider._client_cert_path = MagicMock(return_value=self._client_cert_path())
         smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
 
         port = 500
@@ -76,9 +69,10 @@ class LeapSmtpTest(AbstractLeapTest):
             smtp.ensure_running()
 
         cert_path = self._client_cert_path()
-        gateway_mock.assert_called_with(keymanager=self.keymanager, smtp_cert=cert_path, smtp_key=cert_path, userid='test_user@some-server.test', smtp_port='1234', encrypted_only=False, smtp_host='smtp.some-sever.test', port=port)
+        gateway_mock.assert_called_with(smtp_cert=cert_path, userid='test_user@some-server.test', smtp_port=1234, smtp_key=cert_path, keymanager=self.keymanager, encrypted_only=False, smtp_host='smtp.some-sever.test', port=port)
 
     def test_that_client_stop_does_nothing_if_not_started(self):
+        self.provider.smtp_info = MagicMock(return_value=('smtp.some-sever.test', 1234))
         smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
 
         with HTTMock(not_found_mock):
@@ -86,6 +80,7 @@ class LeapSmtpTest(AbstractLeapTest):
 
     @patch('pixelated.bitmask_libraries.smtp.setup_smtp_gateway')
     def test_that_running_smtp_sevice_is_stopped(self, gateway_mock):
+        self.provider.smtp_info = MagicMock(return_value=('smtp.some-sever.test', 1234))
         smtp = LeapSmtp(self.provider, self.auth, self.keymanager)
 
         smtp_service = MagicMock()