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

[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

[bridgedb/master] Make the embedded list of supported languages be sorted.
by isis＠torproject.org 16 May '14

16 May '14

commit f8f3d1458b509599c0fb733900850ee81f25eb5e Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 19:03:16 2014 +0000 Make the embedded list of supported languages be sorted. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index e21dbef..030a0e4 100644 --- a/setup.py +++ b/setup.py @@ -156,6 +156,7 @@ def get_supported_langs(): lang_dirs.append(os.path.join(install_i18n, lang)) lang_files.append(os.path.join(repo_i18n, lang, 'LC_MESSAGES', 'bridgedb.mo')) + supported.sort() # Write our list of supported languages to 'lib/bridgedb/_langs.py': new_langs_lines = []

1 0

[bridgedb/master] Add Makefile directive to create the bridgedb.pot template.
by isis＠torproject.org 16 May '14

16 May '14

commit c656903a67b19d5d496b393b86d748ddfeb99efd Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 21:13:15 2014 +0000 Add Makefile directive to create the bridgedb.pot template. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 9b2bd5e..0184291 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,9 @@ reinstall: uninstall force-install translations: ./maint/get-completed-translations +translations-template: + python setup.py extract_messages + docs: python setup.py build_sphinx

1 0

[bridgedb/master] Update bridgedb.pot file with new UI strings.
by isis＠torproject.org 16 May '14

16 May '14

commit 2c9f70079e9baeaa4a18bd058c1f78ed6d002df3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 2 16:46:44 2014 +0000 Update bridgedb.pot file with new UI strings. --- lib/bridgedb/i18n/templates/bridgedb.pot | 344 ++++++++++++++++++++++++------ 1 file changed, 282 insertions(+), 62 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index 332b508..ea228b4 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -1,100 +1,320 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. -# -# Translators: -# runasand <runa.sandvik(a)gmail.com>, 2011 +# Isis Lovecruft <isis(a)torproject.org>, 2014. +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"Project-Id-Version: bridgedb 0.1.6-235-g5652c17\n" +"Report-Msgid-Bugs-To: " +"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" +"=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" +"POT-Creation-Date: 2014-05-07 17:18+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -"Language: en\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 -msgid "What are bridges?" -msgstr "What are bridges?" +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "bridge" +#. "bridges" +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fte" +#. "Tor" +#. "Tor Browser" +#. "TBB" +#: lib/bridgedb/HTTPServer.py:122 +msgid "Sorry! Something went wrong with your request." +msgstr "" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "" + +#: lib/bridgedb/strings.py:22 #, python-format msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridge relays %s are Tor relays that help you circumvent censorship." +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be " +"ignored." +msgstr "" -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:25 +msgid "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "" + +#: lib/bridgedb/strings.py:27 +msgid "Welcome to BridgeDB!" +msgstr "" + +#. TRANLATORS: Please DO NOT tranlate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:29 +msgid "Currently supported tranport TYPEs:" +msgstr "" + +#: lib/bridgedb/strings.py:33 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are" +"\n" +"using Tor.\n" +"\n" +msgstr "" + +#: lib/bridgedb/strings.py:39 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "" + +#: lib/bridgedb/strings.py:43 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any" +"\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still" +"\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "" + +#: lib/bridgedb/strings.py:56 +msgid "What are bridges?" +msgstr "" + +#: lib/bridgedb/strings.py:57 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "" + +#: lib/bridgedb/strings.py:62 msgid "I need an alternative way of getting bridges!" -msgstr "I need an alternative way of getting bridges!" +msgstr "" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:63 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Another way to find public bridge addresses is to send an email (from a %s or a %s address) to %s with the line 'get bridges' by itself in the body of the mail." +"Another way to get bridges is to send an email to %s. Please note that you " +"must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "" -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:70 msgid "My bridges don't work! I need help!" -msgstr "My bridges don't work! I need help!" +msgstr "" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:71 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "" + +#: lib/bridgedb/strings.py:72 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "If your Tor doesn't work, you should email %s. Try including as much info about your case as you can, including the list of bridges you used, the bundle filename/version you used, the messages that Tor gave out, etc." +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "" + +#: lib/bridgedb/strings.py:79 +msgid "Here are your bridge lines:" +msgstr "" + +#: lib/bridgedb/strings.py:80 +msgid "Get Bridges!" +msgstr "" + +#: lib/bridgedb/strings.py:84 +msgid "Please select options for bridge type:" +msgstr "" + +#: lib/bridgedb/strings.py:85 +msgid "Do you need IPv6 addresses?" +msgstr "" + +#: lib/bridgedb/strings.py:86 +#, python-format +msgid "Do you need a %s?" +msgstr "" + +#: lib/bridgedb/strings.py:90 +msgid "Your browser is not displaying images properly." +msgstr "" + +#: lib/bridgedb/strings.py:91 +msgid "Enter the characters from the image above..." +msgstr "" + +#: lib/bridgedb/strings.py:95 +msgid "How to start using your bridges" +msgstr "" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:96 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "To use the above lines, go to Vidalia's Network settings page, and click \"My ISP blocks connections to the Tor network\". Then add each bridge address one at a time." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "No bridges currently available" +#: lib/bridgedb/strings.py:99 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " +"follow\n" +"the wizard until it asks:" +msgstr "" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Upgrade your browser to Firefox" +#: lib/bridgedb/strings.py:102 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor " +"connections\n" +"to the Tor network?" +msgstr "" + +#: lib/bridgedb/strings.py:105 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and" +"\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "" + +#: lib/bridgedb/strings.py:113 +msgid "Displays this message." +msgstr "" + +#: lib/bridgedb/strings.py:114 +msgid "Request vanilla bridges." +msgstr "" + +#: lib/bridgedb/strings.py:115 +msgid "Request IPv6 bridges." +msgstr "" + +#. TRANLATORS: Please DO NOT tranlate the word the word "TYPE". +#: lib/bridgedb/strings.py:117 +msgid "Request a Pluggable Transport by TYPE." +msgstr "" + +#: lib/bridgedb/strings.py:118 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "" + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "" + +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Type the two words" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "" + +#: lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "" + +#: lib/bridgedb/templates/bridges.html:65 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: lib/bridgedb/templates/bridges.html:70 +msgid "There currently aren't any bridges available..." +msgstr "" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Step 1" +#: lib/bridgedb/templates/bridges.html:71 +#, python-format +msgid " Perhaps you should try %s going back %s and choosing a different bridge type!" +msgstr "" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/index.html:11 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Get %s Tor Browser Bundle %s" +msgid "Step %s1%s" +msgstr "" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Step 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Get %s bridges %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#. TRANSLATORS: Please do NOT translate the word "bridges"! +#: lib/bridgedb/templates/options.html:39 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: lib/bridgedb/templates/options.html:53 +msgid "Advanced Options" +msgstr "" + +#: lib/bridgedb/templates/options.html:89 +msgid "No" +msgstr "" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Step 3" +#: lib/bridgedb/templates/options.html:90 +msgid "none" +msgstr "" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:131 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Now %s add the bridges to Tor %s" +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:155 +#, python-format +msgid "%sG%set Bridges" +msgstr "" +

1 0

[bridgedb/master] Add unittest for hotfix/11522 in commit fafbdc77a.
by isis＠torproject.org 16 May '14

16 May '14

commit 4b1450a3a11ac2ddda582e1684317230681d1fcf Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 03:14:20 2014 +0000 Add unittest for hotfix/11522 in commit fafbdc77a. --- lib/bridgedb/test/test_crypto.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index 238002d..983b09d 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -14,6 +14,8 @@ from __future__ import print_function from __future__ import unicode_literals +import gpgme +import io import logging import os import shutil @@ -83,6 +85,27 @@ class GetKeyTests(unittest.TestCase): % (key.encode('hex'), SEKRIT_KEY.encode('hex'))) +class LessCrypticGPGMEErrorTests(unittest.TestCase): + """Unittests for :class:`bridgedb.crypto.LessCrypticGPGMEError`.""" + + def test_error1(self): + """libgpgme will raise an error when given an io.StringIO for the + message or sigfile. + """ + message = io.StringIO(unicode(self.id())) + sigfile = io.StringIO() + + lessCryptic = None + ctx = gpgme.Context() + + try: + ctx.sign(message, sigfile) + except gpgme.GpgmeError as error: + lessCryptic = crypto.LessCrypticGPGMEError(error) + + self.assertTrue('Invalid argument' in lessCryptic.message) + + class SSLVerifyingContextFactoryTests(unittest.TestCase, txtagent.FakeReactorAndConnectMixin): """Tests for :class:`bridgedb.crypto.SSLVerifyingContextFactory`."""

1 0

[bridgedb/master] Fix skipped unittest test_crypto.test_getGPGContext_good_keyfile().
by isis＠torproject.org 16 May '14

16 May '14

commit d9e550bcd04523aa14dc40789fc51015632e7627 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 03:15:56 2014 +0000 Fix skipped unittest test_crypto.test_getGPGContext_good_keyfile(). --- lib/bridgedb/test/test_crypto.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index 983b09d..f828ef0 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -211,7 +211,7 @@ class GetGPGContextTest(unittest.TestCase): here = os.getcwd() topDir = here.rstrip('_trial_temp') self.runDir = os.path.join(here, 'rundir') - self.gpgMoved = os.path.join(self.runDir, 'TESTING.subkeys.sec') + self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') @@ -234,9 +234,7 @@ class GetGPGContextTest(unittest.TestCase): def test_getGPGContext_good_keyfile(self): """Test EmailServer.getGPGContext() with a good key filename.""" - self.skip = True - raise unittest.SkipTest("see ticket #5264") - + self.setKey(self.gpgMoved) ctx = crypto.getGPGContext(self.config) self.assertIsInstance(ctx, crypto.gpgme.Context)

1 0

[bridgedb/master] Fix 'invalid secret key' libgpgme error for testing keys.
by isis＠torproject.org 16 May '14

16 May '14

commit f0439f635f24fb4d3a0efe6e548134cd23b82052 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 03:01:25 2014 +0000 Fix 'invalid secret key' libgpgme error for testing keys. We can't use expired keypairs, and the old testing keypair had it's master secret key destroyed, so I created a new testing keypair. * CHANGE gnupghome/TESTING.subkeys.sec to a non-expired keypair: pub 4096R/3F148C21 2014-04-23 uid TESTING (INSECURE!) <bridges(a)torproject.org> sub 4096R/C9CB1DCD 2014-04-23 sub 4096R/79DEF4D1 2014-04-23 sec# 4096R/3F148C21 2014-04-23 uid TESTING (INSECURE!) <bridges(a)torproject.org> ssb 4096R/C9CB1DCD 2014-04-23 ssb 4096R/79DEF4D1 2014-04-23 --- gnupghome/TESTING.subkeys.sec | Bin 6505 -> 7304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnupghome/TESTING.subkeys.sec b/gnupghome/TESTING.subkeys.sec index ae13a98..3adba09 100644 Binary files a/gnupghome/TESTING.subkeys.sec and b/gnupghome/TESTING.subkeys.sec differ

1 0

[bridgedb/master] Add GPGContextTests to test/test_crypto.py.
by isis＠torproject.org 16 May '14

16 May '14

commit b1a8aff620f1404b81e49ad5689cf77bbd063457 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 04:11:06 2014 +0000 Add GPGContextTests to test/test_crypto.py. * ADD two new unittests: one for missing config settings pertaining to email signing, the other for when signing is disabled. --- lib/bridgedb/test/test_crypto.py | 80 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index 935a784..e610d03 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -136,6 +136,86 @@ class LessCrypticGPGMEErrorTests(unittest.TestCase): self.assertSubstring(msg, lessCryptic.message) +class GPGContextTests(unittest.TestCase): + """Tests for :func:`bridgedb.crypto.getGPGContext`.""" + + timeout = 15 + + @fileCheckDecorator + def doCopyFile(self, src, dst, description=None): + shutil.copy(src, dst) + + def removeRundir(self): + """Remove the rundir from the _trial_tmp directory.""" + if os.path.isdir(self.runDir): + shutil.rmtree(self.runDir) + + def makeBadKey(self): + """Make a bad keyfile and set its path in our config.""" + keyfile = os.path.join(self.runDir, 'badkey.asc') + with open(keyfile, 'w') as badkey: + badkey.write(str('NO PASARAN, DEATH CAKES!')) + badkey.flush() + self.setKey(keyfile) + + def enableSigning(self, enable=True): + """Enable or disable the config setting for email signing.""" + setattr(self.config, 'EMAIL_GPG_SIGNING_ENABLED', enable) + + def setKey(self, keyfile=''): + """Set the config keyfile path to **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) + + self.config = Conf() + self.enableSigning() + self.addCleanup(self.enableSigning) + self.addCleanup(self.removeRundir) + + def test_getGPGContext_good_keyfile(self): + """Test EmailServer.getGPGContext() with a good key filename.""" + self.setKey(self.gpgFile) + ctx = crypto.getGPGContext(self.config) + self.assertIsInstance(ctx, gpgme.Context) + + def test_getGPGContext_missing_keyfile(self): + """Test EmailServer.getGPGContext() with a missing key filename.""" + self.setKey('missing-keyfile.asc') + ctx = crypto.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 = 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) + self.enableSigning(False) + ctx = crypto.getGPGContext(self.config) + self.assertIsNone(ctx) + + def test_getGPGContext_config_signing_missing(self): + """getGPGContext() with a missing/unset 'EMAIL_GPG_SIGNING_ENABLED' + config line should return None. + """ + self.setKey(self.gpgFile) + delattr(self.config, 'EMAIL_GPG_SIGNING_ENABLED') + ctx = crypto.getGPGContext(self.config) + self.assertIsNone(ctx) + + class SSLVerifyingContextFactoryTests(unittest.TestCase, txtagent.FakeReactorAndConnectMixin): """Tests for :class:`bridgedb.crypto.SSLVerifyingContextFactory`."""

1 0

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

16 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/master] Add additional unittests for crypto.LessCrypticGPGMEError.
by isis＠torproject.org 16 May '14

16 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