Add test for message encryption.

1 files changed, 36 insertions, 30 deletions

diff --git a/src/leap/email/smtp/tests/test_smtprelay.py b/src/leap/email/smtp/tests/test_smtprelay.py
index 5410c75e..dc0055c6 100644
--- a/src/leap/email/smtp/tests/test_smtprelay.py
+++ b/src/leap/email/smtp/tests/test_smtprelay.py
@@ -1,22 +1,25 @@
 from datetime import datetime
 import re
 from leap.email.smtp.smtprelay import (
-    SMTPFactory,   # a ServerFactory
+    SMTPFactory,
     #SMTPDelivery, # an object
-    #EncryptedMessage,
+    EncryptedMessage,
 )
 from leap.email.smtp import tests
 from twisted.internet.error import ConnectionDone
 from twisted.test import proto_helpers
+from twisted.internet import defer
+from twisted.mail.smtp import User
 
 
+# some regexps
+IP_REGEX = "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])";
+HOSTNAME_REGEX = "(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])";
+IP_OR_HOST_REGEX = '(' + IP_REGEX + '|' + HOSTNAME_REGEX + ')'
+
 class TestSmtpRelay(tests.OpenPGPTestCase):
     
-    IP_REGEX = "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])";
-    HOSTNAME_REGEX = "(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])";
-    IP_OR_HOST_REGEX = '(' + IP_REGEX + '|' + HOSTNAME_REGEX + ')'
-    
-    CRLF = '\r\n'
+
     EMAIL_DATA = [ 'HELO relay.leap.se',
                    'MAIL FROM: <user@leap.se>',
                    'RCPT TO: <leap@leap.se>',
@@ -32,25 +35,8 @@ class TestSmtpRelay(tests.OpenPGPTestCase):
                    '',
                    '.',
                    'QUIT' ]
-    SMTP_ANSWERS = [ '220 ' + IP_OR_HOST_REGEX + ' NO UCE NO UBE NO RELAY PROBES',
-                     '250 ' + IP_OR_HOST_REGEX + ' Hello ' + IP_OR_HOST_REGEX + ', nice to meet you',
-                     '250 Sender address accepted',
-                     '250 Recipient address accepted',
-                     '354 Continue' ]
-    
-
-    def setUp(self):
-        super(TestSmtpRelay, self).setUp()
-        self.proto = SMTPFactory(self._gpg).buildProtocol(('127.0.0.1',0))
-        self.transport = proto_helpers.StringTransport()
-        self.proto.makeConnection(self.transport)
 
 
-    def tearDown(self):
-        self.proto.setTimeout(None)
-        super(TestSmtpRelay, self).tearDown()
-
-    
     def assertMatch(self, string, pattern, msg=None):
         if not re.match(pattern, string):
             msg = self._formatMessage(msg, '"%s" does not match pattern "%s".'
@@ -58,13 +44,33 @@ class TestSmtpRelay(tests.OpenPGPTestCase):
             raise self.failureException(msg)
 
 
-    def test_send_email(self):
+    def test_relay_accepts_valid_email(self):
         """
-        If L{smtp.SMTP} receives an empty line, it responds with a 500 error
-        response code and a message about a syntax error.
+        Test if SMTP server responds correctly for valid interaction.
         """
+        SMTP_ANSWERS = [ '220 ' + IP_OR_HOST_REGEX + ' NO UCE NO UBE NO RELAY PROBES',
+                         '250 ' + IP_OR_HOST_REGEX + ' Hello ' + IP_OR_HOST_REGEX + ', nice to meet you',
+                         '250 Sender address accepted',
+                         '250 Recipient address accepted',
+                         '354 Continue' ]
+        proto = SMTPFactory(self._gpg).buildProtocol(('127.0.0.1',0))
+        transport = proto_helpers.StringTransport()
+        proto.makeConnection(transport)
         for i, line in enumerate(self.EMAIL_DATA):
-            self.proto.lineReceived(line+self.CRLF)
-            self.assertMatch(self.transport.value(),
-                             self.CRLF.join(self.SMTP_ANSWERS[0:i+1]))
+            proto.lineReceived(line + '\r\n')
+            self.assertMatch(transport.value(),
+                             '\r\n'.join(SMTP_ANSWERS[0:i+1]))
+        proto.setTimeout(None)
+
+
+    def test_message_encrypt(self):
+        proto = SMTPFactory(self._gpg).buildProtocol(('127.0.0.1',0))
+        user = User('leap@leap.se', 'relay.leap.se', proto, 'leap@leap.se')
+        m = EncryptedMessage(user, self._gpg)
+        for line in self.EMAIL_DATA[4:12]:
+            m.lineReceived(line)
+        m.parseMessage()
+        m.encrypt()
+        decrypted = str(self._gpg.decrypt(m.cyphertext))
+        self.assertEqual('\n'.join(self.EMAIL_DATA[9:12]), decrypted)