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

[bridgedb/develop] Add additional unittests for crypto.LessCrypticGPGMEError.
by isis＠torproject.org 14 May '14

14 May '14

commit 55af823890f141edb07cebdbab47a20fb8e45bf3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 04:09:46 2014 +0000 Add additional unittests for crypto.LessCrypticGPGMEError. --- lib/bridgedb/test/test_crypto.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index f828ef0..935a784 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals import gpgme import io import logging +import math import os import shutil @@ -105,6 +106,35 @@ class LessCrypticGPGMEErrorTests(unittest.TestCase): self.assertTrue('Invalid argument' in lessCryptic.message) + def test_noGpgmeErrorArgs(self): + """A gpgme.GpgmeError() without error code args should result in a + 'Could not get error code from gpgme.GpgmeError!' message. + """ + error = gpgme.GpgmeError() + lessCryptic = crypto.LessCrypticGPGMEError(error) + self.assertEqual(lessCryptic.message, + 'Could not get error code from gpgme.GpgmeError!') + + def test_unknownErrorSource(self): + """A gpgme.GpgmeError() without a recognisable error source should say + that the error source is 'UNKNOWN'. + """ + msg = "These numbers make more sense than libgpgme's error codes." + error = gpgme.GpgmeError(math.pi, math.e, msg) + lessCryptic = crypto.LessCrypticGPGMEError(error) + self.assertSubstring('UNKNOWN', lessCryptic.message) + self.assertSubstring(msg, lessCryptic.message) + + def test_unknownErrorCode(self): + """A gpgme.GpgmeError() without a recognisable error code should say + that the error code is 'UNKNOWN'. + """ + msg = "These numbers make more sense than libgpgme's error codes." + error = gpgme.GpgmeError(math.pi, math.e, msg) + lessCryptic = crypto.LessCrypticGPGMEError(error) + self.assertSubstring('UNKNOWN', lessCryptic.message) + self.assertSubstring(msg, lessCryptic.message) + class SSLVerifyingContextFactoryTests(unittest.TestCase, txtagent.FakeReactorAndConnectMixin):

1 0

[bridgedb/develop] Add unittests for bridgedb.email.templates module.
by isis＠torproject.org 14 May '14

14 May '14

commit 33583300323312e36218e21f33162ca572bcf82f Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 12 15:02:03 2014 +0000 Add unittests for bridgedb.email.templates module. --- lib/bridgedb/test/test_email_templates.py | 119 +++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/lib/bridgedb/test/test_email_templates.py b/lib/bridgedb/test/test_email_templates.py new file mode 100644 index 0000000..0c74377 --- /dev/null +++ b/lib/bridgedb/test/test_email_templates.py @@ -0,0 +1,119 @@ +# -*- 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.templates` module.""" + +from __future__ import print_function +from __future__ import unicode_literals + +from io import StringIO +from gettext import NullTranslations + +from twisted.mail.smtp import Address +from twisted.trial import unittest + +from bridgedb.email import templates + + +class EmailTemplatesTests(unittest.TestCase): + """Unittests for :func:`b.e.templates`.""" + + def setUp(self): + self.t = NullTranslations(StringIO(unicode('test'))) + self.client = Address('blackhole(a)torproject.org') + self.answer = 'obfs3 1.1.1.1:1111\nobfs3 2.2.2.2:2222' + # This is the fingerprint of BridgeDB's offline, certification-only + # GnuPG key. It should be present in any responses to requests for our + # public keys. + self.offlineFingerprint = '7B78437015E63DF47BB1270ACBD97AA24E8E472E' + + def shouldIncludeCommands(self, text): + self.assertSubstring('COMMANDs', text) + + def shouldIncludeInstructions(self, text): + self.assertSubstring('Tor Browser', text) + + def shouldIncludeBridges(self, text): + self.assertSubstring(self.answer, text) + self.assertSubstring('Here are your bridges:', text) + + def shouldIncludeGreeting(self, text): + self.assertSubstring('Hey, blackhole!', text) + + def shouldIncludeAutomationNotice(self, text): + self.assertSubstring('automated message', text) + + def shouldIncludeKey(self, text): + self.assertSubstring('-----BEGIN PGP PUBLIC KEY BLOCK-----', text) + + def shouldIncludeFooter(self, text): + self.assertSubstring('rainbows, unicorns, and sparkles', text) + + def test_templates_addCommands(self): + text = templates.addCommands(self.t) + self.shouldIncludeCommands(text) + + def test_templates_addGreeting(self): + text = templates.addGreeting(self.t, self.client.local) + self.shouldIncludeGreeting(text) + + def test_templates_addGreeting_noClient(self): + text = templates.addGreeting(self.t, None) + self.assertSubstring('Hello, friend!', text) + + def test_templates_addGreeting_withWelcome(self): + text = templates.addGreeting(self.t, self.client.local, welcome=True) + self.shouldIncludeGreeting(text) + self.assertSubstring('Welcome to BridgeDB!', text) + + def test_templates_addGreeting_trueClient(self): + text = templates.addGreeting(self.t, True) + self.assertSubstring('Hey', text) + + def test_templates_addGreeting_23Client(self): + text = templates.addGreeting(self.t, 23) + self.assertSubstring('Hey', text) + + def test_templates_addHowto(self): + text = templates.addHowto(self.t) + self.shouldIncludeInstructions(text) + + def test_templates_addBridgeAnswer(self): + text = templates.addBridgeAnswer(self.t, self.answer) + self.shouldIncludeBridges(text) + + def test_templates_addFooter(self): + text = templates.addFooter(self.t, self.client) + self.shouldIncludeFooter(text) + + def test_templates_buildAnswerMessage(self): + text = templates.buildAnswerMessage(self.t, self.client, self.answer) + self.assertSubstring(self.answer, text) + self.shouldIncludeAutomationNotice(text) + self.shouldIncludeCommands(text) + self.shouldIncludeFooter(text) + + def test_templates_buildKeyMessage(self): + text = templates.buildKeyMessage(self.t, self.client) + self.assertSubstring(self.offlineFingerprint, text) + + def test_templates_buildWelcomeText(self): + text = templates.buildWelcomeText(self.t, self.client) + self.shouldIncludeGreeting(text) + self.assertSubstring('Welcome to BridgeDB!', text) + self.shouldIncludeCommands(text) + self.shouldIncludeFooter(text) + + def test_templates_buildSpamWarning(self): + text = templates.buildSpamWarning(self.t, self.client) + self.shouldIncludeGreeting(text) + self.shouldIncludeAutomationNotice(text) + self.shouldIncludeFooter(text)

1 0

[bridgedb/develop] Add unittest for email signing with expired testing keys.
by isis＠torproject.org 14 May '14

14 May '14

commit 363e2ccae77d5697e1e89630f3f1f48b10fd2f39 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 04:22:38 2014 +0000 Add unittest for email signing with expired testing keys. --- gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 0 -> 6505 bytes lib/bridgedb/test/test_crypto.py | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 b/gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 new file mode 100644 index 0000000..ae13a98 Binary files /dev/null and b/gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 differ diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index e610d03..aca5d2c 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -171,7 +171,8 @@ class GPGContextTests(unittest.TestCase): 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') + self.gpgExpr = os.path.join(topDir, 'gnupghome', + 'TESTING.subkeys.sec.EXPIRED-2013-09-11') if not os.path.isdir(self.runDir): os.makedirs(self.runDir) @@ -199,6 +200,12 @@ class GPGContextTests(unittest.TestCase): ctx = crypto.getGPGContext(self.config) self.assertTrue(ctx is None) + def test_getGPGContext_expired_keyfile(self): + """getGPGContext() with an expired key should return None.""" + self.setKey(self.gpgExpr) + ctx = crypto.getGPGContext(self.config) + self.assertTrue(ctx is None) + def test_getGPGContext_signing_disabled(self): """getGPGContext() with signing disabled should return None.""" self.setKey(self.gpgFile)

1 0

[bridgedb/develop] Add docstring for email.server.MailMessage.getClientAddress.
by isis＠torproject.org 14 May '14

14 May '14

commit c68a04ed3f23777c14962164cc19918fb30b96b2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 9 16:33:54 2014 +0000 Add docstring for email.server.MailMessage.getClientAddress. --- lib/bridgedb/email/server.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 838093e..7aeb4ff 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -501,7 +501,7 @@ class MailMessage(object): """Create and parse an :rfc:`2822` message object for all ``lines`` received thus far. - :rtype: :api:`twisted.mail.smtp.rfc822.Message`. + :rtype: :api:`twisted.mail.smtp.rfc822.Message` :returns: A ``Message`` comprised of all lines received thus far. """ rawMessage = io.StringIO() @@ -510,6 +510,16 @@ class MailMessage(object): return smtp.rfc822.Message(rawMessage) def getClientAddress(self, incoming): + """Attempt to get the client's email address from an incoming email. + + :type incoming: :api:`twisted.mail.smtp.rfc822.Message` + :param incoming: An incoming ``Message``, i.e. as returned from + :meth:`getIncomingMessage`. + :rtype: ``None`` or :api:`twisted.mail.smtp.Address` + :returns: The client's email ``Address``, if it originated from a + domain that we accept and the address was well-formed. Otherwise, + returns ``None``. + """ addrHeader = None try: fromAddr = incoming.getaddr("From")[1] except (IndexError, TypeError, AttributeError): pass

1 0

[bridgedb/develop] Remove password from gnupghome/TESTING.subkeys.sec key.
by isis＠torproject.org 14 May '14

14 May '14

commit 1040ffa74d85ef86bed8d1cded3fbce113a8e35d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 12 18:15:47 2014 +0000 Remove password from gnupghome/TESTING.subkeys.sec key. --- gnupghome/TESTING.subkeys.sec | Bin 7304 -> 7212 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnupghome/TESTING.subkeys.sec b/gnupghome/TESTING.subkeys.sec index 3adba09..688f7e9 100644 Binary files a/gnupghome/TESTING.subkeys.sec and b/gnupghome/TESTING.subkeys.sec differ

1 0

[bridgedb/develop] Add a personalised greeting and footer to emails.
by isis＠torproject.org 14 May '14

14 May '14

commit 9c6994cc8f912b5d2f05dbc0dd10057a7cedf4f5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 12 15:02:32 2014 +0000 Add a personalised greeting and footer to emails. * FIXES a problem noted by Robert Ransom (in ticket #5463) with adversaries being able to capture a signed email for Alice and resend it to Bob to target Bob by having influence over his available bridges. * ADD a footer to emails, which includes the client's email address and a timestamp for when the email was generated. * ADD the answer bridge lines to the answer template creation parameters, so that the answer string isn't formatted into the message after message creation. Rename email.template functions for adding text. To distinguish them from the templates.build* functions, which build entire emails. The following functions have been renamed: * RENAME templates.buildCommands() → templates.addCommands() * RENAME templates.buildKeyfile() → templates.addKeyfile() * RENAME templates.buildHowto() → templates.addHowto() * RENAME templates.buildBridgeAnswer() → templates.buildBridgeAnswer() --- lib/bridgedb/email/server.py | 22 +++--- lib/bridgedb/email/templates.py | 136 +++++++++++++++++++++++--------- lib/bridgedb/strings.py | 9 +++ lib/bridgedb/test/test_email_server.py | 2 +- 4 files changed, 122 insertions(+), 47 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 7aeb4ff..678c154 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -77,7 +77,7 @@ def checkDKIM(message, rules): return False return True -def createResponseBody(lines, context, toAddress, lang='en'): +def createResponseBody(lines, context, clientAddress, lang='en'): """Parse the **lines** from an incoming email request and determine how to respond. @@ -85,7 +85,8 @@ def createResponseBody(lines, context, toAddress, lang='en'): client. :type context: class:`MailContext` :param context: The context which contains settings for the email server. - :param str toAddress: The rfc:`2821` email address which should be in the + :type clientAddress: :api:`twisted.mail.smtp.Address` + :param clientAddress: The client's email address which should be in the :header:`To:` header of the response email. :param str lang: The 2-5 character locale code to use for translating the email. This is obtained from a client sending a email to a valid plus @@ -98,6 +99,7 @@ def createResponseBody(lines, context, toAddress, lang='en'): string containing the (optionally translated) body for the email response which we should send out. """ + clientAddr = '@'.join([clientAddress.local, clientAddress.domain]) t = translations.installTranslations(lang) bridges = None @@ -108,25 +110,25 @@ def createResponseBody(lines, context, toAddress, lang='en'): # valid email commands: if not bridgeRequest.isValid(): raise EmailRequestedHelp("Email request from %r was invalid." - % toAddress) + % clientAddr) # Otherwise they must have requested bridges: interval = context.schedule.getInterval(time.time()) bridges = context.distributor.getBridgesForEmail( - toAddress, + clientAddr, interval, context.nBridges, countryCode=None, bridgeFilterRules=bridgeRequest.filters) except EmailRequestedHelp as error: logging.info(error) - return templates.buildWelcomeText(t) + return templates.buildWelcomeText(t, clientAddress) except EmailRequestedKey as error: logging.info(error) - return templates.buildKeyfile(t) + return templates.buildKeyMessage(t, clientAddress) except TooSoonEmail as error: logging.info("Got a mail too frequently: %s." % error) - return templates.buildSpamWarning(t) + return templates.buildSpamWarning(t, clientAddress) except (IgnoreEmail, BadEmail) as error: logging.info(error) # Don't generate a response if their email address is unparsable or @@ -140,8 +142,8 @@ def createResponseBody(lines, context, toAddress, lang='en'): includeFingerprint=context.includeFingerprints, addressClass=bridgeRequest.addressClass, transport=transport, - request=toAddress) for b in bridges) - return templates.buildMessage(t) % answer + request=clientAddr) for b in bridges) + return templates.buildAnswerMessage(t, clientAddress, answer) def generateResponse(fromAddress, clientAddress, body, subject=None, messageID=None, gpgContext=None): @@ -636,7 +638,7 @@ class MailMessage(object): lang = translations.getLocaleFromPlusAddr(recipient) logging.info("Client requested email translation: %s" % lang) - body = createResponseBody(self.lines, self.context, clientAddr, lang) + body = createResponseBody(self.lines, self.context, client, lang) if not body: return d # The client was already warned. response = generateResponse(self.context.fromAddr, clientAddr, body, diff --git a/lib/bridgedb/email/templates.py b/lib/bridgedb/email/templates.py index 6c25038..8a7f4aa 100644 --- a/lib/bridgedb/email/templates.py +++ b/lib/bridgedb/email/templates.py @@ -18,12 +18,14 @@ from __future__ import unicode_literals import logging import os +from datetime import datetime + from bridgedb import strings from bridgedb.Dist import MAX_EMAIL_RATE from bridgedb.HTTPServer import TEMPLATE_DIR -def buildCommands(template): +def addCommands(template): # Tell them about the various email commands: cmdlist = [] cmdlist.append(template.gettext(strings.EMAIL_MISC_TEXT.get(3))) @@ -44,21 +46,23 @@ def buildCommands(template): return commands -def buildHowto(template): - howToTBB = template.gettext(strings.HOWTO_TBB[1]) % strings.EMAIL_SPRINTF["HOWTO_TBB1"] - howToTBB += u'\n\n' - howToTBB += template.gettext(strings.HOWTO_TBB[2]) - howToTBB += u'\n\n' - howToTBB += u'\n'.join(["> {0}".format(ln) for ln in - template.gettext(strings.HOWTO_TBB[3]).split('\n')]) - howToTBB += u'\n\n' - howToTBB += template.gettext(strings.HOWTO_TBB[4]) - howToTBB += u'\n\n' - howToTBB += strings.EMAIL_REFERENCE_LINKS.get("HOWTO_TBB1") - howToTBB += u'\n\n' - return howToTBB +def addGreeting(template, clientName=None, welcome=False): + greeting = "" + + if not clientName: + greeting = template.gettext(strings.EMAIL_MISC_TEXT[7]) + else: + greeting = template.gettext(strings.EMAIL_MISC_TEXT[6]) % clientName + + if greeting: + if welcome: + greeting += u' ' + greeting += template.gettext(strings.EMAIL_MISC_TEXT[4]) + greeting += u'\n\n' -def buildKeyfile(template): + return greeting + +def addKeyfile(template): filename = os.path.join(TEMPLATE_DIR, 'bridgedb.asc') try: @@ -72,11 +76,69 @@ def buildKeyfile(template): return keyFile -def buildWelcomeText(template): +def addBridgeAnswer(template, answer): + # Give the user their bridges, i.e. the `answer`: + bridgeLines = template.gettext(strings.EMAIL_MISC_TEXT[0]) + bridgeLines += u"\n\n" + bridgeLines += template.gettext(strings.EMAIL_MISC_TEXT[1]) + bridgeLines += u"\n\n" + bridgeLines += u"%s\n\n" % answer + + return bridgeLines + +def addHowto(template): + howToTBB = template.gettext(strings.HOWTO_TBB[1]) % strings.EMAIL_SPRINTF["HOWTO_TBB1"] + howToTBB += u'\n\n' + howToTBB += template.gettext(strings.HOWTO_TBB[2]) + howToTBB += u'\n\n' + howToTBB += u'\n'.join(["> {0}".format(ln) for ln in + template.gettext(strings.HOWTO_TBB[3]).split('\n')]) + howToTBB += u'\n\n' + howToTBB += template.gettext(strings.HOWTO_TBB[4]) + howToTBB += u'\n\n' + howToTBB += strings.EMAIL_REFERENCE_LINKS.get("HOWTO_TBB1") + howToTBB += u'\n\n' + return howToTBB + +def addFooter(template, clientAddress=None): + """Add a footer. + + -- + <3 BridgeDB + + ------------------------------------------------------------------------- + Public Keys: https://bridges.torproject.org/keys + + This email was generated with rainbows, unicorns, and sparkles + for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39. + """ + now = datetime.utcnow() + clientAddr = clientAddress.addrstr + + footer = u'--\n' + footer += u' <3 BridgeDB\n\n' + footer += u'-' * 70 + footer += u'\n' + footer += template.gettext(strings.EMAIL_MISC_TEXT[8]) + footer += u': https://bridges.torproject.org/keys\n' + footer += template.gettext(strings.EMAIL_MISC_TEXT[9]) \ + % (clientAddr, + now.strftime('%A, %d %B, %Y'), + now.strftime('%H:%M:%S')) + footer += u'\n' + + return footer + +def buildKeyMessage(template, clientAddress=None): + message = addKeyfile(template) + message += addFooter(template, clientAddress) + return message + +def buildWelcomeText(template, clientAddress=None): sections = [] - sections.append(template.gettext(strings.EMAIL_MISC_TEXT[4])) + sections.append(addGreeting(template, clientAddress.local, welcome=True)) - commands = buildCommands(template) + commands = addCommands(template) sections.append(commands) # Include the same messages as the homepage of the HTTPS distributor: @@ -88,36 +150,38 @@ def buildWelcomeText(template): message = u"\n\n".join(sections) # Add the markdown links at the end: message += strings.EMAIL_REFERENCE_LINKS.get("WELCOME0") - message += u"\n" - - return message + message += u"\n\n" + message += addFooter(template, clientAddress) -def buildBridgeAnswer(template): - # Give the user their bridges, i.e. the `answer`: - message = template.gettext(strings.EMAIL_MISC_TEXT[0]) + u"\n\n" \ - + template.gettext(strings.EMAIL_MISC_TEXT[1]) + u"\n\n" \ - + u"%s\n\n" return message -def buildMessage(template): - message = None +def buildAnswerMessage(template, clientAddress=None, answer=None): try: - message = buildBridgeAnswer(template) - message += buildHowto(template) + message = addGreeting(template, clientAddress.local) + message += addBridgeAnswer(template, answer) + message += addHowto(template) + message += u'\n\n' + message += addCommands(template) message += u'\n\n' - message += buildCommands(template) + message += addFooter(template, clientAddress) except Exception as error: # pragma: no cover logging.error("Error while formatting email message template:") logging.exception(error) + return message -def buildSpamWarning(template): - message = None +def buildSpamWarning(template, clientAddress=None): + message = addGreeting(template, clientAddress.local) + try: - message = template.gettext(strings.EMAIL_MISC_TEXT[0]) + u"\n\n" \ - + template.gettext(strings.EMAIL_MISC_TEXT[2]) + u"\n" - message = message % str(MAX_EMAIL_RATE / 3600) + message += template.gettext(strings.EMAIL_MISC_TEXT[0]) + message += u"\n\n" + message += template.gettext(strings.EMAIL_MISC_TEXT[2]) \ + % str(MAX_EMAIL_RATE / 3600) + message += u"\n\n" + message += addFooter(template, clientAddress) except Exception as error: # pragma: no cover logging.error("Error while formatting email spam template:") logging.exception(error) + return message diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index 421f8ec..e001d45 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -27,6 +27,15 @@ COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"""), 4: _("Welcome to BridgeDB!"), # TRANLATORS: Please DO NOT tranlate the words "transport" or "TYPE". 5: _("Currently supported tranport TYPEs:"), + 6: _("Hey, %s!"), + 7: _("Hello, friend!"), + 8: _("Public Keys"), + # TRANSLATORS: This string will end up saying something like: + # "This email was generated with rainbows, unicorns, and sparkles + # for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." + 9: _("""\ +This email was generated with rainbows, unicorns, and sparkles +for %s on %s at %s."""), } WELCOME = { diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py index d856a72..b7e12c6 100644 --- a/lib/bridgedb/test/test_email_server.py +++ b/lib/bridgedb/test/test_email_server.py @@ -154,7 +154,7 @@ class CreateResponseBodyTests(unittest.TestCase): def _getIncomingLines(self, clientAddress="user(a)example.com"): """Generate the lines of an incoming email from **clientAddress**.""" - self.toAddress = clientAddress + self.toAddress = server.smtp.Address(clientAddress) lines = [ "From: %s" % clientAddress, "To: bridges@localhost",

1 0

[bridgedb/develop] Merge branch 'fix/5463-gpgme-homedir' into develop
by isis＠torproject.org 14 May '14

14 May '14

commit a391323e5c8ecd47f1d6ef9a9d37c2b589ea6406 Merge: 94a348c 363e2cc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 03:23:19 2014 +0000 Merge branch 'fix/5463-gpgme-homedir' into develop gnupghome/TESTING.subkeys.sec | Bin 6505 -> 7304 bytes gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 0 -> 6505 bytes lib/bridgedb/crypto.py | 23 ++++ lib/bridgedb/test/test_crypto.py | 146 +++++++++++++++++++++- 4 files changed, 165 insertions(+), 4 deletions(-)

1 0

[bridgedb/develop] Merge branch 'translations/2014-05-07-update' into develop
by isis＠torproject.org 14 May '14

14 May '14

commit 8ea18f7525d92fbbda21b64f0267b33f050754d3 Merge: 91d6e2c 2c9f700 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 03:26:03 2014 +0000 Merge branch 'translations/2014-05-07-update' into develop Makefile | 3 + lib/bridgedb/i18n/templates/bridgedb.pot | 344 ++++++++++++++++++++++++------ setup.cfg | 7 +- setup.py | 5 +- 4 files changed, 294 insertions(+), 65 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/5463-7547-7550-8241-11475-11753-email-rewrite' into develop
by isis＠torproject.org 14 May '14

14 May '14

commit 94a348c9593d2c3b120d9de1eff6910a9a9aef53 Merge: 25be173 363606c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 03:21:56 2014 +0000 Merge branch 'fix/5463-7547-7550-8241-11475-11753-email-rewrite' into develop lib/bridgedb/Dist.py | 49 +- lib/bridgedb/EmailServer.py | 483 ------------------ lib/bridgedb/HTTPServer.py | 86 ++-- lib/bridgedb/Main.py | 6 +- lib/bridgedb/bridgerequest.py | 128 +++++ lib/bridgedb/email/request.py | 153 ++++++ lib/bridgedb/email/server.py | 746 ++++++++++++++++++++++++++++ lib/bridgedb/email/templates.py | 123 +++++ lib/bridgedb/strings.py | 21 +- lib/bridgedb/templates/base.html | 53 +- lib/bridgedb/templates/bridgedb.asc | 300 +++++++++++ lib/bridgedb/templates/bridges.html | 34 +- lib/bridgedb/templates/captcha.html | 80 +-- lib/bridgedb/templates/howto.html | 26 +- lib/bridgedb/templates/index.html | 9 +- lib/bridgedb/templates/options.html | 52 +- lib/bridgedb/templates/static/bridgedb.asc | 274 ---------- lib/bridgedb/test/test_EmailServer.py | 344 ------------- lib/bridgedb/test/test_HTTPServer.py | 3 +- lib/bridgedb/test/test_crypto.py | 68 +++ lib/bridgedb/test/test_email_request.py | 276 ++++++++++ lib/bridgedb/test/test_email_server.py | 429 ++++++++++++++++ setup.py | 1 + 23 files changed, 2447 insertions(+), 1297 deletions(-)

1 0

[bridgedb/develop] Merge branch 'rransom/5463-ui-typos' into develop
by isis＠torproject.org 14 May '14

14 May '14

commit 9258d8ad1adba8d1411560f882b342a3520423a6 Merge: 8ea18f7 bd069d5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 03:35:40 2014 +0000 Merge branch 'rransom/5463-ui-typos' into develop lib/bridgedb/strings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0