June 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Set the SMTPAutoresponder factory's domain name to our FQDN.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 80f10af226387017d37560513d8fe40629560296 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:17:15 2014 +0000 Set the SMTPAutoresponder factory's domain name to our FQDN. --- lib/bridgedb/email/autoresponder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 41e811b..9be7e7d 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -639,6 +639,7 @@ class SMTPAutoresponder(smtp.SMTPClient): self.deferred, retries=retries, timeout=timeout) + factory.domain = smtp.DNSNAME reaktor.connectTCP(self.incoming.context.smtpServerIP, self.incoming.context.smtpServerPort, factory)

1 0

[bridgedb/develop] Add Sphinx source doc files for bridgedb.email.autoresponder documentation.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 268a4083351426fb002fa6cb1de997ab07af455c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 2 21:10:24 2014 +0000 Add Sphinx source doc files for bridgedb.email.autoresponder documentation. --- doc/sphinx/source/bridgedb.email.autoresponder.rst | 8 ++++++++ doc/sphinx/source/bridgedb.rst | 1 + doc/sphinx/source/conf.py | 1 + 3 files changed, 10 insertions(+) diff --git a/doc/sphinx/source/bridgedb.email.autoresponder.rst b/doc/sphinx/source/bridgedb.email.autoresponder.rst new file mode 100644 index 0000000..90be549 --- /dev/null +++ b/doc/sphinx/source/bridgedb.email.autoresponder.rst @@ -0,0 +1,8 @@ +bridgedb.email.autoresponder +---------------------------- + +.. automodule:: bridgedb.email.autoresponder + :members: + :undoc-members: + :private-members: + :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index 73e822b..ab14ead 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -12,6 +12,7 @@ BridgeDB Package and Module Documentation bridgedb.crypto bridgedb.Dist bridgedb.email + bridgedb.email.autoresponder bridgedb.email.dkim bridgedb.email.request bridgedb.email.server diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 3e320d9..a21b4aa 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -33,6 +33,7 @@ import bridgedb.Bucket import bridgedb.crypto import bridgedb.Dist import bridgedb.email +import bridgedb.email.autoresponder import bridgedb.email.dkim import bridgedb.email.request import bridgedb.email.server

1 0

[bridgedb/develop] Remove old imports and add autoresponder import to bridgedb.email.server.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 1f865b393b977c6205f043e6d53bd63b042187ef Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 2 21:11:01 2014 +0000 Remove old imports and add autoresponder import to bridgedb.email.server. --- lib/bridgedb/email/server.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 6bc7300..50c5987 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -20,28 +20,23 @@ from __future__ import unicode_literals import logging import io import socket -import time from twisted.internet import defer from twisted.internet import reactor from twisted.internet.task import LoopingCall from twisted.mail import smtp +from twisted.mail.smtp import rfc822date +from twisted.python import failure from zope.interface import implements +from bridgedb import __version__ from bridgedb import safelog -from bridgedb import translations from bridgedb.crypto import getGPGContext -from bridgedb.crypto import gpgSignMessage -from bridgedb.crypto import NEW_BUFFER_INTERFACE -from bridgedb.Dist import EmailRequestedHelp -from bridgedb.Dist import EmailRequestedKey -from bridgedb.Dist import TooSoonEmail -from bridgedb.Dist import IgnoreEmail +from bridgedb.email import autoresponder from bridgedb.email import templates from bridgedb.email import request from bridgedb.parse import addr -from bridgedb.parse.addr import BadEmail from bridgedb.parse.addr import UnsupportedDomain from bridgedb.parse.addr import canonicalizeEmailDomain

1 0

[bridgedb/develop] Remove moved unittests from bridgedb.test.test_email_server.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit c509a0abb5df5e355f1acc8185fe285e33763dca Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 2 21:11:51 2014 +0000 Remove moved unittests from bridgedb.test.test_email_server. --- lib/bridgedb/test/test_email_server.py | 507 +++++++++----------------------- 1 file changed, 140 insertions(+), 367 deletions(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index 198cb27..f79f603 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -13,351 +13,99 @@ from __future__ import print_function -import io -import copy -import os -import shutil import socket +import string import types -from bridgedb.Dist import EmailBasedDistributor -from bridgedb.email import server -from bridgedb.parse.addr import BadEmail -from bridgedb.persistent import Conf -from bridgedb.schedule import Unscheduled -from bridgedb.test.test_HTTPServer import DummyBridge -from bridgedb.test.util import fileCheckDecorator -from bridgedb.test.util import TestCaseMixin - from twisted.python import log from twisted.internet import defer from twisted.internet import reactor +from twisted.mail.smtp import IMessage from twisted.mail.smtp import SMTPBadRcpt from twisted.mail.smtp import SMTPBadSender from twisted.mail.smtp import User from twisted.mail.smtp import Address +from twisted.mail.smtp import rfc822 from twisted.test import proto_helpers from twisted.trial import unittest +from zope.interface import implementedBy +from bridgedb.Dist import EmailBasedDistributor +from bridgedb.Dist import TooSoonEmail +from bridgedb.email import server +from bridgedb.parse.addr import BadEmail +from bridgedb.schedule import Unscheduled +from bridgedb.test.util import fileCheckDecorator +from bridgedb.test.util import TestCaseMixin +from bridgedb.test.email_helpers import _createConfig +from bridgedb.test.email_helpers import _createMailServerContext -class CheckDKIMTests(unittest.TestCase): - """Tests for :func:`email.server.checkDKIM`.""" +class SMTPMessageTests(unittest.TestCase): + """Unittests for :class:`bridgedb.email.server.SMTPMessage`.""" def setUp(self): - """Create fake email, distributor, and associated context data.""" - self.goodMessage = io.StringIO(unicode("""\ -From: user(a)gmail.com -To: bridges@localhost -X-DKIM-Authentication-Results: pass -Subject: testing - -get bridges -""")) - self.badMessage = io.StringIO(unicode("""\ -From: user(a)gmail.com -To: bridges@localhost -Subject: testing - -get bridges -""")) self.config = _createConfig() - self.domainRules = self.config.EMAIL_DOMAIN_RULES - - def test_checkDKIM_good(self): - message = server.smtp.rfc822.Message(self.goodMessage) - self.assertTrue(server.checkDKIM(message, - self.domainRules.get("gmail.com"))) - - def test_checkDKIM_bad(self): - message = server.smtp.rfc822.Message(self.badMessage) - result = server.checkDKIM(message, self.domainRules.get("gmail.com")) - self.assertIs(result, False) - + self.context = _createMailServerContext(self.config) + self.message = server.SMTPMessage(self.context, + canonicalFromSMTP='localhost') + self.line = string.ascii_lowercase -class CreateResponseBodyTests(unittest.TestCase): - """Tests for :func:`bridgedb.email.server.createResponseBody`.""" - - def _moveGPGTestKeyfile(self): - here = os.getcwd() - topDir = here.rstrip('_trial_temp') - self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') - self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') - shutil.copy(self.gpgFile, self.gpgMoved) + def tearDown(self): + """Re-enable safelogging in between test runs.""" + server.safelog.setSafeLogging(True) - def setUp(self): - """Create fake email, distributor, and associated context data.""" - self._moveGPGTestKeyfile() - self.toAddress = "user(a)example.com" - self.config = _createConfig() - self.ctx = _createMailContext(self.config) - self.distributor = self.ctx.distributor - - def _getIncomingLines(self, clientAddress="user(a)example.com"): - """Generate the lines of an incoming email from **clientAddress**.""" - self.toAddress = server.smtp.Address(clientAddress) - lines = [ - "From: %s" % clientAddress, - "To: bridges@localhost", - "Subject: testing", - "", - "get bridges", - ] - return lines - - def test_createResponseBody_getKey(self): - """A request for 'get key' should receive our GPG key.""" - lines = self._getIncomingLines() - lines[4] = "get key" - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertSubstring('-----BEGIN PGP PUBLIC KEY BLOCK-----', ret) - - def test_createResponseBody_bridges_invalid(self): - """An invalid request for 'transport obfs3' should get help text.""" - lines = self._getIncomingLines("testing@localhost") - lines[4] = "transport obfs3" - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertSubstring("COMMANDs", ret) - - def test_createResponseBody_bridges_obfs3(self): - """A request for 'get transport obfs3' should receive a response.""" - lines = self._getIncomingLines("testing@localhost") - lines[4] = "get transport obfs3" - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertSubstring("Here are your bridges", ret) - self.assertSubstring("obfs3", ret) - - def test_createResponseBody_bridges_obfsobfswebz(self): - """We should only pay attention to the *last* in a crazy request.""" - lines = self._getIncomingLines("testing@localhost") - lines[4] = "get unblocked webz" - lines.append("get transport obfs2") - lines.append("get transport obfs3") - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertSubstring("Here are your bridges", ret) - self.assertSubstring("obfs3", ret) - - def test_createResponseBody_bridges_obfsobfswebzipv6(self): - """We should *still* only pay attention to the *last* request.""" - lines = self._getIncomingLines("testing@localhost") - lines[4] = "transport obfs3" - lines.append("get unblocked webz") - lines.append("get ipv6") - lines.append("get transport obfs2") - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertSubstring("Here are your bridges", ret) - self.assertSubstring("obfs2", ret) - - -class MailResponseTests(unittest.TestCase): - """Tests for ``generateResponse()`` and ``MailResponse``.""" + def test_SMTPMessage_init(self): + """Our ``message`` attribute should be a ``SMTPMessage`` object, and + ``message.responder`` should be a + :class:`bridgedb.email.autoresponder.SMTPAutoresponder`. + """ + self.assertIsInstance(self.message, server.SMTPMessage) + self.assertIsInstance(self.message.responder, + server.autoresponder.SMTPAutoresponder) - def setUp(self): - self.fromAddr = "bridges(a)torproject.org" - self.clientAddr = "user(a)example.com" - self.body = """\ -People think that time is strictly linear, but, in reality, it's actually just -a ball of timey-wimey, wibbly-warbly... stuff.""" + def test_SMTPMessage_IMessage_interface(self): + """``SMTPMessage`` should implement ``twisted.mail.smtp.IMessage``.""" + self.assertTrue(IMessage.implementedBy(server.SMTPMessage)) - def tearDown(self): - server.safelog.safe_logging = True - - def test_MailResponse_generateResponse(self): - response = server.generateResponse(self.fromAddr, self.clientAddr, - self.body) - self.assertIsInstance(response, server.MailResponse) - - def test_MailResponse_generateResponse_noSafelog(self): - server.safelog.safe_logging = False - response = server.generateResponse(self.fromAddr, self.clientAddr, - self.body) - self.assertIsInstance(response, server.MailResponse) - - def test_MailResponse_generateResponse_mailfile(self): - response = server.generateResponse(self.fromAddr, self.clientAddr, - self.body) - self.assertIsInstance(response.mailfile, (io.BytesIO, io.StringIO)) - - def test_MailResponse_generateResponse_withInReplyTo(self): - response = server.generateResponse(self.fromAddr, self.clientAddr, - self.body, messageID="NSA") - contents = str(response.readContents()).replace('\x00', '') - self.assertIsInstance(response.mailfile, (io.BytesIO, io.StringIO)) - self.assertSubstring("In-Reply-To: NSA", contents) - - def test_MailResponse_generateResponse_readContents(self): - response = server.generateResponse(self.fromAddr, self.clientAddr, - self.body) - contents = str(response.readContents()).replace('\x00', '') - self.assertSubstring('timey-wimey, wibbly-warbly... stuff.', contents) - - def test_MailResponse_additionalHeaders(self): - response = server.MailResponse() - response.writeHeaders(self.fromAddr, self.clientAddr, - subject="Re: echelon", inReplyTo="NSA", - X_been_there="They were so 2004") - contents = str(response.readContents()).replace('\x00', '') - self.assertIsInstance(response.mailfile, (io.BytesIO, io.StringIO)) - self.assertSubstring("In-Reply-To: NSA", contents) - self.assertSubstring("X-been-there: They were so 2004", contents) - - def test_MailResponse_close(self): - """Calling MailResponse.close() should close the ``mailfile`` and set - ``closed=True``. + def test_SMTPMessage_lineReceived_withSafelog(self): + """Test sending a line of text to ``SMTPMessage.lineReceived`` with + safelogging enabled. """ - response = server.MailResponse() - self.assertEqual(response.closed, False) - response.close() - self.assertEqual(response.closed, True) - self.assertRaises(ValueError, response.write, self.body) - - def test_MailResponse_write(self): - """Calling MailResponse.write() should write to the mailfile.""" - response = server.MailResponse() - response.write(self.body) - contents = str(response.readContents()).replace('\x00', '') - self.assertEqual(self.body.replace('\n', '\r\n') + '\r\n', contents) - - def test_MailResponse_writelines(self): - """Calling MailResponse.writelines() with a list should write the - concatenated contents of the list into the mailfile. + server.safelog.setSafeLogging(True) + self.message.lineReceived(self.line) + self.assertEqual(self.message.nBytes, 26) + self.assertTrue(self.line in self.message.lines) + + def test_SMTPMessage_lineReceived_withoutSafelog(self): + """Test sending a line of text to ``SMTPMessage.lineReceived`` with + safelogging disnabled. """ - response = server.MailResponse() - response.writelines(self.body.split('\n')) - contents = str(response.readContents()).replace('\x00', '') - self.assertEqual(self.body.replace('\n', '\r\n') + '\r\n', contents) + server.safelog.setSafeLogging(False) + for _ in range(3): + self.message.lineReceived(self.line) + self.assertEqual(self.message.nBytes, 3*26) + self.assertTrue(self.line in self.message.lines) + def test_SMTPMessage_eomReceived(self): + """Calling ``oemReceived`` should return a deferred.""" + self.message.lineReceived(self.line) + self.assertIsInstance(self.message.eomReceived(), + defer.Deferred) -class MailMessageTests(unittest.TestCase): - """Unittests for :class:`bridgedb.email.server.MailMessage`.""" + def test_SMTPMessage_getIncomingMessage(self): + """``getIncomingMessage`` should return a ``rfc822.Message``.""" + self.message.lineReceived(self.line) + self.assertIsInstance(self.message.getIncomingMessage(), + rfc822.Message) - def setUp(self): - self.config = _createConfig() - self.context = _createMailContext(self.config) - self.message = server.MailMessage(self.context) - - def _getIncomingLines(self, clientAddress="user(a)example.com"): - """Generate the lines of an incoming email from **clientAddress**.""" - lines = [ - "From: %s" % clientAddress, - "To: bridges@localhost", - "Subject: testing", - "", - "get bridges", - ] - self.message.lines = lines - - def test_MailMessage_getMailFrom_notbridgedb_at_yikezors_dot_net(self): - """MailMessage.getMailFrom() for an incoming email sent to any email - address other than the one we're listening for should return our - configured address, not the one in the incoming email. - """ - self._getIncomingLines() - self.message.lines[1] = 'To: notbridgedb(a)yikezors.net' - incoming = self.message.getIncomingMessage() - recipient = str(self.message.getMailFrom(incoming)) - self.assertEqual(recipient, self.context.fromAddr) - - def test_MailMessage_getMailFrom_givemebridges_at_seriously(self): - """MailMessage.getMailFrom() for an incoming email sent to any email - address other than the one we're listening for should return our - configured address, not the one in the incoming email. - """ - self._getIncomingLines() - self.message.lines[1] = 'To: givemebridges(a)serious.ly' - incoming = self.message.getIncomingMessage() - recipient = str(self.message.getMailFrom(incoming)) - self.assertEqual(recipient, self.context.fromAddr) - - def test_MailMessage_getMailFrom_bad_address(self): - """MailMessage.getMailFrom() for an incoming email sent to a malformed - email address should log an smtp.AddressError and then return our - configured email address. - """ - self._getIncomingLines() - self.message.lines[1] = 'To: ><@><<<>>.foo' - incoming = self.message.getIncomingMessage() - recipient = str(self.message.getMailFrom(incoming)) - self.assertEqual(recipient, self.context.fromAddr) - - def test_MailMessage_reply_noFrom(self): - """A received email without a "From:" or "Sender:" header shouldn't - receive a response. - """ - self._getIncomingLines() - self.message.lines[0] = "" - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - - def test_MailMessage_reply_badAddress(self): - """Don't respond to RFC2822 malformed source addresses.""" - self._getIncomingLines("testing*.?\"@example.com") - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - - def test_MailMessage_reply_anotherBadAddress(self): - """Don't respond to RFC2822 malformed source addresses.""" - self._getIncomingLines("Mallory <>>@example.com") - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - - def test_MailMessage_reply_invalidDomain(self): - """Don't respond to RFC2822 malformed source addresses.""" - self._getIncomingLines("testing(a)exa#mple.com") - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - - def test_MailMessage_reply_anotherInvalidDomain(self): - """Don't respond to RFC2822 malformed source addresses.""" - self._getIncomingLines("testing(a)exam+ple.com") - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - - def test_MailMessage_reply_DKIM_badDKIMheader(self): - """An email with an 'X-DKIM-Authentication-Result:' header appended - after the body should not receive a response. - """ - self._getIncomingLines("testing(a)gmail.com") - self.message.lines.append("X-DKIM-Authentication-Result: ") - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - - def test_MailMessage_reply_goodDKIMheader(self): - """An email with a good DKIM header should be responded to.""" - self._getIncomingLines("testing(a)gmail.com") - self.message.lines.insert(3, "X-DKIM-Authentication-Result: pass") - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - - def test_MailMessage_reply_transport_invalid(self): - """An invalid request for 'transport obfs3' should get help text.""" - self.skip = True - raise unittest.SkipTest("We need to fake the reactor for this one") - - self._getIncomingLines("testing(a)example.com") - self.message.lines[4] = "transport obfs3" - ret = self.message.reply() - self.assertSubstring("COMMANDs", ret) - - def test_MailMessage_reply_transport_valid(self): - """An valid request for 'get transport obfs3' should get obfs3.""" - self.skip = True - raise unittest.SkipTest("We need to fake the reactor for this one") - - self._getIncomingLines("testing(a)example.com") - self.message.lines[4] = "transport obfs3" - ret = self.message.reply() - self.assertIsInstance(ret, defer.Deferred) - self.assertSubstring("obfs3", ret) - return ret - - -class MailDeliveryTests(unittest.TestCase): - """Unittests for :class:`email.server.MailDelivery`.""" + +class SMTPIncomingDeliveryTests(unittest.TestCase): + """Unittests for :class:`email.server.SMTPIncomingDelivery`.""" def setUp(self): - """Set up our :class:`server.MailDelivery` instance, and reset the + """Set up our :class:`server.SMTPIncomingDelivery` instance, and reset the following ``TestCase`` attributes to ``None``: - ``helo`` - ``proto`` @@ -365,8 +113,8 @@ class MailDeliveryTests(unittest.TestCase): - ``user`` """ self.config = _createConfig() - self.context = _createMailContext(self.config) - self.delivery = server.MailDelivery() + self.context = _createMailServerContext(self.config) + self.delivery = server.SMTPIncomingDelivery() self.helo = None self.proto = None @@ -417,39 +165,41 @@ class MailDeliveryTests(unittest.TestCase): """ self.helo = ('localhost', '127.0.0.1') self.origin = server.smtp.Address('client(a)example.com') - self.delivery.setBridgeDBContext(self.context) + self.delivery.setContext(self.context) - def _setUpRCPTTO(self, username=None): + def _setUpRCPTTO(self, username=None, domain=None, ip=None): """Set up the parameters for emulating a connected client sending a SMTP 'RCPT TO:' command to us. The default is to emulate sending: ``RCPT TO: bridges@localhost``. """ name = username if username is not None else self.config.EMAIL_USERNAME - self._createUser(name, 'localhost', '127.0.0.1') - self.delivery.setBridgeDBContext(self.context) - - def test_MailDelivery_init(self): - """After calling :meth:`server.MailDelivery.__init__`, we should have a - :class:`server.MailDelivery` object instance. + host = domain if domain is not None else 'localhost' + addr = ip if ip is not None else '127.0.0.1' + self._createUser(name, host, ip) + self.delivery.setContext(self.context) + + def test_SMTPIncomingDelivery_init(self): + """After calling :meth:`server.SMTPIncomingDelivery.__init__`, we should have a + :class:`server.SMTPIncomingDelivery` object instance. """ - self.assertIsInstance(self.delivery, server.MailDelivery) + self.assertIsInstance(self.delivery, server.SMTPIncomingDelivery) - def test_MailDelivery_setBridgeDBContext(self): - """Calling :meth:`server.MailDelivery.setBridgeDBContext` should set - the :ivar:`MailDelivery.context` attribute. + def test_SMTPIncomingDelivery_setContext(self): + """Calling :meth:`server.SMTPIncomingDelivery.setContext` should set + the :ivar:`SMTPIncomingDelivery.context` attribute. - The ``MailDelivery.context`` should be a :class:`server.MailContext`, + The ``SMTPIncomingDelivery.context`` should be a :class:`server.MailServerContext`, and it should have relevant settings from the config file stored within it. """ - self.delivery.setBridgeDBContext(self.context) - self.assertIsInstance(self.delivery.context, server.MailContext) + self.delivery.setContext(self.context) + self.assertIsInstance(self.delivery.context, server.MailServerContext) self.assertEqual(self.delivery.context.smtpFromAddr, self.config.EMAIL_SMTP_FROM_ADDR) - def test_MailDelivery_receivedHeader(self): - """The email resulting from a MailDelivery, the latter received from + def test_SMTPIncomingDelivery_receivedHeader(self): + """The email resulting from a SMTPIncomingDelivery, the latter received from ``'client(a)example.com'`` should contain a header stating: ``'Received: from example.com'``. """ @@ -457,20 +207,20 @@ class MailDeliveryTests(unittest.TestCase): hdr = self.delivery.receivedHeader(self.helo, self.origin, [self.user,]) self.assertSubstring("Received: from example.com", hdr) - def test_MailDelivery_validateFrom(self): - """A valid origin should be stored as ``MailDelivery.fromCanonical``.""" + def test_SMTPIncomingDelivery_validateFrom(self): + """A valid origin should be stored as ``SMTPIncomingDelivery.fromCanonical``.""" self._setUpMAILFROM() self.delivery.validateFrom(self.helo, self.origin) - self.assertEqual(self.delivery.fromCanonical, 'example.com') + self.assertEqual(self.delivery.fromCanonicalSMTP, 'example.com') - def test_MailDelivery_validateFrom_unsupportedDomain(self): + def test_SMTPIncomingDelivery_validateFrom_unsupportedDomain(self): """A domain not in our canon should raise a SMTPBadSender.""" self._setUpMAILFROM() origin = server.smtp.Address('throwing.pickles(a)yo.mama') self.assertRaises(SMTPBadSender, self.delivery.validateFrom, self.helo, origin) - def test_MailDelivery_validateFrom_origin_notAdressType(self): + def test_SMTPIncomingDelivery_validateFrom_origin_notAdressType(self): """A non ``twisted.mail.smtp.Address`` origin should raise an AttributeError exception. """ @@ -478,28 +228,48 @@ class MailDeliveryTests(unittest.TestCase): origin = 'throwing.pickles(a)yo.mama' self.delivery.validateFrom(self.helo, origin) - def test_MailDelivery_validateTo(self): - """Should return a callable that results in a MailMessage.""" + def test_SMTPIncomingDelivery_validateTo(self): + """Should return a callable that results in a SMTPMessage.""" self._setUpRCPTTO() validated = self.delivery.validateTo(self.user) self.assertIsInstance(validated, types.FunctionType) - self.assertIsInstance(validated(), server.MailMessage) + self.assertIsInstance(validated(), server.SMTPMessage) - def test_MailDelivery_validateTo_plusAddress(self): - """Should return a callable that results in a MailMessage.""" + def test_SMTPIncomingDelivery_validateTo_plusAddress(self): + """Should return a callable that results in a SMTPMessage.""" self._setUpRCPTTO('bridges+ar') validated = self.delivery.validateTo(self.user) self.assertIsInstance(validated, types.FunctionType) - self.assertIsInstance(validated(), server.MailMessage) + self.assertIsInstance(validated(), server.SMTPMessage) - def test_MailDelivery_validateTo_badUsername(self): - """A :class:`server.MailDelivery` which sends a SMTP + def test_SMTPIncomingDelivery_validateTo_badUsername_plusAddress(self): + """'givemebridges+zh_cn@...' should raise an SMTPBadRcpt exception.""" + self._setUpRCPTTO('givemebridges+zh_cn') + self.assertRaises(SMTPBadRcpt, self.delivery.validateTo, self.user) + + def test_SMTPIncomingDelivery_validateTo_badUsername(self): + """A :class:`server.SMTPIncomingDelivery` which sends a SMTP ``RCPT TO: yo.mama@localhost`` should raise a ``twisted.mail.smtp.SMTPBadRcpt`` exception. """ self._setUpRCPTTO('yo.mama') self.assertRaises(SMTPBadRcpt, self.delivery.validateTo, self.user) + def test_SMTPIncomingDelivery_validateTo_notOurDomain(self): + """An SMTP ``RCPT TO: bridges(a)forealsi.es`` should raise an SMTPBadRcpt + exception. + """ + self._setUpRCPTTO('bridges', 'forealsi.es') + self.assertRaises(SMTPBadRcpt, self.delivery.validateTo, self.user) + + def test_SMTPIncomingDelivery_validateTo_subdomain(self): + """An SMTP ``RCPT TO: bridges(a)subdomain.localhost`` should be allowed. + """ + self._setUpRCPTTO('bridges', 'subdomain.localhost') + validated = self.delivery.validateTo(self.user) + self.assertIsInstance(validated, types.FunctionType) + self.assertIsInstance(validated(), server.SMTPMessage) + class SMTPTestCaseMixin(TestCaseMixin): """Utility methods for use within any subclasses of @@ -516,7 +286,7 @@ class SMTPTestCaseMixin(TestCaseMixin): class ExampleSMTPTests(SMTPTestCaseMixin, unittest.TestCase): def setUp(self): - factory = twisted.mail.smtp.SMTPFactory() + factory = twisted.mail.smtp.SMTPIncomingServerFactory() self.proto = self.factory.buildProtocol(('127.0.0.1', 0)) @@ -550,7 +320,7 @@ class SMTPTestCaseMixin(TestCaseMixin): segment. Includes the SMTP DATA EOM command ('.') at the end. If no keyword arguments are given, the defaults are fairly sane. - Suitable for testing a :class:`bridgedb.email.server.MailFactory`. + Suitable for testing a :class:`bridgedb.email.server.SMTPIncomingServerFactory`. :param str fromAddr: An email address for the 'From:' header. :param str toAddr: An email address for the 'To:' header. @@ -611,14 +381,17 @@ class SMTPTestCaseMixin(TestCaseMixin): self.assertSubstring(expected, recv) -class MailFactoryTests(SMTPTestCaseMixin, unittest.TestCase): - """Unittests for :class:`bridgedb.email.server.MailFactory`.""" +class SMTPIncomingServerFactoryTests(SMTPTestCaseMixin, unittest.TestCase): + """Unittests for :class:`bridgedb.email.server.SMTPIncomingServerFactory`.""" def setUp(self): - """Set up a localhost MailFactory handler incoming SMTP connections.""" + """Set up a localhost SMTPIncomingServerFactory handler incoming SMTP + connections. + """ config = _createConfig() - context = _createMailContext(config) - factory = server.MailFactory(context) + context = _createMailServerContext(config) + factory = server.SMTPIncomingServerFactory() + factory.setContext(context) factory.protocol.timeout = None # Otherwise the reactor gets dirty self.smtpFromAddr = context.smtpFromAddr # 'bridges@localhost' @@ -629,40 +402,40 @@ class MailFactoryTests(SMTPTestCaseMixin, unittest.TestCase): self.transport.protocol = self.proto self.proto.makeConnection(self.transport) - def test_MailFactory_HELO_localhost(self): + def test_SMTPIncomingServerFactory_HELO_localhost(self): """Send 'HELO localhost' to the server's transport.""" ip = self.transport.getPeer().host self._test(['HELO localhost'], "Hello %s, nice to meet you" % ip) - def test_MailFactory_MAIL_FROM_testing_at_localhost(self): + def test_SMTPIncomingServerFactory_MAIL_FROM_testing_at_localhost(self): """Send 'MAIL FROM: human@localhost'.""" self._test(['HELO localhost', 'MAIL FROM: testing@localhost'], "250 Sender address accepted") - def test_MailFactory_MAIL_FROM_testing_at_gethostname(self): + def test_SMTPIncomingServerFactory_MAIL_FROM_testing_at_gethostname(self): """Send 'MAIL FROM: human@hostname' for the local hostname.""" hostname = socket.gethostname() or "computer" self._test(['HELO localhost', 'MAIL FROM: testing@%s' % hostname], "250 Sender address accepted") - def test_MailFactory_MAIL_FROM_testing_at_ipaddress(self): + def test_SMTPIncomingServerFactory_MAIL_FROM_testing_at_ipaddress(self): """Send 'MAIL FROM: human@ipaddr' for the loopback IP address.""" - hostname = socket.gethostbyname(socket.gethostname()) or "127.0.0.1" + hostname = 'localhost' self._test(['HELO localhost', 'MAIL FROM: testing@%s' % hostname], "250 Sender address accepted") - def test_MailFactory_RCPT_TO_config_EMAIL_SMTP_FROM_ADDR(self): + def test_SMTPIncomingServerFactory_RCPT_TO_context_smtpFromAddr(self): """Send 'RCPT TO:' with the context.smtpFromAddr.""" self._test(['HELO localhost', 'MAIL FROM: testing@localhost', 'RCPT TO: %s' % self.smtpFromAddr], "250 Recipient address accepted") - def test_MailFactory_DATA_blank(self): + def test_SMTPIncomingServerFactory_DATA_blank(self): """A DATA command with nothing after it should receive:: '354 Continue' in response. @@ -673,7 +446,7 @@ class MailFactoryTests(SMTPTestCaseMixin, unittest.TestCase): "DATA"], "354 Continue") - def test_MailFactory_DATA_get_help(self): + def test_SMTPIncomingServerFactory_DATA_get_help(self): """A DATA command with ``'get help'`` in the email body should receive:: '250 Delivery in progress' @@ -687,7 +460,7 @@ class MailFactoryTests(SMTPTestCaseMixin, unittest.TestCase): "250 Delivery in progress", noisy=True) - def test_MailFactory_DATA_get_transport_obfs3(self): + def test_SMTPIncomingServerFactory_DATA_get_transport_obfs3(self): """A DATA command with ``'get transport obfs3'`` in the email body should receive:: '250 Delivery in progress' @@ -701,7 +474,7 @@ class MailFactoryTests(SMTPTestCaseMixin, unittest.TestCase): "250 Delivery in progress", noisy=True) - def test_MailFactory_DATA_To_bridges_plus_zh_CN(self): + def test_SMTPIncomingServerFactory_DATA_To_bridges_plus_zh_CN(self): """Test sending to 'bridges+zh_CN' address for Chinese translations.""" # TODO: Add tests which use '+' syntax in mailTo in order to test # email translations. Do this when some strings have been translated. @@ -716,7 +489,7 @@ class MailFactoryTests(SMTPTestCaseMixin, unittest.TestCase): "250 Delivery in progress", noisy=True) - def test_MailFactory_DATA_get_bridges_QUIT(self): + def test_SMTPIncomingServerFactory_DATA_get_bridges_QUIT(self): """Test sending 'DATA' with 'get bridges', then sending 'QUIT'.""" emailText = self._buildEmail() self._test(['HELO localhost', @@ -732,9 +505,9 @@ class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase): """Unittests for :func:`bridgedb.email.server.addServer`.""" def setUp(self): - """Create a server.MailContext and EmailBasedDistributor.""" + """Create a server.MailServerContext and EmailBasedDistributor.""" self.config = _createConfig() - self.context = _createMailContext(self.config) + self.context = _createMailServerContext(self.config) self.smtpFromAddr = self.context.smtpFromAddr # 'bridges@localhost' self.sched = Unscheduled() self.dist = self.context.distributor

1 0

[bridgedb/develop] Add try/except around parent class errback call in SMTPAutoresponder.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 9861fdf7ebcc5fdfe613a9600e0273615e1a4255 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:15:53 2014 +0000 Add try/except around parent class errback call in SMTPAutoresponder. --- lib/bridgedb/email/autoresponder.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index d5dadae..41e811b 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -531,8 +531,14 @@ class SMTPAutoresponder(smtp.SMTPClient): error = fail logging.error(error) - # This handles QUIT commands, disconnecting, and closing the transport: - smtp.SMTPClient.sendError(self, fail) + try: + # This handles QUIT commands, disconnecting, and closing the + # transport: + smtp.SMTPClient.sendError(self, fail) + # We might not have `transport` and `protocol` attributes, depending + # on when and where the error occurred, so just catch and log it: + except Exception as error: + logging.error(error) def reply(self): """Reply to an incoming email. Maybe.

1 0

[bridgedb/develop] Consider it a fatal error if we can't listen on the configured EMAIL_PORT.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit d777231c1ea31f9748a84ab068b5d5c86bbdac6b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:18:59 2014 +0000 Consider it a fatal error if we can't listen on the configured EMAIL_PORT. --- lib/bridgedb/email/server.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 50c5987..11af8df 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -23,6 +23,7 @@ import socket from twisted.internet import defer from twisted.internet import reactor +from twisted.internet.error import CannotListenError from twisted.internet.task import LoopingCall from twisted.mail import smtp from twisted.mail.smtp import rfc822date @@ -418,7 +419,11 @@ def addServer(config, distributor, schedule): addr = config.EMAIL_BIND_IP or "" port = config.EMAIL_PORT - reactor.listenTCP(port, factory, interface=addr) + try: + reactor.listenTCP(port, factory, interface=addr) + except CannotListenError as error: + logging.fatal(error) + raise SystemExit(error.message) # Set up a LoopingCall to run every 30 minutes and forget old email times. lc = LoopingCall(distributor.cleanDatabase)

1 0

[bridgedb/develop] Ensure that a default (6725) EMAIL_PORT is set.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 6fbe6f03cc1de10009047d0d1b1340742fef0f46 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:19:41 2014 +0000 Ensure that a default (6725) EMAIL_PORT is set. --- lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 11af8df..36dc841 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -417,7 +417,7 @@ def addServer(config, distributor, schedule): factory.setContext(context) addr = config.EMAIL_BIND_IP or "" - port = config.EMAIL_PORT + port = config.EMAIL_PORT or 6725 try: reactor.listenTCP(port, factory, interface=addr)

1 0

[bridgedb/develop] Add unittest for checkDKIM() with `X-DKIM-Authentication-Results: dunno`.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 6ce901dfd3497ace147cc57359c669bad2cefa6f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 02:59:39 2014 +0000 Add unittest for checkDKIM() with `X-DKIM-Authentication-Results: dunno`. * ADD new unittest test_checkDKIM_dunno() to test_email_dkim.py which checks that a ``X-DKIM-Authentication-Results: dunno`` header properly returns False. --- lib/bridgedb/test/test_email_dkim.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/bridgedb/test/test_email_dkim.py b/lib/bridgedb/test/test_email_dkim.py index 3407fa5..ee022b0 100644 --- a/lib/bridgedb/test/test_email_dkim.py +++ b/lib/bridgedb/test/test_email_dkim.py @@ -62,3 +62,14 @@ get bridges result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertIs(result, False) + + def test_checkDKIM_dunno(self): + """A ``X-DKIM-Authentication-Results: dunno`` header should return + False. + """ + messageList = self.badMessage.split('\n') + messageList[2] = "X-DKIM-Authentication-Results: dunno" + message = self._createMessage('\n'.join(messageList)) + result = dkim.checkDKIM(message, + self.domainRules.get("gmail.com")) + self.assertIs(result, False)

1 0

[bridgedb/develop] Add _createMessage() utility to test_email_dkim.py.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 7d7606a94cfc9a6c069aacf237d6fe28ad708b98 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 02:58:40 2014 +0000 Add _createMessage() utility to test_email_dkim.py. --- lib/bridgedb/test/test_email_dkim.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/test/test_email_dkim.py b/lib/bridgedb/test/test_email_dkim.py index 3350d19..3407fa5 100644 --- a/lib/bridgedb/test/test_email_dkim.py +++ b/lib/bridgedb/test/test_email_dkim.py @@ -24,36 +24,41 @@ class CheckDKIMTests(unittest.TestCase): def setUp(self): """Create fake email, distributor, and associated context data.""" - self.goodMessage = io.StringIO(unicode("""\ + self.goodMessage = """\ From: user(a)gmail.com To: bridges@localhost X-DKIM-Authentication-Results: pass Subject: testing get bridges -""")) - self.badMessage = io.StringIO(unicode("""\ +""" + self.badMessage = """\ From: user(a)gmail.com To: bridges@localhost Subject: testing get bridges -""")) +""" self.domainRules = { 'gmail.com': ["ignore_dots", "dkim"], 'example.com': [], 'localhost': [], } + def _createMessage(self, messageString): + """Create an ``rfc822.Message`` from a string.""" + messageIO = io.StringIO(unicode(messageString)) + return rfc822.Message(messageIO) + def test_checkDKIM_good(self): - message = rfc822.Message(self.goodMessage) + message = self._createMessage(self.goodMessage) result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertTrue(result) def test_checkDKIM_bad(self): - message = rfc822.Message(self.badMessage) + message = self._createMessage(self.badMessage) result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertIs(result, False)

1 0

[bridgedb/develop] Add `pragma: no cover` directive to b.e.server.addServer.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit a78d22c3d65d6ceddbd902b04861b04641acd6fb Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:11:44 2014 +0000 Add `pragma: no cover` directive to b.e.server.addServer. We don't need to test for conditions which might raise a ``twisted.protocols.tcp.CannotListenError``, we just need to ensure that we exit if we can't bind to the port for the email server. --- lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 36dc841..94405ea 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -421,7 +421,7 @@ def addServer(config, distributor, schedule): try: reactor.listenTCP(port, factory, interface=addr) - except CannotListenError as error: + except CannotListenError as error: # pragma: no cover logging.fatal(error) raise SystemExit(error.message)

1 0