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

[tor-browser-bundle/master] Fix typo in commit message.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit e1623db26e9d3ef223379021d6b083a905b8e0d8 Merge: 612972b 3e83236 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 12:01:25 2014 +0200 Fix typo in commit message. Reminder: parse your commit message carefully before committing. :(

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit 00e81ee6be0580cc2ff847700295e1388de5b793 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 10:15:23 2014 +0000 Update translations for tails-persistence-setup_completed --- es/es.po | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/es/es.po b/es/es.po index 7eefa97..31bbfe2 100644 --- a/es/es.po +++ b/es/es.po @@ -4,14 +4,14 @@ # # Translators: # mm2herr <ma_herrer(a)… [View More]yahoo.com.mx>, 2013 -# strel, 2013 +# strel, 2013-2014 # strel, 2012-2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 12:48+0000\n" +"POT-Creation-Date: 2014-04-16 21:26+0200\n" +"PO-Revision-Date: 2014-04-17 10:14+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -121,67 +121,67 @@ msgstr "Crear enlaces simbólicos ('symlink') en $HOME para todos los ficheros o msgid "Setup Tails persistent volume" msgstr "Establecer el volumen persistente de Tails" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "El dispositivo %s ya tiene un volumen persistente." -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "El dispositivo %s no tiene suficiente espacio sin asignar." -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "El dispositivo %s no tiene un volumen persistente." -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "No se puede eliminar el volumen persistente mientras está en uso. Debe reiniciar Tails sin persistencia." -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "El volumen persistente no está desbloqueado." -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "El volumen persistente no está montado." -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "El volumen persistente no se pudo leer. ¿Problemas de permisos o de propietarios?" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "El volumen persistente no se pudo escribir. ¿Está quizá montado en modo sólo-lectura (read-only)?" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails se está ejecutando desde un dispositivo %s que no es USB / SDIO." -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "El dispositivo %s es óptico" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format -msgid "Device %s was not created using Tails USB installer." -msgstr "El dispositivo %s no fue creado usando el instalador USB de Tails." +msgid "Device %s was not created using Tails Installer." +msgstr "El dispositivo %s no fue creado usando el instalador de Tails." -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "Error" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "Asistente de persistencia - Finalizado" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -290,28 +290,28 @@ msgstr "Guardando... " msgid "Saving persistence configuration..." msgstr "Guardando la configuración de persistencia... " -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "Asistente de persistencia - Eliminación del volumen persistente" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "Sus datos persistentes serán eliminados. " -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." msgstr "El volumen persistente %s (%s), en el dispositivo %s %s, será eliminado." -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "Eliminar" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "Eliminando... " -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr "Eliminando el volumen persistente... " [View Less]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit e211e46fa5b88e062a0dfe622d3a2ccd2e5b826d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 10:15:20 2014 +0000 Update translations for tails-persistence-setup --- es/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index aae914c..31bbfe2 100644 --- a/es/es.po +++ b/es/es.po @@ -4,15 +4,15 @@ # # Translators: # mm2herr <ma_herrer(a)yahoo.com.mx>, 2013 -# strel, 2013 +# strel, 2013-… [View More]

1 0

[tor-browser-bundle/master] Bug 11535: Hardcoding obfsproxy commit.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 3e83236fc84a0d14f01a46db8550cbf4621e58c7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 11:14:09 2014 +0000 Bug 11535: Hardcoding obfsproxy commit. Until #11535 is getting fixed we are hardcoding commit b58fd9e1ef264796b6bddbde5db117472fb674a0 do avoid a broken obfsproxy in nightly builds. --- gitian/versions.nightly | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index … [View More]

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit 0349032cebfd96223364921c284331e93e8ebee0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 09:17:04 2014 +0000 Update translations for tails-persistence-setup_completed --- templates/tails-persistence-setup.pot | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/tails-persistence-setup.pot b/templates/tails-persistence-setup.pot index dec0459..136cb97 100644 --- a/templates/tails-… [View More]persistence-setup.pot +++ b/templates/tails-persistence-setup.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" +"POT-Creation-Date: 2014-04-16 21:26+0200\n" +"PO-Revision-Date: 2014-04-17 09:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -118,67 +118,67 @@ msgstr "Symlink into $HOME every file or directory found in the `dotfiles' direc msgid "Setup Tails persistent volume" msgstr "Setup Tails persistent volume" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Device %s already has a persistent volume." -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Device %s has not enough unallocated space." -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "Device %s has no persistent volume." -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Cannot delete the persistent volume while in use. You should restart Tails without persistence." -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "Persistence volume is not unlocked." -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "Persistence volume is not mounted." -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Persistence volume is not readable. Permissions or ownership problems?" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Persistence volume is not writable. Maybe it was mounted read-only?" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails is running from non-USB / non-SDIO device %s." -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "Device %s is optical." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format -msgid "Device %s was not created using Tails USB installer." -msgstr "Device %s was not created using Tails USB installer." +msgid "Device %s was not created using Tails Installer." +msgstr "Device %s was not created using Tails Installer." -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "Error" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "Persistence wizard - Finished" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -287,28 +287,28 @@ msgstr "Saving..." msgid "Saving persistence configuration..." msgstr "Saving persistence configuration..." -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "Persistence wizard - Persistent volume deletion" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "Your persistent data will be deleted." -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." msgstr "The persistent volume %s (%s), on the %s %s device, will be deleted." -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "Delete" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "Deleting..." -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr "Deleting the persistent volume..." [View Less]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit 8fdd9bb4aed222e756bcb180609f9e05481625a2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 09:16:57 2014 +0000 Update translations for tails-persistence-setup --- ach/ach.po | 50 +++++++++++++++---------------- ady/ady.po | 12 ++++---- af/af.po | 46 ++++++++++++++--------------- ak/ak.po | 46 ++++++++++++++--------------- … [View More]

1 0

[bridgedb/develop] Fix unicode encoding errors in outgoing SMTP transport.
by isis＠torproject.org 17 Apr '14

17 Apr '14

commit fcaf0a5a4401d9f85bd16b550edfefaa2ef50559 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 8 23:30:27 2014 +0000 Fix unicode encoding errors in outgoing SMTP transport. * REFACTOR bridgedb.EmailServer.composeEmail() to use io.BytesIO. --- lib/bridgedb/EmailServer.py | 83 +++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index e1aa57e..… [View More]db2cf80 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -8,9 +8,9 @@ from __future__ import unicode_literals from email import message -from io import StringIO import gettext import gpgme +import io import logging import re import rfc822 @@ -315,6 +315,47 @@ def getLocaleFromRequest(request): lang = lang[0] return I18n.getLang(lang) +def composeEmail(fromAddr, clientAddr, subject, body, + msgID=None, gpgContext=None): + + if not subject.startswith("Re:"): + subject = "Re: %s" % subject + + msg = smtp.rfc822.Message(io.StringIO()) + msg.setdefault("From", fromAddr) + msg.setdefault("To", clientAddr) + msg.setdefault("Message-ID", smtp.messageid()) + msg.setdefault("Subject", subject) + if msgID: + msg.setdefault("In-Reply-To", msgID) + msg.setdefault("Date", smtp.rfc822date()) + msg.setdefault('Content-Type', 'text/plain; charset="utf-8"') + headers = [': '.join(m) for m in msg.items()] + + mail = io.BytesIO() + mail.writelines(buffer("\r\n".join(headers))) + mail.writelines(buffer("\r\n")) + mail.writelines(buffer("\r\n")) + + if not gpgContext: + mail.write(buffer(body)) + else: + signature, siglist = gpgSignMessage(gpgContext, body) + if signature: + mail.writelines(buffer(signature)) + mail.seek(0) + + # Only log the email text (including all headers) if SAFE_LOGGING is + # disabled: + if not safelog.safe_logging: + logging.debug("Email contents:\n\n%s" % mail.read()) + mail.seek(0) + else: + logging.debug("Email text for %r created." % clientAddr) + + return clientAddr, mail + + class MailContext(object): """Helper object that holds information used by email subsystem.""" @@ -439,45 +480,9 @@ def addSMTPServer(cfg, dist, sched): lc.start(1800, now=False) return factory -def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, - gpgContext=None): - msg = message.Message() - msg.add_header("From", fromAddr) - msg.add_header("To", clientAddr) - msg.add_header("Message-ID", smtp.messageid()) - if not subject.startswith("Re:"): subject = "Re: %s"%subject - msg.add_header("Subject", subject) - if msgID: - msg.add_header("In-Reply-To", msgID) - msg.add_header("Date", smtp.rfc822date()) - msg.set_default_type("text/plain") - headers = [': '.join(m) for m in msg.items()] - mail = StringIO("\r\n".join(headers)) - mail.writelines(unicode(msg.as_string())) - - # gpg-clearsign messages - if gpgContext: - signature = StringIO() - plaintext = StringIO(body) - sigs = gpgContext.sign(plaintext, signature, gpgme.SIG_MODE_CLEAR) - if (len(sigs) != 1): - logging.warn('Failed to sign message!') - signature.seek(0) - [mail.write(l) for l in signature] - else: - mail.write(body) - # Only log the email text (including all headers) if SAFE_LOGGING is - # disabled: - if not safelog.safe_logging: - mail.seek(0) - logging.debug("Email contents:\n%s" % mail.read()) - else: - logging.debug("Email text for %r created." % clientAddr) - mail.seek(0) - return clientAddr, mail def getGPGContext(cfg): """Import a key from a file and initialise a context for GnuPG operations. @@ -520,8 +525,8 @@ def getGPGContext(cfg): ctx.signers = [ctx.get_key(fingerprint)] logging.info("Testing signature created with GnuPG key...") - message = StringIO('Test') - new_sigs = ctx.sign(message, StringIO(), gpgme.SIG_MODE_CLEAR) + message = io.StringIO('Test') + new_sigs = ctx.sign(message, io.StringIO(), gpgme.SIG_MODE_CLEAR) if not len(new_sigs) == 1: raise gpgme.GpgmeError( "Testing was unable to produce a signature with GnuPG key.") [View Less]

1 0

[bridgedb/develop] Add unittest for EmailServer.replyToMail().
by isis＠torproject.org 17 Apr '14

17 Apr '14

commit f9e2175750b998366492fbb197594b8eb226fbaa Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 8 21:28:34 2014 +0000 Add unittest for EmailServer.replyToMail(). --- lib/bridgedb/test/test_EmailServer.py | 42 ++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_EmailServer.py b/lib/bridgedb/test/test_EmailServer.py index 13f018c..f828be7 100644 --- a/lib/bridgedb/test/test_EmailServer.py +++ b/lib/… [View More]bridgedb/test/test_EmailServer.py @@ -26,7 +26,9 @@ from bridgedb.EmailServer import MailContext from bridgedb.Time import NoSchedule from bridgedb.persistent import Conf from bridgedb.test.util import fileCheckDecorator + from twisted.python import log +from twisted.internet import defer from twisted.trial import unittest @@ -130,7 +132,7 @@ class EmailGnuPGTest(unittest.TestCase): ctx = EmailServer.getGPGContext(self.config) self.assertTrue(ctx is None) -class EmailCompositionTests(unittest.TestCase): +class EmailResponseTests(unittest.TestCase): """Tests for :func:`bridgedb.EmailServer.getMailResponse`.""" def setUp(self): @@ -267,6 +269,44 @@ class EmailCompositionTests(unittest.TestCase): 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.""" + configuration = {} + TEST_CONFIG_FILE.seek(0) + compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') + exec compiled in configuration + self.config = Conf(**configuration) + + # 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.distributor = FakeDistributor('key', {}, {}, []) + self.ctx = MailContext(self.config, self.distributor, NoSchedule()) + + 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): configuration = {} [View Less]

1 0

[bridgedb/develop] Fix test_EmailServer unittests which expected StringIO.
by isis＠torproject.org 17 Apr '14

17 Apr '14

commit 711043a94221061754600addf0cd9707b3628590 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 16 20:23:27 2014 +0000 Fix test_EmailServer unittests which expected StringIO. --- lib/bridgedb/test/test_EmailServer.py | 44 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/lib/bridgedb/test/test_EmailServer.py b/lib/bridgedb/test/test_EmailServer.py index 8521762..3676642 100644 --- a/lib/bridgedb/test/test_EmailServer.… [View More]py +++ b/lib/bridgedb/test/test_EmailServer.py @@ -16,7 +16,7 @@ from __future__ import print_function import os import shutil -from io import StringIO +import io import copy from bridgedb import EmailServer @@ -32,7 +32,7 @@ from twisted.internet import defer from twisted.trial import unittest -TEST_CONFIG_FILE = StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO(unicode("""\ EMAIL_DIST = True EMAIL_GPG_SIGNING_ENABLED = True EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' @@ -52,6 +52,20 @@ 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 = FakeDistributor('key', {}, {}, []) + + ctx = MailContext(config, distributor, NoSchedule()) + return ctx + + class FakeDistributor(EmailBasedDistributor): def __init__(self, key, domainmap, domainrules, answerParameters=None, bridges=None): @@ -132,17 +146,12 @@ class EmailGnuPGTest(unittest.TestCase): 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.""" - configuration = {} - TEST_CONFIG_FILE.seek(0) - compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration - self.config = Conf(**configuration) - # TODO: Add headers if we start validating them self.lines = ["From: %s(a)%s.com", "To: bridges(a)example.net", @@ -150,7 +159,7 @@ class EmailResponseTests(unittest.TestCase): "\n", "get bridges"] self.distributor = FakeDistributor('key', {}, {}, []) - self.ctx = MailContext(self.config, self.distributor, NoSchedule()) + self.ctx = _createMailContext(self.distributor) def test_getMailResponse_noFrom(self): """A received email without a "From:" or "Sender:" header shouldn't @@ -221,7 +230,7 @@ class EmailResponseTests(unittest.TestCase): self.assertIsInstance(ret, tuple) self.assertEqual(len(ret), 2) self.assertEqual(ret[0], "testing(a)example.com") - self.assertIsInstance(ret[1], StringIO) + self.assertIsInstance(ret[1], io.BytesIO) mail = ret[1].getvalue() self.assertNotEqual(mail.find("no bridges currently"), -1) @@ -234,7 +243,7 @@ class EmailResponseTests(unittest.TestCase): self.assertIsInstance(ret, tuple) self.assertEqual(len(ret), 2) self.assertEqual(ret[0], "testing(a)example.com") - self.assertIsInstance(ret[1], StringIO) + self.assertIsInstance(ret[1], io.BytesIO) mail = ret[1].getvalue() self.assertNotEqual(mail.find("no bridges currently"), -1) @@ -249,7 +258,7 @@ class EmailResponseTests(unittest.TestCase): self.assertIsInstance(ret, tuple) self.assertEqual(len(ret), 2) self.assertEqual(ret[0], "testing(a)example.com") - self.assertIsInstance(ret[1], StringIO) + self.assertIsInstance(ret[1], io.BytesIO) mail = ret[1].getvalue() self.assertNotEqual(mail.find("no bridges currently"), -1) @@ -265,7 +274,7 @@ class EmailResponseTests(unittest.TestCase): self.assertIsInstance(ret, tuple) self.assertEqual(len(ret), 2) self.assertEqual(ret[0], "testing(a)example.com") - self.assertIsInstance(ret[1], StringIO) + self.assertIsInstance(ret[1], io.BytesIO) mail = ret[1].getvalue() self.assertNotEqual(mail.find("no bridges currently"), -1) @@ -275,12 +284,6 @@ class EmailReplyTests(unittest.TestCase): def setUp(self): """Create fake email, distributor, and associated context data.""" - configuration = {} - TEST_CONFIG_FILE.seek(0) - compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration - self.config = Conf(**configuration) - # TODO: Add headers if we start validating them self.lines = ["From: %s(a)%s.com", "To: bridges(a)example.net", @@ -288,7 +291,7 @@ class EmailReplyTests(unittest.TestCase): "\n", "get bridges"] self.distributor = FakeDistributor('key', {}, {}, []) - self.ctx = MailContext(self.config, self.distributor, NoSchedule()) + self.ctx = _createMailContext(self.distributor) def test_replyToMail(self): self.skip = True @@ -307,6 +310,7 @@ class EmailReplyTests(unittest.TestCase): reply.addCallback(callback) return reply + class EmailServerServiceTests(unittest.TestCase): def setUp(self): configuration = {} [View Less]

1 0

[bridgedb/develop] Implement correct EmailServer.MailDelivery.receivedHeader() parsing.
by isis＠torproject.org 17 Apr '14

17 Apr '14

commit 714c16a8f0875c23af1cb044cc46a76e5356ac6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 16 22:29:23 2014 +0000 Implement correct EmailServer.MailDelivery.receivedHeader() parsing. --- lib/bridgedb/EmailServer.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 5d998f4..efa7514 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -432,… [View More]

1 0