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

[bridgedb/develop] Add unittests for SMTP protocol responses of b.e.s.MailFactory.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 6747778b3f29b298c9f8e6488e2599be21aee987 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 20 20:14:40 2014 +0000 Add unittests for SMTP protocol responses of b.e.s.MailFactory. These tests emulate, in Twisted, what the `telnet-an-email` [0] script did by speaking raw SMTP over telnet in an embarrassing pexpect script which was never committed for fear being chained in stocks and having rotten tomatoes thrown at me. Instead of that telnet nonsense, these tests use mocked `ITransport`s from `twisted.test.proto_helpers` to create a transport layer for sending SMTP protocol commands. * FIXES part of #9874 by automating some manual portions of the steps required for testing BridgeDB's email distributor. [0]: https://trac.torproject.org/projects/tor/attachment/ticket/5232/telnet-an-e… --- lib/bridgedb/test/test_email_server.py | 122 +++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index 717a006..5f92353 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -17,6 +17,7 @@ import io import copy import os import shutil +import socket import types from bridgedb.Dist import EmailBasedDistributor @@ -47,8 +48,9 @@ EMAIL_DOMAIN_MAP = { EMAIL_DOMAIN_RULES = { 'gmail.com': ["ignore_dots", "dkim"], 'example.com': [], + 'localhost': [], } -EMAIL_DOMAINS = ["gmail.com", "example.com"] +EMAIL_DOMAINS = ["gmail.com", "example.com", "localhost"] EMAIL_USERNAME = "bridges" EMAIL_SMTP_HOST = "127.0.0.1" EMAIL_SMTP_PORT = 25 @@ -59,6 +61,7 @@ EMAIL_BIND_IP = "127.0.0.1" EMAIL_PORT = 5225 """)) + def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} TEST_CONFIG_FILE.seek(0) @@ -529,6 +532,123 @@ class SMTPTestCaseMixin(TestCaseMixin): self.assertSubstring(expected, recv) +class MailFactoryTests(SMTPTestCaseMixin, unittest.TestCase): + """Unittests for :class:`bridgedb.email.server.MailFactory`.""" + + def setUp(self): + """Set up a localhost MailFactory handler incoming SMTP connections.""" + config = _createConfig() + context = _createMailContext(config) + factory = server.MailFactory(context) + factory.protocol.timeout = None # Otherwise the reactor gets dirty + + self.smtpFromAddr = context.smtpFromAddr # 'bridges@localhost' + self.proto = factory.buildProtocol(('127.0.0.1', 0)) + self.transport = proto_helpers.StringTransportWithDisconnection() + self.proto.setTimeout(None) + # Set the protocol; StringTransportWithDisconnection is a bit janky: + self.transport.protocol = self.proto + self.proto.makeConnection(self.transport) + + def test_MailFactory_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): + """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): + """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): + """Send 'MAIL FROM: human@ipaddr' for the loopback IP address.""" + hostname = socket.gethostbyname(socket.gethostname()) or "127.0.0.1" + self._test(['HELO localhost', + 'MAIL FROM: testing@%s' % hostname], + "250 Sender address accepted") + + def test_MailFactory_RCPT_TO_config_EMAIL_SMTP_FROM_ADDR(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): + """A DATA command with nothing after it should receive:: + '354 Continue' + in response. + """ + self._test(['HELO localhost', + 'MAIL FROM: testing@localhost', + 'RCPT TO: %s' % self.smtpFromAddr, + "DATA"], + "354 Continue") + + def test_MailFactory_DATA_get_help(self): + """A DATA command with ``'get help'`` in the email body should + receive:: + '250 Delivery in progress' + in response. + """ + emailText = self._buildEmail(body="get help") + self._test(['HELO localhost', + 'MAIL FROM: testing@localhost', + 'RCPT TO: %s' % self.smtpFromAddr, + "DATA", emailText], + "250 Delivery in progress", + noisy=True) + + def test_MailFactory_DATA_get_transport_obfs3(self): + """A DATA command with ``'get transport obfs3'`` in the email body + should receive:: + '250 Delivery in progress' + in response. + """ + emailText = self._buildEmail(body="get transport obfs3") + self._test(['HELO localhost', + 'MAIL FROM: testing@localhost', + 'RCPT TO: %s' % self.smtpFromAddr, + "DATA", emailText], + "250 Delivery in progress", + noisy=True) + + def test_MailFactory_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. + emailTo = list(self.smtpFromAddr.partition('@')) + emailTo.insert(1, '+zh_CN') + emailTo = ''.join(emailTo) + emailText = self._buildEmail(toAddr=emailTo) + self._test(['HELO localhost', + 'MAIL FROM: testing@localhost', + 'RCPT TO: %s' % emailTo, + "DATA", emailText], + "250 Delivery in progress", + noisy=True) + + def test_MailFactory_DATA_get_bridges_QUIT(self): + """Test sending 'DATA' with 'get bridges', then sending 'QUIT'.""" + emailText = self._buildEmail() + self._test(['HELO localhost', + 'MAIL FROM: testing@localhost', + 'RCPT TO: %s' % self.smtpFromAddr, + "DATA", emailText, + "QUIT"], + "221 See you later", + noisy=True) + + class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase): """Unittests for :func:`bridgedb.email.server.addServer`."""

1 0

[bridgedb/develop] Fix CI error on EmailServerServiceTests.test_addServer().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 28069af03162e36ee19483f46d9101656de16987 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 20 21:04:47 2014 +0000 Fix CI error on EmailServerServiceTests.test_addServer(). The SMTP MAIL FROM email address was unacceptable, because on TravisCI it ended up being `localhost(a)localhost.localdomain`. [0] [0]: https://travis-ci.org/isislovecruft/bridgedb/builds/25636170#L1732 --- lib/bridgedb/test/test_email_server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index 5f92353..ebb9b85 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -683,8 +683,9 @@ class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase): self.transport.protocol = self.proto self.proto.makeConnection(self.transport) - self._test(['HELO localhost', - 'MAIL FROM: testing@localhost', + serverHost = socket.gethostname() + self._test(['HELO %s' % serverHost, + 'MAIL FROM: testing@%s' % serverHost, 'RCPT TO: %s' % self.smtpFromAddr, "DATA", self._buildEmail(body="get transport obfs3")], "250 Delivery in progress",

1 0

[bridgedb/develop] Tell TravisCI to put bridges.torproject.org into /etc/hosts.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 0a1f2cbeaedd17d1ecbcba0f9e8943bff2fb59b6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 20 21:21:06 2014 +0000 Tell TravisCI to put bridges.torproject.org into /etc/hosts. See http://docs.travis-ci.com/user/hosts/ --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 09bfe59..55dbbb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,10 @@ notifications: on_success: never on_failure: change +addons: + hosts: + - bridges.torproject.org + before_install: - sudo apt-get update # Distro development header/library/resource/buildtime dependencies

1 0

[bridgedb/develop] Update TravisCI coveralls==0.3 to coveralls==0.4.2.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 375b1fbfb50fa5bf5f2c2add20be7b1667553125 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:06:42 2014 +0000 Update TravisCI coveralls==0.3 to coveralls==0.4.2. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 55dbbb8..e95fb6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ python: install: - pip install -r requirements.txt - - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7 coveralls==0.3 sure==1.2.2 + - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7 coveralls==0.4.2 sure==1.2.2 - make install script:

1 0

[bridgedb/develop] Update coverage==3.7 to coverage==3.7.1 for TravisCI and setup.py.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 12e42c89a41189d01874de84939360c7df4ac0bf Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:08:16 2014 +0000 Update coverage==3.7 to coverage==3.7.1 for TravisCI and setup.py. --- .travis.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e95fb6c..7281650 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ python: install: - pip install -r requirements.txt - - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7 coveralls==0.4.2 sure==1.2.2 + - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7.1 coveralls==0.4.2 sure==1.2.2 - make install script: diff --git a/setup.py b/setup.py index fbb6602..4654415 100644 --- a/setup.py +++ b/setup.py @@ -284,7 +284,7 @@ setuptools.setup( 'bridgedb.test'], scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", - "coverage==3.7", + "coverage==3.7.1", "leekspin==0.1.3"]}, zip_safe=False, cmdclass=get_cmdclass(),

1 0

[bridgedb/develop] Update Twisted==13.1.0 to Twisted==13.2.0 in requirements.txt.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 44497f79362e06222213d7139ef08f1341929c01 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:18:28 2014 +0000 Update Twisted==13.1.0 to Twisted==13.2.0 in requirements.txt. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f07f1a1..c84313d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 -Twisted==13.1.0 +Twisted==13.2.0 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pyOpenSSL==0.13.1

1 0

[bridgedb/develop] Move apt install dependencies to 'install' section in .travis.yml.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit ba6b18f94dcdf8201f26aa9bff976d45607a24ef Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:11:00 2014 +0000 Move apt install dependencies to 'install' section in .travis.yml. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7281650..4e3db1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,13 +22,12 @@ addons: before_install: - sudo apt-get update - # Distro development header/library/resource/buildtime dependencies - - sudo apt-get install --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools python: - "2.7" install: + - sudo apt-get install --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools - pip install -r requirements.txt - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7.1 coveralls==0.4.2 sure==1.2.2 - make install

1 0

[bridgedb/develop] Pin zope.interface==3.6.1 (current Debian stable version) in requirements.txt.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 17defaa16a9a5fb44b21dc1d4c1a488a2200389f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 01:21:09 2014 +0000 Pin zope.interface==3.6.1 (current Debian stable version) in requirements.txt. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c84313d..de393b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,4 @@ pyOpenSSL==0.13.1 pygeoip==0.2.7 pygpgme==0.3 recaptcha-client==1.0.6 -zope.interface>=4.0.5 +zope.interface==3.6.1

1 0

[bridgedb/develop] Refactor bridgedb.email.server.MailMessage.getRecipient().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 1c8c02eac6449100ebee951d31c21268538e8951 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 03:08:47 2014 +0000 Refactor bridgedb.email.server.MailMessage.getRecipient(). * CHANGE to using only one try/except block for `smtp.AddressError`s. We should probably assume that our EMAIL_SMTP_FROM_ADDR in the config file is correctly formed, and not bother logging the special case if it is not. Instead, just log all `smtp.AddressError`s in the same manner. * CHANGE variable names to make code clearer. --- lib/bridgedb/email/server.py | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 03643dc..09df526 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -570,26 +570,21 @@ class MailMessage(object): :return: Our address from the recipients list. If we can't find it return our default ``SMTP_FROM_ADDRESS`` from the config file. """ - address = self.context.fromAddr - addressList = incoming.getaddrlist("To") + ourAddress = self.context.fromAddr try: - ours = smtp.Address(address) + ourAddress = smtp.Address(ourAddress) + allRecipients = incoming.getaddrlist("To") + for _, addr in allRecipients: + recipient = smtp.Address(addr) + # See if the user looks familiar. We do a 'find' instead of + # compare because we might have a '+' address here. + if recipient.local.find(ourAddress.local) != -1: + return '@'.join([recipient.local, recipient.domain]) except smtp.AddressError as error: - logging.warn("Our address seems invalid: %r" % address) logging.warn(error) - else: - for _, addr in addressList: - try: - maybeOurs = smtp.Address(addr) - except smtp.AddressError: - pass - else: - # See if the user looks familiar. We do a 'find' instead of - # compare because we might have a '+' address here. - if maybeOurs.local.find(ours.local) != -1: - return '@'.join([maybeOurs.local, maybeOurs.domain]) - return address + + return ourAddress def getCanonicalDomain(self, domain): try:

1 0

[bridgedb/develop] Rename unittest methods for bridgedb.email.server.MailResponse.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit c171ba31a87f019c83a3947ebf7dd2d729057047 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 21 04:11:22 2014 +0000 Rename unittest methods for bridgedb.email.server.MailResponse. --- lib/bridgedb/test/test_email_server.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index ebb9b85..01be6a7 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -227,30 +227,30 @@ a ball of timey-wimey, wibbly-warbly... stuff.""" def tearDown(self): server.safelog.safe_logging = True - def test_generateResponse(self): + def test_MailResponse_generateResponse(self): response = server.generateResponse(self.fromAddr, self.clientAddr, self.body) self.assertIsInstance(response, server.MailResponse) - def test_generateResponse_noSafelog(self): + 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_generateResponse_mailfile(self): + 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_generateResponse_withInReplyTo(self): + 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_generateResponse_readContents(self): + def test_MailResponse_generateResponse_readContents(self): response = server.generateResponse(self.fromAddr, self.clientAddr, self.body) contents = str(response.readContents()).replace('\x00', '')

1 0