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

[bridgedb/master] Merge branch 'fix/11215-captcha-timeouts' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit 77293a3cca19b1fbe9d58cc1596f54cd0bd140a4 Merge: 5ccdda5 3c342d7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 23:16:40 2014 +0000 Merge branch 'fix/11215-captcha-timeouts' into develop doc/sphinx/source/bridgedb.rst | 1 + doc/sphinx/source/bridgedb.schedule.rst | 10 ++ doc/sphinx/source/conf.py | 1 + lib/bridgedb/HTTPServer.py | 18 ++- lib/bridgedb/Main.py | 10 +- lib/bridgedb/Tests.py | 4 +- lib/bridgedb/Time.py | 132 --------------- lib/bridgedb/captcha.py | 79 ++++++--- lib/bridgedb/email/server.py | 4 +- lib/bridgedb/schedule.py | 267 +++++++++++++++++++++++++++++++ lib/bridgedb/test/test_HTTPServer.py | 4 +- lib/bridgedb/test/test_captcha.py | 12 +- lib/bridgedb/test/test_email_server.py | 6 +- lib/bridgedb/test/test_schedule.py | 201 +++++++++++++++++++++++ 14 files changed, 572 insertions(+), 177 deletions(-)

1 0

[bridgedb/master] Fix typo in IBridgeRequest.addressClass specification.
by isis＠torproject.org 16 May '14

16 May '14

commit a92433d9634a17321acf9a35f65200feaa0124cc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 23:19:00 2014 +0000 Fix typo in IBridgeRequest.addressClass specification. * THANKS to sysrqb for pointing it out! (on the #5463 thread) --- lib/bridgedb/bridgerequest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index 4f32f67..0d7fb5a 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -26,7 +26,7 @@ class IBridgeRequest(Interface): """Interface specification of client options for requested bridges.""" addressClass = Attribute( - "The IP version of bridges addresses to distribute to the client.") + "The IP version of bridge addresses to distribute to the client.") filters = Attribute( "A list of callables used to filter bridges from a hashring.") transports = Attribute(

1 0

[bridgedb/master] Update bridgedb.pot translations template file.
by isis＠torproject.org 16 May '14

16 May '14

commit 5557f6c7d4ca29e3120da44c771d9d5aa0af5b57 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 16 18:42:35 2014 +0000 Update bridgedb.pot translations template file. --- lib/bridgedb/i18n/templates/bridgedb.pot | 93 ++++++++++++++++++------------ 1 file changed, 56 insertions(+), 37 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index ea228b4..e3738bd 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -6,11 +6,11 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.1.6-235-g5652c17\n" +"Project-Id-Version: bridgedb 0.1.6-278-gfe45b79\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" +"POT-Creation-Date: 2014-05-16 18:39+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" @@ -33,7 +33,7 @@ msgstr "" #. "Tor" #. "Tor Browser" #. "TBB" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:124 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -61,12 +61,35 @@ msgstr "" msgid "Welcome to BridgeDB!" msgstr "" -#. TRANLATORS: Please DO NOT tranlate the words "transport" or "TYPE". +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:29 -msgid "Currently supported tranport TYPEs:" +msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:33 +#: lib/bridgedb/strings.py:30 +#, python-format +msgid "Hey, %s!" +msgstr "" + +#: lib/bridgedb/strings.py:31 +msgid "Hello, friend!" +msgstr "" + +#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "" + +#. 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." +#: lib/bridgedb/strings.py:36 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "" + +#: lib/bridgedb/strings.py:42 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -77,14 +100,14 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:39 +#: lib/bridgedb/strings.py:48 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 +#: lib/bridgedb/strings.py:52 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any" @@ -95,20 +118,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:56 +#: lib/bridgedb/strings.py:65 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:57 +#: lib/bridgedb/strings.py:66 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:62 +#: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:63 +#: lib/bridgedb/strings.py:72 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you " @@ -117,77 +140,77 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:70 +#: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:80 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:81 msgid "" "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 +#: lib/bridgedb/strings.py:88 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:80 +#: lib/bridgedb/strings.py:89 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:84 +#: lib/bridgedb/strings.py:93 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:85 +#: lib/bridgedb/strings.py:94 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:86 +#: lib/bridgedb/strings.py:95 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:90 +#: lib/bridgedb/strings.py:99 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:91 +#: lib/bridgedb/strings.py:100 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:104 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:96 +#: lib/bridgedb/strings.py:105 #, python-format msgid "" "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/strings.py:99 +#: lib/bridgedb/strings.py:108 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:102 +#: lib/bridgedb/strings.py:111 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:105 +#: lib/bridgedb/strings.py:114 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" @@ -196,24 +219,24 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:113 +#: lib/bridgedb/strings.py:122 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:114 +#: lib/bridgedb/strings.py:123 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:115 +#: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges." msgstr "" -#. TRANLATORS: Please DO NOT tranlate the word the word "TYPE". -#: lib/bridgedb/strings.py:117 +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:126 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:118 +#: lib/bridgedb/strings.py:127 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -233,10 +256,6 @@ msgstr "" msgid "Contact" msgstr "" -#: lib/bridgedb/templates/base.html:100 -msgid "Public Keys" -msgstr "" - #: lib/bridgedb/templates/bridges.html:65 msgid "Uh oh, spaghettios!" msgstr ""

1 0

[bridgedb/master] Add file header and docstring to bridgedb.email.request module.
by isis＠torproject.org 16 May '14

16 May '14

commit 0becfd4423fb03b8580c4e8f098f348a879f5cfb Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 23:23:30 2014 +0000 Add file header and docstring to bridgedb.email.request module. * THANKS again to sysrqb for the catch! --- lib/bridgedb/email/request.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/bridgedb/email/request.py b/lib/bridgedb/email/request.py index 92e3c38..a6326fe 100644 --- a/lib/bridgedb/email/request.py +++ b/lib/bridgedb/email/request.py @@ -1,4 +1,20 @@ # -*- coding: utf-8; test-case-name: bridgedb.test.test_email_request; -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Nick Mathewson <nickm(a)torproject.org> +# Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 +# Matthew Finkel <sysrqb(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2013-2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Classes for parsing and storing information about requests for bridges +which are sent to the email distributor. +""" from __future__ import print_function from __future__ import unicode_literals

1 0

[bridgedb/master] Document instance variables for the email.server.MailMessage class.
by isis＠torproject.org 16 May '14

16 May '14

commit 8e2b3bd5259e261ddc8670586ac242bfbe9f097b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 15 00:09:41 2014 +0000 Document instance variables for the email.server.MailMessage class. * FIXES the `list` ivar accidentally being documented in the __init__() method as a parameter. * THANKS to sysrqb for pointing out the mistake. --- lib/bridgedb/email/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index e963e61..f550052 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -457,13 +457,18 @@ class MailResponse(object): class MailMessage(object): - """Plugs into the Twisted Mail and receives an incoming message.""" + """Plugs into the Twisted Mail and receives an incoming message. + + :ivar list lines: A list of lines from an incoming email message. + :ivar int nBytes: The number of bytes received thus far. + :ivar bool ignoring: If ``True``, we're ignoring the rest of this message + because it exceeded :ivar:`MailContext.maximumSize`. + """ implements(smtp.IMessage) def __init__(self, context, fromCanonical=None): """Create a new MailMessage from a MailContext. - :param list lines: A list of lines from an incoming email message. :type context: :class:`MailContext` :param context: The configured context for the email server. :type canonicalFrom: str or None

1 0

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

16 May '14

commit b0f56a699e5a65448f0c9a9bb35ce355faa0cbeb Merge: fe45b79 5557f6c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 16 18:43:43 2014 +0000 Merge branch 'translations/2014-05-16-update' into develop lib/bridgedb/i18n/templates/bridgedb.pot | 93 ++++++++++++++++++------------ 1 file changed, 56 insertions(+), 37 deletions(-)

1 0

[bridgedb/master] Merge branch 'release-0.2.1'
by isis＠torproject.org 16 May '14

16 May '14

1 0

[bridgedb/master] Add CHANGELOG entries for bridgedb-0.2.1.
by isis＠torproject.org 16 May '14

16 May '14

commit fe45b79d296a4de14d472c873c83b62783a3fc0c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 16 18:37:31 2014 +0000 Add CHANGELOG entries for bridgedb-0.2.1. --- CHANGELOG | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 95 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 23ddd1e..76fe023 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,102 @@ -Changes in version 0.2.1 - - * +Changes in version 0.2.1 - 2014-05-16 + * FIXES #5463 https://trac.torproject.org/projects/tor/ticket/5463 + Emails sent from BridgeDB's email distributor should now be signed. + - BridgeDB's emails will be signed with its online GnuPG keypair. The + public key has the following fingerprint: + DF81 1109 E17C 8BF1 34B5 EEB6 8DC4 3A28 4882 1E32 + The online keypair rotates (a new one is placed on the server once + per year), and it will ALWAYS be signed with BridgeDB's offline + keypair. + - The online keypair above contains two subkeys. The signing subkey + has the fingerprint: + 9FE3 9D1A 7438 9223 3B3F 66F2 21B5 54E9 5938 F4D0 + - BridgeDB's offline keypair has the following fingerprint: + 7B78 4370 15E6 3DF4 7BB1 270A CBD9 7AA2 4E8E 472E + All of BridgeDB's keys may be found on the public keyservers, as + well as at https://bridges.torproject.org/keys + + * FIXES #7547 https://trac.torproject.org/projects/tor/ticket/7547 + BridgeDB's email distributor will now send you a message + explaining how to use it, including valid commands and the list of + Pluggable Transport TYPES currently supported. To receive help + with the email distributor, simply send an email to + mailto:bridges@torproject.org. + - Any emails which do not contain a valid command will receive + the help text in response. + - Otherwise, to specifically request the help text, just say + "get help" + in the body of your email. + + * FIXES #7550 https://trac.torproject.org/projects/tor/ticket/7550 + BridgeDB's email responder is now interactive, as described in the + above entry for ticket #7547. + + * FIXES #8241 https://trac.torproject.org/projects/tor/ticket/8241 + BridgeDB's HTTP distributor won't tell you how to get obfs3 + bridges through email, although a blank email, or an email + containing "get help" will. + + * CLOSES #9678 https://trac.torproject.org/projects/tor/ticket/9678 + A "Select Language" button was requested for the HTTP distributor + on https://bridges.torproject.org. Instead, translated pages are + distributed automatically (via detecting the "Accept-Language" + header which can be set in the Settings panel of all modern + browers). + - To request a specific translation, the "lang=LOCALE" argument + can be added to the URL of any page. For example: + https://bridges.torproject.org/options?lang=ar + will provide the bridge options selection page in Arabic. + + * FIXES #11215 https://trac.torproject.org/projects/tor/ticket/11215 + BridgeDB's usage of gimp-captcha, which creates a local cache of + CAPTCHA for use on the HTTP distributor, now supports timeouts. If + a CAPTCHA is not solved within 30 minutes of being served to a + client, the solution is invalid regardless of its correctness. + + * FIXES #11475 https://trac.torproject.org/projects/tor/ticket/11475 + BridgeDB's email responder, up until this point, explained how to + use bridges with Vidalia. It now uses the same help text as found + at https://bridges.torproject.org/howto which explains how to + enter bridges into TorLauncher (used by Tor Browser and Tails). + + * FIXES #11522 https://trac.torproject.org/projects/tor/ticket/11522 + There were several errors and bugs in BridgeDB's email + distributor. The entire system of server supporting BridgeDB's + email distribution system was rewritten. + + * FIXES #11664 https://trac.torproject.org/projects/tor/ticket/11664 + Due to changes in the Python language builtin `buffer` in Python3, + which were backported to Python 2.7.6, but neither backported to + Python 2.6.x nor to Python <= 2.7.5, BridgeDB's use of + `io.StringIO` and `io.BytesIO` combined with buffers had to be + revised to support both the new and old Python `buffer` APIs. + + * FIXES #11753 https://trac.torproject.org/projects/tor/ticket/11753 + BridgeDB's emails should now be translated. + - The translations system for BridgeDB, as well as the template + system for emails, was completely rewritten. By default, email + responses are in English. To receive an alternate translation, + send an email to bridges+LOCALE(a)torproject.org, where "LOCALE" is + a locale specifier. + - For example, to receive BridgeDB emails translated into + Chinese, use mailto:bridges+zh_CN@torproject.org. + - Or for Farsi translations, use mailto:bridges+fa@torproject.org. + - For the full list of currently supported LOCALE codes, see + https://gitweb.torproject.org/user/isis/bridgedb.git/tree/HEAD:/lib/bridged… And includes the following general changes: - * UPDATE Italian (it) gettext file. - Thanks to Francesca Ciceri. + * UPDATES the Italian (it) gettext file. + Thanks to Francesca Ciceri. * ADD Welsh (cy) translations. - Thanks to huwwaters and littlegreykida. + Thanks to huwwaters and littlegreykida. * ADD Slovak (sk) translations. - Thanks to Michelozzo and Svistwarrior273. + Thanks to Michelozzo and Svistwarrior273. + * UPDATES the bridgedb.pot translation template file. All the new + strings in the email and HTTP user interfaces will now need + translation! To help out with translations, please see: + https://www.transifex.com/projects/p/torproject/resource/2-bridgedb-bridged… + * FIXES several typos in the BridgeDB's code documentation. + * ADDS code documentation for several previously undocumented modules. Changes in version 0.2.0 - 2014-04-19 * FIXES #5232 Perform long running and blocking transactions in

1 0

[bridgedb/master] Add unittests for bridgedb.parse.addr.extractEmail().
by isis＠torproject.org 16 May '14

16 May '14

commit 8e737da3be712e7e9151194a381a108035d50a6c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 06:55:30 2014 +0000 Add unittests for bridgedb.parse.addr.extractEmail(). --- lib/bridgedb/test/test_parse_addr.py | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/lib/bridgedb/test/test_parse_addr.py b/lib/bridgedb/test/test_parse_addr.py index 6b22232..1e6af83 100644 --- a/lib/bridgedb/test/test_parse_addr.py +++ b/lib/bridgedb/test/test_parse_addr.py @@ -79,6 +79,49 @@ class CanonicalizeEmailDomainTests(unittest.TestCase): self.assertEquals(canonical, 'example.com') +class ExtractEmailAddressTests(unittest.TestCase): + """Unittests for :func:`bridgedb.parse.addr.extractEmailAddress`.""" + + def test_23(self): + """The email address int(23) should raise a BadEmail error.""" + self.assertRaises(addr.BadEmail, + addr.extractEmailAddress, + int(23)) + + def test_lessThanChars(self): + """The email address 'Alice <alice(a)riseup.net>' should return + ('alice', 'riseup.net'). + """ + local, domain = addr.extractEmailAddress('Alice <alice(a)riseup.net>') + self.assertEqual(local, 'alice') + self.assertEqual(domain, 'riseup.net') + + def test_extraLessThanChars(self): + """The email address 'Mallory <mal<lory(a)riseup.net>' should return + ('lory', 'riseup.net') + """ + local, domain = addr.extractEmailAddress('Mallory <mal<lory(a)riseup.net>') + self.assertEqual(local, 'lory') + self.assertEqual(domain, 'riseup.net') + + def test_extraLessAndGreaterThanChars(self): + """The email address 'Mallory <mal><>>lory(a)riseup.net>' should raise a + BadEmail error. + """ + self.assertRaises(addr.BadEmail, + addr.extractEmailAddress, + 'Mallory <mal><>>lory(a)riseup.net>') + + def test_extraAppendedEmailAddress(self): + """The email address 'Mallory <mallory(a)riseup.net><mallory(a)gmail.com>' + should use the last address. + """ + local, domain = addr.extractEmailAddress( + 'Mallory <mallory(a)riseup.net><mallory(a)gmail.com>') + self.assertEqual(local, 'mallory') + self.assertEqual(domain, 'gmail.com') + + class ParseAddrIsIPAddressTests(unittest.TestCase): """Unittests for :func:`bridgedb.parse.addr.isIPAddress`.

1 0

[bridgedb/master] Remove unused function Bridges.chopString().
by isis＠torproject.org 16 May '14

16 May '14

commit 52a7e1830e6ee05f411e0e84ae8569e35afe5556 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 07:44:43 2014 +0000 Remove unused function Bridges.chopString(). --- lib/bridgedb/Bridges.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 3ed1eff..fce9943 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -89,12 +89,6 @@ def is_valid_fingerprint(fp): toHex = binascii.b2a_hex fromHex = binascii.a2b_hex -def chopString(s, size): - """Generator. Given a string and a length, divide the string into pieces - of no more than that length. - """ - for pos in xrange(0, len(s), size): - yield s[pos:pos+size] class Bridge(object): """Holds information for a single bridge

1 0