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

[bridgedb/master] Move test_EmailServer.py → test_email_server.py and update imports.
by isis＠torproject.org 16 May '14

16 May '14

commit 3176bcd78da2515af4834c925689609e5bba015d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 5 19:57:59 2014 +0000 Move test_EmailServer.py → test_email_server.py and update imports. --- lib/bridgedb/test/test_EmailServer.py | 344 -------------------------------- lib/bridgedb/test/test_email_server.py | 341 +++++++++++++++++++++++++++++++ 2 files changed, 341 insertions(+), 344 deletions(-) diff --git a/lib/bridgedb/test/test_EmailServer.py b/lib/bridgedb/test/test_EmailServer.py deleted file mode 100644 index 2ecc7f9..0000000 --- a/lib/bridgedb/test/test_EmailServer.py +++ /dev/null @@ -1,344 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file -# :license: 3-Clause BSD, see LICENSE for licensing information - -"""Unittests for the :mod:`bridgedb.EmailServer` module.""" - -from __future__ import print_function - -import os -import shutil - -import io -import copy - -from bridgedb import EmailServer -from bridgedb.Dist import EmailBasedDistributor -from bridgedb.EmailServer import MailContext -from bridgedb.Time import NoSchedule -from bridgedb.parse.addr import BadEmail -from bridgedb.persistent import Conf -from bridgedb.test.test_HTTPServer import DummyBridge -from bridgedb.test.util import fileCheckDecorator - -from twisted.python import log -from twisted.internet import defer -from twisted.trial import unittest - - -TEST_CONFIG_FILE = io.StringIO(unicode("""\ -EMAIL_DIST = True -EMAIL_INCLUDE_FINGERPRINTS = True -EMAIL_GPG_SIGNING_ENABLED = True -EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' -EMAIL_DOMAIN_MAP = { - 'googlemail.com': 'gmail.com', - 'mail.google.com': 'gmail.com', -} -EMAIL_DOMAIN_RULES = { - 'gmail.com': ["ignore_dots", "dkim"], - 'example.com': [], -} -EMAIL_DOMAINS = ["gmail.com", "example.com"] -EMAIL_USERNAME = "bridges" -EMAIL_SMTP_HOST = "127.0.0.1" -EMAIL_SMTP_PORT = 25 -EMAIL_SMTP_FROM_ADDR = "bridges@localhost" -EMAIL_N_BRIDGES_PER_ANSWER = 3 -EMAIL_FROM_ADDR = "bridges@localhost" -EMAIL_BIND_IP = "127.0.0.1" -EMAIL_PORT = 5225 -""")) - -def _createMailContext(distributor=None): - configuration = {} - TEST_CONFIG_FILE.seek(0) - compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration - config = Conf(**configuration) - - if not distributor: - distributor = DummyEmailDistributor( - domainmap=config.EMAIL_DOMAIN_MAP, - domainrules=config.EMAIL_DOMAIN_RULES) - - ctx = MailContext(config, distributor, NoSchedule()) - return ctx - - -class DummyEmailDistributor(object): - """A mocked :class:`bridgedb.Dist.EmailBasedDistributor` which is used to - test :class:`bridgedb.EmailServer`. - """ - - def __init__(self, key=None, domainmap=None, domainrules=None, - answerParameters=None): - """None of the parameters are really used, except ``ctx`` ― they are - just there to retain an identical method signature. - """ - self.key = self.__class__.__name__ - self.domainmap = domainmap - self.domainrules = domainrules - self.answerParameters = answerParameters - - def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, - countryCode=None, bridgeFilterRules=None): - """Needed because it's called in - :meth:`WebResourceBridges.getBridgesForIP`. - """ - return [DummyBridge() for _ in xrange(N)] - - -class EmailGnuPGTest(unittest.TestCase): - """Tests for :func:`bridgedb.EmailServer.getGPGContext`.""" - - timeout = 15 - - @fileCheckDecorator - def doCopyFile(self, src, dst, description=None): - shutil.copy(src, dst) - - def removeRundir(self): - if os.path.isdir(self.runDir): - shutil.rmtree(self.runDir) - - def makeBadKey(self): - keyfile = os.path.join(self.runDir, 'badkey.asc') - with open(keyfile, 'wb') as badkey: - badkey.write('NO PASARÁN, DEATH CAKES!') - badkey.flush() - self.setKey(keyfile) - - def setKey(self, keyfile=''): - setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', keyfile) - - def setUp(self): - here = os.getcwd() - topDir = here.rstrip('_trial_temp') - self.runDir = os.path.join(here, 'rundir') - self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') - self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') - - if not os.path.isdir(self.runDir): - os.makedirs(self.runDir) - - configuration = {} - TEST_CONFIG_FILE.seek(0) - compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration - self.config = Conf(**configuration) - - self.addCleanup(self.removeRundir) - - def test_getGPGContext_good_keyfile(self): - """Test EmailServer.getGPGContext() with a good key filename. - - XXX: See #5463. - """ - raise unittest.SkipTest( - "See #5463 for why this test fails when it should pass") - - self.doCopyFile(self.gpgFile, self.gpgMoved, "GnuPG test keyfile") - ctx = EmailServer.getGPGContext(self.config) - self.assertIsInstance(ctx, EmailServer.gpgme.Context) - - def test_getGPGContext_missing_keyfile(self): - """Test EmailServer.getGPGContext() with a missing key filename.""" - self.setKey('missing-keyfile.asc') - ctx = EmailServer.getGPGContext(self.config) - self.assertTrue(ctx is None) - - def test_getGPGContext_bad_keyfile(self): - """Test EmailServer.getGPGContext() with a missing key filename.""" - self.makeBadKey() - ctx = EmailServer.getGPGContext(self.config) - self.assertTrue(ctx is None) - - -class EmailResponseTests(unittest.TestCase): - """Tests for :func:`bridgedb.EmailServer.getMailResponse`.""" - - def setUp(self): - """Create fake email, distributor, and associated context data.""" - # TODO: Add headers if we start validating them - self.lines = ["From: %s(a)%s.com", - "To: bridges@localhost", - "Subject: testing", - "", - "get bridges"] - self.ctx = _createMailContext() - - def _isTwoTupleOfNone(self, reply): - """Check that a return value is ``(None, None)``.""" - self.assertIsInstance(reply, tuple) - self.assertEqual(len(reply), 2) - self.assertEqual(reply[0], None) - self.assertEqual(reply[1], None) - - def _isTwoTupleOfAddrAndClass(self, reply, address="testing@localhost", - klass=io.StringIO): - self.assertIsInstance(reply, tuple) - self.assertEqual(len(reply), 2) - self.assertEqual(reply[0], address) - self.assertIsInstance(reply[1], klass) - - def test_getMailResponse_noFrom(self): - """A received email without a "From:" or "Sender:" header shouldn't - receive a response. - """ - lines = self.lines - lines[0] = "" - ret = EmailServer.getMailResponse(lines, self.ctx) - self._isTwoTupleOfNone(ret) - - def test_getMailResponse_badAddress(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing*.?\"", "example") - ret = EmailServer.getMailResponse(lines, self.ctx) - self._isTwoTupleOfNone(ret) - - def test_getMailResponse_anotherBadAddress(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = copy.copy(self.lines) - lines[0] = "From: Mallory %s(a)%s.com" % ("<>>", "example") - ret = EmailServer.getMailResponse(lines, self.ctx) - self._isTwoTupleOfNone(ret) - - def test_getMailResponse_invalidDomain(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "exa#mple") - ret = EmailServer.getMailResponse(lines, self.ctx) - self._isTwoTupleOfNone(ret) - - def test_getMailResponse_anotherInvalidDomain(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "exam+ple") - ret = EmailServer.getMailResponse(lines, self.ctx) - self._isTwoTupleOfNone(ret) - - def test_getMailResponse_DKIM_badDKIMheader(self): - """An email with an 'X-DKIM-Authentication-Result:' header appended - after the body should not receive a response. - """ - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "gmail") - lines.append("X-DKIM-Authentication-Result: ") - ret = EmailServer.getMailResponse(lines, self.ctx) - self._isTwoTupleOfNone(ret) - - def test_getMailResponse_DKIM(self): - """An email with a good DKIM header should be responded to.""" - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "localhost") - lines.insert(3, "X-DKIM-Authentication-Result: ") - ret = EmailServer.getMailResponse(lines, self.ctx) - self.skip = True - raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ - " the email distributor should pass these"\ - " tests.") - self._isTwoTupleOfAddrAndClass(ret) - mail = ret[1].getvalue() - self.assertEqual(mail.find("no bridges currently"), -1) - - def test_getMailResponse_bridges_obfs3(self): - """A request for 'transport obfs3' should receive a response.""" - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "localhost") - lines[4] = "transport obfs3" - ret = EmailServer.getMailResponse(lines, self.ctx) - self.skip = True - raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ - " the email distributor should pass these"\ - " tests.") - self._isTwoTupleOfAddrAndClass(ret) - mail = ret[1].getvalue() - self.assertEqual(mail.find("no bridges currently"), -1) - - def test_getMailResponse_bridges_obfsobfswebz(self): - """We should only pay attention to the *last* in a crazy request.""" - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "localhost") - lines[4] = "unblocked webz" - lines.append("transport obfs2") - lines.append("transport obfs3") - ret = EmailServer.getMailResponse(lines, self.ctx) - self.skip = True - raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ - " the email distributor should pass these"\ - " tests.") - self._isTwoTupleOfAddrAndClass(ret) - mail = ret[1].getvalue() - self.assertNotEqual(mail.find("no bridges currently"), -1) - - def test_getMailResponse_bridges_obfsobfswebzipv6(self): - """We should *still* only pay attention to the *last* request.""" - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "localhost") - lines[4] = "transport obfs3" - lines.append("unblocked webz") - lines.append("ipv6") - lines.append("transport obfs2") - ret = EmailServer.getMailResponse(lines, self.ctx) - self.skip = True - raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ - " the email distributor should pass these"\ - " tests.") - self._isTwoTupleOfAddrAndClass(ret) - mail = ret[1].getvalue() - self.assertNotEqual(mail.find("no bridges currently"), -1) - - -class EmailReplyTests(unittest.TestCase): - """Tests for ``EmailServer.replyToMail()``.""" - - def setUp(self): - """Create fake email, distributor, and associated context data.""" - # TODO: Add headers if we start validating them - self.lines = ["From: %s(a)%s.com", - "To: bridges(a)example.net", - "Subject: testing", - "\n", - "get bridges"] - self.ctx = _createMailContext() - - def test_replyToMail(self): - self.skip = True - raise unittest.SkipTest("We'll have to fake the EmailServer for this one,"\ - " it requires a TCP connection to localhost.") - - def callback(reply): - self.assertSubstring("Here are your bridges", reply) - - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "example") - reply = EmailServer.replyToMail(lines, self.ctx) - - self.assertIsInstance(reply, defer.Deferred) - - reply.addCallback(callback) - return reply - - -class EmailServerServiceTests(unittest.TestCase): - def setUp(self): - # TODO: Add headers if we start validating them - self.lines = ["From: %s(a)%s.com", "To: %s(a)example.net", - "Subject: testing", "\n", "get bridges"] - self.distributor = DummyEmailDistributor('key', {}, {}, []) - self.ctx = _createMailContext(self.distributor) - - def test_receiveMail(self): - self.skip = True - raise unittest.SkipTest("Not finished yet") - from twisted.internet import reactor - EmailServer.addSMTPServer(self.ctx.cfg, self.distributor, NoSchedule) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py new file mode 100644 index 0000000..e925f07 --- /dev/null +++ b/lib/bridgedb/test/test_email_server.py @@ -0,0 +1,341 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013, Isis Lovecruft +# (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.email.server` module.""" + +from __future__ import print_function + +import os +import shutil + +import io +import copy + +from bridgedb.Dist import EmailBasedDistributor +from bridgedb.email import server +from bridgedb.email.server import MailContext +from bridgedb.Time import NoSchedule +from bridgedb.parse.addr import BadEmail +from bridgedb.persistent import Conf +from bridgedb.test.test_HTTPServer import DummyBridge +from bridgedb.test.util import fileCheckDecorator + +from twisted.python import log +from twisted.internet import defer +from twisted.trial import unittest + + +TEST_CONFIG_FILE = io.StringIO(unicode("""\ +EMAIL_DIST = True +EMAIL_INCLUDE_FINGERPRINTS = True +EMAIL_GPG_SIGNING_ENABLED = True +EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' +EMAIL_DOMAIN_MAP = { + 'googlemail.com': 'gmail.com', + 'mail.google.com': 'gmail.com', +} +EMAIL_DOMAIN_RULES = { + 'gmail.com': ["ignore_dots", "dkim"], + 'example.com': [], +} +EMAIL_DOMAINS = ["gmail.com", "example.com"] +EMAIL_USERNAME = "bridges" +EMAIL_SMTP_HOST = "127.0.0.1" +EMAIL_SMTP_PORT = 25 +EMAIL_SMTP_FROM_ADDR = "bridges@localhost" +EMAIL_N_BRIDGES_PER_ANSWER = 3 +EMAIL_FROM_ADDR = "bridges@localhost" +EMAIL_BIND_IP = "127.0.0.1" +EMAIL_PORT = 5225 +""")) + +def _createMailContext(distributor=None): + configuration = {} + TEST_CONFIG_FILE.seek(0) + compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') + exec compiled in configuration + config = Conf(**configuration) + + if not distributor: + distributor = DummyEmailDistributor( + domainmap=config.EMAIL_DOMAIN_MAP, + domainrules=config.EMAIL_DOMAIN_RULES) + + ctx = MailContext(config, distributor, NoSchedule()) + return ctx + + +class DummyEmailDistributor(object): + """A mocked :class:`bridgedb.Dist.EmailBasedDistributor` which is used to + test :class:`bridgedb.EmailServer`. + """ + + def __init__(self, key=None, domainmap=None, domainrules=None, + answerParameters=None): + """None of the parameters are really used, ― they are just there to retain an + identical method signature. + """ + self.key = self.__class__.__name__ + self.domainmap = domainmap + self.domainrules = domainrules + self.answerParameters = answerParameters + + def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, + countryCode=None, bridgeFilterRules=None): + return [DummyBridge() for _ in xrange(N)] + + +class EmailGnuPGTest(unittest.TestCase): + """Tests for :func:`bridgedb.EmailServer.getGPGContext`.""" + + timeout = 15 + + @fileCheckDecorator + def doCopyFile(self, src, dst, description=None): + shutil.copy(src, dst) + + def removeRundir(self): + if os.path.isdir(self.runDir): + shutil.rmtree(self.runDir) + + def makeBadKey(self): + keyfile = os.path.join(self.runDir, 'badkey.asc') + with open(keyfile, 'wb') as badkey: + badkey.write('NO PASARÁN, DEATH CAKES!') + badkey.flush() + self.setKey(keyfile) + + def setKey(self, keyfile=''): + setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', keyfile) + + def setUp(self): + here = os.getcwd() + topDir = here.rstrip('_trial_temp') + self.runDir = os.path.join(here, 'rundir') + self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') + self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') + + if not os.path.isdir(self.runDir): + os.makedirs(self.runDir) + + configuration = {} + TEST_CONFIG_FILE.seek(0) + compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') + exec compiled in configuration + self.config = Conf(**configuration) + + self.addCleanup(self.removeRundir) + + def test_getGPGContext_good_keyfile(self): + """Test EmailServer.getGPGContext() with a good key filename. + + XXX: See #5463. + """ + raise unittest.SkipTest( + "See #5463 for why this test fails when it should pass") + + self.doCopyFile(self.gpgFile, self.gpgMoved, "GnuPG test keyfile") + ctx = EmailServer.getGPGContext(self.config) + self.assertIsInstance(ctx, EmailServer.gpgme.Context) + + def test_getGPGContext_missing_keyfile(self): + """Test EmailServer.getGPGContext() with a missing key filename.""" + self.setKey('missing-keyfile.asc') + ctx = EmailServer.getGPGContext(self.config) + self.assertTrue(ctx is None) + + def test_getGPGContext_bad_keyfile(self): + """Test EmailServer.getGPGContext() with a missing key filename.""" + self.makeBadKey() + ctx = EmailServer.getGPGContext(self.config) + self.assertTrue(ctx is None) + + +class EmailResponseTests(unittest.TestCase): + """Tests for :func:`bridgedb.EmailServer.getMailResponse`.""" + + def setUp(self): + """Create fake email, distributor, and associated context data.""" + # TODO: Add headers if we start validating them + self.lines = ["From: %s(a)%s.com", + "To: bridges@localhost", + "Subject: testing", + "", + "get bridges"] + self.ctx = _createMailContext() + + def _isTwoTupleOfNone(self, reply): + """Check that a return value is ``(None, None)``.""" + self.assertIsInstance(reply, tuple) + self.assertEqual(len(reply), 2) + self.assertEqual(reply[0], None) + self.assertEqual(reply[1], None) + + def _isTwoTupleOfAddrAndClass(self, reply, address="testing@localhost", + klass=io.StringIO): + self.assertIsInstance(reply, tuple) + self.assertEqual(len(reply), 2) + self.assertEqual(reply[0], address) + self.assertIsInstance(reply[1], klass) + + def test_getMailResponse_noFrom(self): + """A received email without a "From:" or "Sender:" header shouldn't + receive a response. + """ + lines = self.lines + lines[0] = "" + ret = EmailServer.getMailResponse(lines, self.ctx) + self._isTwoTupleOfNone(ret) + + def test_getMailResponse_badAddress(self): + """Don't respond to RFC2822 malformed source addresses.""" + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing*.?\"", "example") + ret = EmailServer.getMailResponse(lines, self.ctx) + self._isTwoTupleOfNone(ret) + + def test_getMailResponse_anotherBadAddress(self): + """Don't respond to RFC2822 malformed source addresses.""" + lines = copy.copy(self.lines) + lines[0] = "From: Mallory %s(a)%s.com" % ("<>>", "example") + ret = EmailServer.getMailResponse(lines, self.ctx) + self._isTwoTupleOfNone(ret) + + def test_getMailResponse_invalidDomain(self): + """Don't respond to RFC2822 malformed source addresses.""" + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "exa#mple") + ret = EmailServer.getMailResponse(lines, self.ctx) + self._isTwoTupleOfNone(ret) + + def test_getMailResponse_anotherInvalidDomain(self): + """Don't respond to RFC2822 malformed source addresses.""" + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "exam+ple") + ret = EmailServer.getMailResponse(lines, self.ctx) + self._isTwoTupleOfNone(ret) + + def test_getMailResponse_DKIM_badDKIMheader(self): + """An email with an 'X-DKIM-Authentication-Result:' header appended + after the body should not receive a response. + """ + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "gmail") + lines.append("X-DKIM-Authentication-Result: ") + ret = EmailServer.getMailResponse(lines, self.ctx) + self._isTwoTupleOfNone(ret) + + def test_getMailResponse_DKIM(self): + """An email with a good DKIM header should be responded to.""" + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "localhost") + lines.insert(3, "X-DKIM-Authentication-Result: ") + ret = EmailServer.getMailResponse(lines, self.ctx) + self.skip = True + raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ + " the email distributor should pass these"\ + " tests.") + self._isTwoTupleOfAddrAndClass(ret) + mail = ret[1].getvalue() + self.assertEqual(mail.find("no bridges currently"), -1) + + def test_getMailResponse_bridges_obfs3(self): + """A request for 'transport obfs3' should receive a response.""" + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "localhost") + lines[4] = "transport obfs3" + ret = EmailServer.getMailResponse(lines, self.ctx) + self.skip = True + raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ + " the email distributor should pass these"\ + " tests.") + self._isTwoTupleOfAddrAndClass(ret) + mail = ret[1].getvalue() + self.assertEqual(mail.find("no bridges currently"), -1) + + def test_getMailResponse_bridges_obfsobfswebz(self): + """We should only pay attention to the *last* in a crazy request.""" + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "localhost") + lines[4] = "unblocked webz" + lines.append("transport obfs2") + lines.append("transport obfs3") + ret = EmailServer.getMailResponse(lines, self.ctx) + self.skip = True + raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ + " the email distributor should pass these"\ + " tests.") + self._isTwoTupleOfAddrAndClass(ret) + mail = ret[1].getvalue() + self.assertNotEqual(mail.find("no bridges currently"), -1) + + def test_getMailResponse_bridges_obfsobfswebzipv6(self): + """We should *still* only pay attention to the *last* request.""" + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "localhost") + lines[4] = "transport obfs3" + lines.append("unblocked webz") + lines.append("ipv6") + lines.append("transport obfs2") + ret = EmailServer.getMailResponse(lines, self.ctx) + self.skip = True + raise unittest.SkipTest("Broken; not sure why. Manual testing says"\ + " the email distributor should pass these"\ + " tests.") + self._isTwoTupleOfAddrAndClass(ret) + mail = ret[1].getvalue() + self.assertNotEqual(mail.find("no bridges currently"), -1) + + +class EmailReplyTests(unittest.TestCase): + """Tests for ``EmailServer.replyToMail()``.""" + + def setUp(self): + """Create fake email, distributor, and associated context data.""" + # TODO: Add headers if we start validating them + self.lines = ["From: %s(a)%s.com", + "To: bridges(a)example.net", + "Subject: testing", + "\n", + "get bridges"] + self.ctx = _createMailContext() + + def test_replyToMail(self): + self.skip = True + raise unittest.SkipTest("We'll have to fake the EmailServer for this one,"\ + " it requires a TCP connection to localhost.") + + def callback(reply): + self.assertSubstring("Here are your bridges", reply) + + lines = copy.copy(self.lines) + lines[0] = self.lines[0] % ("testing", "example") + reply = EmailServer.replyToMail(lines, self.ctx) + + self.assertIsInstance(reply, defer.Deferred) + + reply.addCallback(callback) + return reply + + +class EmailServerServiceTests(unittest.TestCase): + def setUp(self): + # TODO: Add headers if we start validating them + self.lines = ["From: %s(a)%s.com", "To: %s(a)example.net", + "Subject: testing", "\n", "get bridges"] + self.distributor = DummyEmailDistributor('key', {}, {}, []) + self.ctx = _createMailContext(self.distributor) + + def test_receiveMail(self): + self.skip = True + raise unittest.SkipTest("Not finished yet") + from twisted.internet import reactor + EmailServer.addSMTPServer(self.ctx.cfg, self.distributor, NoSchedule)

1 0

[bridgedb/master] Rewrite email.server.createResponseBody() unittests to check for new strings.
by isis＠torproject.org 16 May '14

16 May '14

commit ea71a38656b06488162e23a8d52f1b050cfdf3e1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 6 12:23:15 2014 +0000 Rewrite email.server.createResponseBody() unittests to check for new strings. --- lib/bridgedb/test/test_email_server.py | 77 +++++++++----------------------- 1 file changed, 22 insertions(+), 55 deletions(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index b9677e2..c7fdefb 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -164,81 +164,48 @@ class CreateResponseBodyTests(unittest.TestCase): ] return lines - def test_createResponseBody_noFrom(self): - """A received email without a "From:" or "Sender:" header shouldn't - receive a response. - """ + def test_createResponseBody_getKey(self): + """A request for 'get key' should receive our GPG key.""" lines = self._getIncomingLines() - lines[0] = "" - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertIsNone(ret) - - def test_createResponseBody_badAddress(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = self._getIncomingLines("testing*.?\"@example.com") - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertIsNone(ret) - - def test_createResponseBody_anotherBadAddress(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = self._getIncomingLines("<>>@example.com") - lines[0] = "From: Mallory %s" % self.toAddress - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertIsNone(ret) - - def test_createResponseBody_invalidDomain(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = self._getIncomingLines("testing(a)exa#mple.com") + lines[4] = "get key" ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertIsNone(ret) + self.assertSubstring('-----BEGIN PGP PUBLIC KEY BLOCK-----', ret) - def test_createResponseBody_anotherInvalidDomain(self): - """Don't respond to RFC2822 malformed source addresses.""" - lines = self._getIncomingLines("testing(a)exam+ple.com") - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertIsNone(ret) - - def test_createResponseBody_DKIM_badDKIMheader(self): - """An email with an 'X-DKIM-Authentication-Result:' header appended - after the body should not receive a response. - """ - lines = self._getIncomingLines("testing(a)gmail.com") - lines.append("X-DKIM-Authentication-Result: ") - ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertIsNone(ret) - - def test_createResponseBody_DKIM(self): - """An email with a good DKIM header should be responded to.""" + def test_createResponseBody_bridges_invalid(self): + """An invalid request for 'transport obfs3' should get help text.""" lines = self._getIncomingLines("testing@localhost") - lines.insert(3, "X-DKIM-Authentication-Result: ") + lines[4] = "transport obfs3" ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertEqual(ret.find("no bridges currently"), -1) + self.assertSubstring("COMMANDs", ret) def test_createResponseBody_bridges_obfs3(self): - """A request for 'transport obfs3' should receive a response.""" + """A request for 'get transport obfs3' should receive a response.""" lines = self._getIncomingLines("testing@localhost") - lines[4] = "transport obfs3" + lines[4] = "get transport obfs3" ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertEqual(ret.find("no bridges currently"), -1) + 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] = "unblocked webz" - lines.append("transport obfs2") - lines.append("transport obfs3") + lines[4] = "get unblocked webz" + lines.append("get transport obfs2") + lines.append("get transport obfs3") ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertNotEqual(ret.find("no bridges currently"), -1) + 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("unblocked webz") - lines.append("ipv6") - lines.append("transport obfs2") + lines.append("get unblocked webz") + lines.append("get ipv6") + lines.append("get transport obfs2") ret = server.createResponseBody(lines, self.ctx, self.toAddress) - self.assertNotEqual(ret.find("no bridges currently"), -1) + self.assertSubstring("Here are your bridges", ret) + self.assertSubstring("obfs2", ret) class EmailReplyTests(unittest.TestCase):

1 0

[bridgedb/master] Add unittests for bridgedb.email.server.checkDKIM().
by isis＠torproject.org 16 May '14

16 May '14

commit a2fda186970113855a8ac9844069a7054ec4395e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 6 12:21:46 2014 +0000 Add unittests for bridgedb.email.server.checkDKIM(). --- lib/bridgedb/test/test_email_server.py | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index a308056..b9677e2 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -100,6 +100,40 @@ class DummyEmailDistributor(object): pass +class CheckDKIMTests(unittest.TestCase): + """Tests for :func:`email.server.checkDKIM`.""" + + 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) + + class CreateResponseBodyTests(unittest.TestCase): """Tests for :func:`bridgedb.email.server.createResponseBody`."""

1 0

[bridgedb/master] Add email.server.generateResponse() and MailResponse unittests.
by isis＠torproject.org 16 May '14

16 May '14

commit 9cf6d069e7c14edfc563617e1553afc899d576da Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 6 12:25:38 2014 +0000 Add email.server.generateResponse() and MailResponse unittests. --- lib/bridgedb/test/test_email_server.py | 60 ++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index c7fdefb..5323e38 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -208,18 +208,58 @@ class CreateResponseBodyTests(unittest.TestCase): self.assertSubstring("obfs2", ret) -class EmailReplyTests(unittest.TestCase): - """Tests for ``EmailServer.replyToMail()``.""" +class MailResponseTests(unittest.TestCase): + """Tests for ``generateResponse()`` and ``MailResponse``.""" def setUp(self): - """Create fake email, distributor, and associated context data.""" - # TODO: Add headers if we start validating them - self.lines = ["From: %s(a)%s.com", - "To: bridges(a)example.net", - "Subject: testing", - "\n", - "get bridges"] - self.ctx = _createMailContext() + 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 tearDown(self): + server.safelog.safe_logging = True + + def test_generateResponse(self): + response = server.generateResponse(self.fromAddr, self.clientAddr, + self.body) + self.assertIsInstance(response, server.MailResponse) + + def test_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): + response = server.generateResponse(self.fromAddr, self.clientAddr, + self.body) + self.assertIsInstance(response.mailfile, (io.BytesIO, io.StringIO)) + + def test_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): + 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_replyToMail(self): self.skip = True

1 0

[bridgedb/master] Add email.server.MailMessage unittests.
by isis＠torproject.org 16 May '14

16 May '14

commit 139756a559dbed7cf4ad84ee3f1e80bcf9fd1e2e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 6 12:27:03 2014 +0000 Add email.server.MailMessage unittests. --- lib/bridgedb/test/test_email_server.py | 98 ++++++++++++++++++++++++++++---- 1 file changed, 87 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index 5323e38..f4b55c4 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -261,22 +261,98 @@ a ball of timey-wimey, wibbly-warbly... stuff.""" self.assertSubstring("X-been-there: They were so 2004", contents) - def test_replyToMail(self): +class MailMessageTests(unittest.TestCase): + """Unittests for :class:`bridgedb.email.server.MailMessage`.""" + + 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_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'll have to fake the EmailServer for this one,"\ - " it requires a TCP connection to localhost.") + raise unittest.SkipTest("We need to fake the reactor for this one") - def callback(reply): - self.assertSubstring("Here are your bridges", reply) + 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 - lines = copy.copy(self.lines) - lines[0] = self.lines[0] % ("testing", "example") - reply = EmailServer.replyToMail(lines, self.ctx) - self.assertIsInstance(reply, defer.Deferred) - reply.addCallback(callback) - return reply class EmailServerServiceTests(unittest.TestCase):

1 0

[bridgedb/master] Add unittests for bridgedb.email.request module.
by isis＠torproject.org 16 May '14

16 May '14

commit 363606c6f40d91d9d5b1cc40de07097a866cdf74 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 6 15:04:22 2014 +0000 Add unittests for bridgedb.email.request module. --- lib/bridgedb/email/request.py | 2 +- lib/bridgedb/test/test_email_request.py | 276 +++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/request.py b/lib/bridgedb/email/request.py index e5b1fb9..92e3c38 100644 --- a/lib/bridgedb/email/request.py +++ b/lib/bridgedb/email/request.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8; test-case-name: bridgedb.test.test_email_request; -*- from __future__ import print_function from __future__ import unicode_literals diff --git a/lib/bridgedb/test/test_email_request.py b/lib/bridgedb/test/test_email_request.py new file mode 100644 index 0000000..7e7f6ea --- /dev/null +++ b/lib/bridgedb/test/test_email_request.py @@ -0,0 +1,276 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013, Isis Lovecruft +# (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.email.request` module.""" + +from __future__ import print_function + +import ipaddr + +from twisted.trial import unittest + +from bridgedb.email import request + + +class DetermineBridgeRequestOptionsTests(unittest.TestCase): + """Unittests for :func:`b.e.request.determineBridgeRequestOptions`.""" + + def test_determineBridgeRequestOptions_get_help(self): + """Requesting 'get help' should raise EmailRequestedHelp.""" + lines = ['', + 'get help'] + self.assertRaises(request.EmailRequestedHelp, + request.determineBridgeRequestOptions, lines) + + def test_determineBridgeRequestOptions_get_halp(self): + """Requesting 'get halp' should raise EmailRequestedHelp.""" + lines = ['', + 'get halp'] + self.assertRaises(request.EmailRequestedHelp, + request.determineBridgeRequestOptions, lines) + + def test_determineBridgeRequestOptions_get_key(self): + """Requesting 'get key' should raise EmailRequestedKey.""" + lines = ['', + 'get key'] + self.assertRaises(request.EmailRequestedKey, + request.determineBridgeRequestOptions, lines) + + def test_determineBridgeRequestOptions_multiline_invalid(self): + """Requests without a 'get' anywhere should be considered invalid.""" + lines = ['', + 'transport obfs3', + 'ipv6 vanilla bridges', + 'give me your gpgs'] + reqvest = request.determineBridgeRequestOptions(lines) + # It's invalid because it didn't include a 'get' anywhere. + self.assertEqual(reqvest.isValid(), False) + self.assertFalse(reqvest.wantsKey()) + # Though they did request IPv6, technically. + self.assertIs(reqvest.addressClass, ipaddr.IPv6Address) + # And they did request a transport, technically. + self.assertEqual(len(reqvest.transports), 1) + self.assertEqual(reqvest.transports[0], 'obfs3') + + def test_determineBridgeRequestOptions_multiline_valid(self): + """Though requests with a 'get' are considered valid.""" + lines = ['', + 'get transport obfs3', + 'vanilla bridges', + 'transport scramblesuit unblocked ca'] + reqvest = request.determineBridgeRequestOptions(lines) + # It's valid because it included a 'get'. + self.assertEqual(reqvest.isValid(), True) + self.assertFalse(reqvest.wantsKey()) + # Though they didn't request IPv6, so it should default to IPv4. + self.assertIs(reqvest.addressClass, ipaddr.IPv4Address) + # And they requested two transports. + self.assertEqual(len(reqvest.transports), 2) + self.assertEqual(reqvest.transports[0], 'obfs3') + self.assertEqual(reqvest.transports[1], 'scramblesuit') + # And they wanted this stuff to not be blocked in Canada. + self.assertEqual(len(reqvest.notBlockedIn), 1) + self.assertEqual(reqvest.notBlockedIn[0], 'ca') + + def test_determineBridgeRequestOptions_multiline_valid_OMG_CAPSLOCK(self): + """Though requests with a 'get' are considered valid, even if they + appear to not know the difference between Capslock and Shift. + """ + lines = ['', + 'get TRANSPORT obfs3', + 'vanilla bridges', + 'TRANSPORT SCRAMBLESUIT UNBLOCKED CA'] + reqvest = request.determineBridgeRequestOptions(lines) + # It's valid because it included a 'get'. + self.assertEqual(reqvest.isValid(), True) + self.assertFalse(reqvest.wantsKey()) + # Though they didn't request IPv6, so it should default to IPv4. + self.assertIs(reqvest.addressClass, ipaddr.IPv4Address) + # And they requested two transports. + self.assertEqual(len(reqvest.transports), 2) + self.assertEqual(reqvest.transports[0], 'obfs3') + self.assertEqual(reqvest.transports[1], 'scramblesuit') + # And they wanted this stuff to not be blocked in Canada. + self.assertEqual(len(reqvest.notBlockedIn), 1) + self.assertEqual(reqvest.notBlockedIn[0], 'ca') + + def test_determineBridgeRequestOptions_get_transport(self): + """An invalid request for 'transport obfs3' (missing the 'get').""" + lines = ['', + 'transport obfs3'] + reqvest = request.determineBridgeRequestOptions(lines) + self.assertEqual(len(reqvest.transports), 1) + self.assertEqual(reqvest.transports[0], 'obfs3') + self.assertEqual(reqvest.isValid(), False) + + def test_determineBridgeRequestOptions_get_ipv6(self): + """An valid request for 'get ipv6'.""" + lines = ['', + 'get ipv6'] + reqvest = request.determineBridgeRequestOptions(lines) + self.assertIs(reqvest.addressClass, ipaddr.IPv6Address) + self.assertEqual(reqvest.isValid(), True) + + +class EmailBridgeRequestTests(unittest.TestCase): + """Unittests for :class:`b.e.request.EmailBridgeRequest`.""" + + def setUp(self): + """Create an EmailBridgeRequest instance to test.""" + self.request = request.EmailBridgeRequest() + + def tearDown(self): + """Reset cached 'unblocked'/'transport' lists and addressClass between + tests. + """ + self.request.withIPv4() + self.request.notBlockedIn = [] + self.request.transports = [] + + def test_EmailBridgeRequest_isValid_initial(self): + """Initial value of EmailBridgeRequest.isValid() should be False.""" + self.request.isValid(None) + self.assertEqual(self.request.isValid(), False) + + def test_EmailBridgeRequest_isValid_True(self): + """The value of EmailBridgeRequest.isValid() should be True, after it + has been called with ``True`` as an argument. + """ + self.request.isValid(True) + self.assertEqual(self.request.isValid(), True) + + def test_EmailBridgeRequest_isValid_False(self): + """The value of EmailBridgeRequest.isValid() should be False, after it + has been called with ``False`` as an argument. + """ + self.request.isValid(False) + self.assertEqual(self.request.isValid(), False) + + def test_EmailBridgeRequest_wantsKey_initial(self): + """Initial value of EmailBridgeRequest.wantsKey() should be False.""" + self.request.wantsKey(None) + self.assertEqual(self.request.wantsKey(), False) + + def test_EmailBridgeRequest_wantsKey_True(self): + """The value of EmailBridgeRequest.wantsKey() should be True, after it + has been called with ``True`` as an argument. + """ + self.request.wantsKey(True) + self.assertEqual(self.request.wantsKey(), True) + + def test_EmailBridgeRequest_wantsKey_False(self): + """The value of EmailBridgeRequest.wantsKey() should be False, after + it has been called with ``False`` as an argument. + """ + self.request.wantsKey(False) + self.assertEqual(self.request.wantsKey(), False) + + def test_EmailBridgeRequest_withIPv6(self): + """IPv6 requests should have ``addressClass = ipaddr.IPv6Address``.""" + self.assertEqual(self.request.addressClass, ipaddr.IPv4Address) + self.request.withIPv6() + self.assertEqual(self.request.addressClass, ipaddr.IPv6Address) + + def test_EmailBridgeRequest_withoutBlockInCountry_CN(self): + """Country codes that aren't lowercase should be ignored.""" + self.request.withoutBlockInCountry('get unblocked CN') + self.assertIsInstance(self.request.notBlockedIn, list) + self.assertEqual(len(self.request.notBlockedIn), 0) + + def test_EmailBridgeRequest_withoutBlockInCountry_cn(self): + """Lowercased country codes are okay though.""" + self.request.withoutBlockInCountry('get unblocked cn') + self.assertIsInstance(self.request.notBlockedIn, list) + self.assertEqual(len(self.request.notBlockedIn), 1) + + def test_EmailBridgeRequest_withoutBlockInCountry_cn_getMissing(self): + """Lowercased country codes are still okay if the 'get' is missing.""" + self.request.withoutBlockInCountry('unblocked cn') + self.assertIsInstance(self.request.notBlockedIn, list) + self.assertEqual(len(self.request.notBlockedIn), 1) + + def test_EmailBridgeRequest_withoutBlockInCountry_multiline_cn_ir_li(self): + """Requests for multiple unblocked countries should compound if they + are on separate 'get unblocked' lines. + """ + self.request.withoutBlockInCountry('get unblocked cn') + self.request.withoutBlockInCountry('get unblocked ir') + self.request.withoutBlockInCountry('get unblocked li') + self.assertIsInstance(self.request.notBlockedIn, list) + self.assertEqual(len(self.request.notBlockedIn), 3) + + def test_EmailBridgeRequest_withoutBlockInCountry_singleline_cn_ir_li(self): + """Requests for multiple unblocked countries which are all on the same + 'get unblocked' line will use only the *first* country code. + """ + self.request.withoutBlockInCountry('get unblocked cn ir li') + self.assertIsInstance(self.request.notBlockedIn, list) + self.assertEqual(len(self.request.notBlockedIn), 1) + + def test_EmailBridgeRequest_withPluggableTransportType_SCRAMBLESUIT(self): + """Transports which aren't in lowercase should be ignored.""" + self.request.withPluggableTransportType('get transport SCRAMBLESUIT') + self.assertIsInstance(self.request.transports, list) + self.assertEqual(len(self.request.transports), 0) + + def test_EmailBridgeRequest_withPluggableTransportType_scramblesuit(self): + """Lowercased transports are okay though.""" + self.request.withPluggableTransportType('get transport scramblesuit') + self.assertIsInstance(self.request.transports, list) + self.assertEqual(len(self.request.transports), 1) + self.assertEqual(self.request.transports[0], 'scramblesuit') + + def test_EmailBridgeRequest_withPluggableTransportType_scramblesuit_getMissing(self): + """Lowercased transports are still okay if 'get' is missing.""" + self.request.withPluggableTransportType('transport scramblesuit') + self.assertIsInstance(self.request.transports, list) + self.assertEqual(len(self.request.transports), 1) + self.assertEqual(self.request.transports[0], 'scramblesuit') + + def test_EmailBridgeRequest_withPluggableTransportType_multiline_obfs3_obfs2_scramblesuit(self): + """Requests for multiple pluggable transports should compound if they + are on separate 'get transport' lines. + """ + self.request.withPluggableTransportType('get transport obfs3') + self.request.withPluggableTransportType('get transport obfs2') + self.request.withPluggableTransportType('get transport scramblesuit') + self.assertIsInstance(self.request.transports, list) + self.assertEqual(len(self.request.transports), 3) + self.assertEqual(self.request.transports[0], 'obfs3') + + def test_EmailBridgeRequest_withPluggableTransportType_singleline_obfs3_obfs2_scramblesuit(self): + """Requests for multiple transports which are all on the same + 'get transport' line will use only the *first* transport. + """ + self.request.withPluggableTransportType('get transport obfs3 obfs2 scramblesuit') + self.assertIsInstance(self.request.transports, list) + self.assertEqual(len(self.request.transports), 1) + self.assertEqual(self.request.transports[0], 'obfs3') + + def test_EmailBridgeRequest_withPluggableTransportType_whack(self): + """Requests for whacky transports that don't exist are also okay.""" + self.request.withPluggableTransportType('get transport whack') + self.assertIsInstance(self.request.transports, list) + self.assertEqual(len(self.request.transports), 1) + self.assertEqual(self.request.transports[0], 'whack') + + def test_EmailBridgeRequest_justOnePTType_obfs3_obfs2_scramblesuit(self): + """Requests for multiple transports when + ``EmailBridgeRequest.justOneTransport()`` is used will use only the + *last* transport. + """ + self.request.withPluggableTransportType('get transport obfs3') + self.request.withPluggableTransportType('get transport obfs2') + self.request.withPluggableTransportType('get transport scramblesuit') + self.assertIsInstance(self.request.transports, list) + self.assertEqual(len(self.request.transports), 3) + self.assertEqual(self.request.transports[0], 'obfs3') + self.assertEqual(self.request.justOnePTType(), 'scramblesuit')

1 0

[bridgedb/master] Add extra options for gettext/babel extract_messages command to setup.cfg.
by isis＠torproject.org 16 May '14

16 May '14

commit 342a8a17c288b08875a070af875ec1e2d9464d6b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 19:00:17 2014 +0000 Add extra options for gettext/babel extract_messages command to setup.cfg. --- setup.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 827dab2..eac2290 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,8 +14,13 @@ directory = lib/bridgedb/i18n statistics = true [extract_messages] -add_comments = TRANSLATORS: +strip_comments = false +add_comments = TRANSLATORS,TRANSLATOR,TRANSLATOR:, +msgid-bugs-address = 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…' +copyright-holder = 'The Tor Project, Inc.' +input-dirs = lib/bridgedb output_file = lib/bridgedb/i18n/templates/bridgedb.pot +sort-by-file = true width = 80 [init_catalog]

1 0

[bridgedb/master] Add email.server.MailDelivery unittests.
by isis＠torproject.org 16 May '14

16 May '14

commit 8f4ec67ccf251bbd4b64f427983883b014e7a7b5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue May 6 12:29:30 2014 +0000 Add email.server.MailDelivery unittests. --- lib/bridgedb/test/test_email_server.py | 61 ++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index f4b55c4..d856a72 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -352,7 +352,68 @@ class MailMessageTests(unittest.TestCase): return ret +class MailDeliveryTest(unittest.TestCase): + """Unittests for :class:`email.server.MailDelivery`.""" + def setUp(self): + self.config = _createConfig() + self.context = _createMailContext(self.config) + self.delivery = server.MailDelivery() + self.helo = ('fubar.example.com', '127.0.0.1') + self.origin = server.smtp.Address('user(a)example.com') + self.users = [server.smtp.User('bridges', self.helo, None, self.origin),] + + def tets_MailDelivery(self): + self.assertIsInstance(self.delivery, server.MailDelivery) + + def test_MailDelivery_setBridgeDBContext(self): + self.delivery.setBridgeDBContext(self.context) + + def test_MailDelivery_receivedHeader(self): + self.delivery.setBridgeDBContext(self.context) + hdr = self.delivery.receivedHeader(self.helo, self.origin, self.users) + self.assertTrue(hdr) + self.assertSubstring("Received: from fubar.example.com", hdr) + + def test_MailDelivery_validateFrom(self): + """A valid origin should be stored as ``MailDelivery.fromCanonical``.""" + self.delivery.setBridgeDBContext(self.context) + self.delivery.validateFrom(self.helo, self.origin) + self.assertEqual(self.delivery.fromCanonical, 'example.com') + + def test_MailDelivery_validateFrom_unsupportedDomain(self): + """A domain not in our canon should raise a SMTPBadSender.""" + self.delivery.setBridgeDBContext(self.context) + helo = ('yo.mama', '0.0.0.0') + origin = server.smtp.Address('throwing.pickles(a)yo.mama') + self.assertRaises(server.smtp.SMTPBadSender, + self.delivery.validateFrom, helo, origin) + + def test_MailDelivery_validateFrom_badOriginType(self): + """A non t.m.smtp.Address origin should raise cause an Exception.""" + self.delivery.setBridgeDBContext(self.context) + helo = ('yo.mama', '0.0.0.0') + origin = 'throwing.pickles(a)yo.mama' + self.delivery.validateFrom(helo, origin) + + def test_MailDelivery_validateTo(self): + """Should return a callable that results in a MailMessage.""" + self.delivery.setBridgeDBContext(self.context) + ret = self.delivery.validateTo(self.users[0]) + self.assertIsInstance(ret, types.FunctionType) + + def test_MailDelivery_validateTo_plusAddress(self): + """Should return a callable that results in a MailMessage.""" + self.delivery.setBridgeDBContext(self.context) + user = server.smtp.User('bridges+ar', self.helo, None, self.origin) + ret = self.delivery.validateTo(user) + self.assertIsInstance(ret, types.FunctionType) + + def test_MailDelivery_validateTo_badUsername(self): + self.delivery.setBridgeDBContext(self.context) + user = server.smtp.User('yo.mama', self.helo, None, self.origin) + self.assertRaises(server.smtp.SMTPBadRcpt, + self.delivery.validateTo, user) class EmailServerServiceTests(unittest.TestCase):

1 0

[bridgedb/master] Fix default GPGHOMEDIR setting in libgpgme context.
by isis＠torproject.org 16 May '14

16 May '14

commit b0940e469f9c6d0ac0b1533a229bc0519255caaa Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 01:47:50 2014 +0000 Fix default GPGHOMEDIR setting in libgpgme context. GPGME was using the process owner's default GPGHOMEDIR directory, regardless of any keyfiles specified, meaning that if there were any other non-signing enabled secret keys in the keyrings, and one of the other keys was first on the secret keyring, that first key would be used for signing rather than the secret key in the specified keyfile. * FIX problem detailed in comment 11 on #5463: https://trac.torproject.org/projects/tor/ticket/5463#comment:11 --- lib/bridgedb/crypto.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 2feb556..e8cf8fd 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -56,6 +56,7 @@ from Crypto.Cipher import PKCS1_OAEP from Crypto.PublicKey import RSA from twisted.internet import ssl +from twisted.python.procutils import which #: The hash digest to use for HMACs. @@ -79,6 +80,12 @@ except TypeError: else: NEW_BUFFER_INTERFACE = True +#: Settings for the GPGME Context and `Crypto Engine`_. +#: .. _`Crypto Engine`: +#: http://www.gnupg.org/documentation/manuals/gpgme/Crypto-Engine.html#Crypto-… +GPGME_CONTEXT_HOMEDIR = '.gnupg' +GPGME_CONTEXT_BINARY = which('gpg2') or which('gpg') # These will be lists + class RSAKeyGenerationError(Exception): """Raised when there was an error creating an RSA keypair.""" @@ -334,6 +341,22 @@ def getGPGContext(cfg): ctx = gpgme.Context() try: + binary = GPGME_CONTEXT_BINARY[0] + except Exception: + # Setting this to ``None`` will cause libgpgme to "use the default + # binary", according their docs: + binary = None + + try: + homedir = os.path.abspath(GPGME_CONTEXT_HOMEDIR) + logging.debug("Setting GPG homedir to %r" % homedir) + if not os.path.isdir(homedir): + os.makedirs(homedir) + # This is done to ensure that we don't ever use keys in the process + # owner's $GNUPGHOME directory, see: + # http://www.gnupg.org/documentation/manuals/gpgme/Crypto-Engine.html#Crypto-… + ctx.set_engine_info(gpgme.PROTOCOL_OpenPGP, binary, homedir) + logging.debug("Opening GPG keyfile %s..." % cfg.EMAIL_GPG_SIGNING_KEY) keyfile = open(cfg.EMAIL_GPG_SIGNING_KEY) key = ctx.import_(keyfile)

1 0

[bridgedb/master] Change the embedded list of supported languages into a set.
by isis＠torproject.org 16 May '14

16 May '14

commit 1448c0858a135fd62baf7291c5fa059e9eeb30b5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 19:03:51 2014 +0000 Change the embedded list of supported languages into a set. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 030a0e4..fbb6602 100644 --- a/setup.py +++ b/setup.py @@ -163,8 +163,8 @@ def get_supported_langs(): with open(repo_langs, 'r') as langsfile: for line in langsfile.readlines(): if line.startswith('supported'): - line = "supported = %s\n" % supported - #print("REWROTE supported langs: %s" % line) + # Change the 'supported' list() into a set(): + line = "supported = set(%s)\n" % supported new_langs_lines.append(line) with open(repo_langs, 'w') as newlangsfile: for line in new_langs_lines:

1 0