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

[bridgedb/master] Add unittests for HTTPServer.WebResourceOptions.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 27280d9fc6aa527eb7a80708df1b25195840567a Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 26 05:10:26 2014 +0000 Add unittests for HTTPServer.WebResourceOptions. --- lib/bridgedb/test/test_HTTPServer.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 872be3c..c7308a3 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -641,3 +641,29 @@ class WebResourceBridgesTests(unittest.TestCase): self.assertIsInstance(int(port), int) self.assertGreater(int(port), 0) self.assertLessEqual(int(port), 65535) + + +class WebResourceOptionsTests(unittest.TestCase): + """Tests for :class:`bridgedb.HTTPServer.WebResourceOptions`.""" + + def setUp(self): + """Create a :class:`HTTPServer.WebResourceOptions`.""" + # Set up our resources to fake a minimal HTTP(S) server: + self.pagename = b'options.html' + self.root = Resource() + self.optionsResource = HTTPServer.WebResourceOptions() + self.root.putChild(self.pagename, self.optionsResource) + + def test_render_GET_RTLlang(self): + """Test rendering a request for obfs3 bridges in Arabic.""" + request = DummyRequest(["bridges?transport=obfs3"]) + request.method = b'GET' + request.getClientIP = lambda: '3.3.3.3' + request.headers.update({'accept-language': 'he'}) + # We actually have to set the request args manually when using a + # DummyRequest: + request.args.update({'transport': 'obfs2'}) + + page = self.optionsResource.render(request) + self.assertSubstring("direction: rtl", page) + self.assertSubstring("מהם גשרים?", page)

1 0

[bridgedb/master] Update CHANGELOG with additional changes for 0.1.6.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 24dc8dc82033cbd8ee14d1c06db1e2a3fbcfdbd6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 26 05:42:51 2014 +0000 Update CHANGELOG with additional changes for 0.1.6. --- CHANGELOG | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index bf895ad..092ce8c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,15 @@ -Changes in version 0.1.6 - 2014-03-17 +Changes in version 0.1.6 - 2014-03-26 BridgeDB 0.1.6 includes fixes for the following bugs: + * FIXES #11196 BridgeDB should use leekspin * FIXES #11218 ReCaptchaProtectedResource.checkSolution() doesn't expect a deferred * FIXES #11219 BridgeDB's twisted version doesn´t have a `t.w.client.HTTPConnectionPool` class + * FIXES #11231 BridgeDB's txrecaptcha returns the "No bridges + available!" page if 'captcha_response_field' is blank +And includes the following general changes: + * ADDS several new translations languages. Changes in version 0.1.5 - 2014-02-27 BridgeDB 0.1.5 includes fixes for the following bugs:

1 0

[bridgedb/master] Update translations.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 43b069d31f32e2596bc4ce014f8b8fb214714059 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 26 05:27:58 2014 +0000 Update translations. --- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++ lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 104 +++++++++++++++++++++++ lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 101 ++++++++++++++++++++++ lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++ lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 104 +++++++++++++++++++++++ lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 ++++++++++++++++++++++ lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++ lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 ++++++++++++++++++++++ lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++ lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++ lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 100 ++++++++++++++++++++++ 12 files changed, 1122 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..ee74f59 --- /dev/null +++ b/lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# Illenc <provisionalib(a)hotmail.com>, 2013 +# Toni Hermoso Pulido <toniher(a)softcatala.cat>, 2012 +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-10-27 08:40+0000\n" +"Last-Translator: Illenc <provisionalib(a)hotmail.com>\n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Què són els ponts?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s mecanismes Pont %s són mecanismes Tor per esquivar la censura." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Necessit una manera alternativa d'obtenir ponts" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Una altra manera de trobar adreces de ponts públics és enviant un correu (de %s o %s address) a %s amb el text 'get bridges' al cos del correu." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "No em funcionen els ponts! Ajuda!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Si no us funciona Tor, envieu un correu %s. Hi heu d'incloure el màxim d'informació sobre el vostre cas: amb la llista de ponts que teniu, la versió, el missatge que Tor us dóna, etc." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Per a usar l'anterior línia, aneu a la configuració de Xarxa Vidalia, clicau a \"El meu proveïdor bloca les connexions Tor\" Després afegiu les adreces de pont una per una." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "No hi ha ponts disponibles" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Actualitza el navegador a Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Escriviu les dues paraules" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Passa 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Descarrega %s el navegador Tor Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Passa 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Descarrega %s ponts %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Passa 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Ara %s afegeix els ponts a Tor %s" diff --git a/lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..112d143 --- /dev/null +++ b/lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po @@ -0,0 +1,104 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# adamse <adamslovacek(a)gmail.com>, 2013 +# Elisa <valhalla(a)gishpuppy.com>, 2011 +# Sanky <gsanky+transifex(a)gmail.com>, 2011 +# Radog <bensch.radek(a)gmail.com>, 2013 +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-10-26 11:20+0000\n" +"Last-Translator: Radog <bensch.radek(a)gmail.com>\n" +"Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: cs\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Co jsou mosty?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridge relays % jsou Tor relé které pomáhají obejít cenzuru." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Chci mosty zjistit jiným způsobem!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Další cesta k nalezení veřejných adres mostů je posláním emailem (od %s nebo %s adresy) %s s textem 'get bridges' v těle mailu." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Mé mosty nefungují. Potřebuji pomoc!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Jestliže Váš Tor nefunguje, napište email %s. Pokuste se zahrnout co nejvíce informací o Vašem případu, napište seznam mostů, které používáte, název balíku/verze kterou používáte a zprávy které Vám Tor vypisuje, atd." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Řádky nahoře použíjte ve programu Vidalia, nastavení sítě. Klepněte na \"Můj poskytovatel blokuje připojení přes síť TOR\". Poté na každý řádek vložte právě jednu adresu mostu." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Žádné dostupné mosty" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Aktualizujte svůj Firefox prohližeč" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Vepište dvě slova" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Krok 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Získej %s balík Tor prohlížeče %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Krok 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Získej %s mosty %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Krok 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Nyní %s přidej mosty do Tor %s" diff --git a/lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..ef3ed81 --- /dev/null +++ b/lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po @@ -0,0 +1,101 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# halbares <pablo.alvarez.flores(a)gmail.com>, 2014 +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: 2014-03-21 21:50+0000\n" +"Last-Translator: halbares <pablo.alvarez.flores(a)gmail.com>\n" +"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/torproject/language/es_CL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: es_CL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "¿Cuáles son los puentes?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridge relays %s son repetidores de Tor que ayudan a combatir la censura." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "¡Necesito una forma alternativa de obtener puentes!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Otra forma de encontrar direcciones de puentes públicos es mediante enviar un correo electrónico (De %s o %s dirección) a %s con la línea 'get bridges' en el cuerpo del mensaje." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "¡Mi puente no funciona! ¡Ayúdenme!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Si Tor no funciona, por favor envíe un correo electrónico %s. Intente incluir toda la información posible, incluyendo la lista de los puentes que ha utilizado, el paquete nombre_de_archivo/versión que utilizó, los mensajes que Tor devolvió, etc." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Para utilizar las líneas anteriores, diríjase a la página de configuración de la red de VIdalia, y haga clic en \"Mi ISP bloquea las conexiones a la red Tor\". A continuación, añadir cada dirección puente uno a uno." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "No hay puentes disponibles actualmente" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Actualiza tu navegador a Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Escribe las dos palabras" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Paso 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Obtenga %s Tor Browser Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Paso 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Obtenga %s puentes %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Paso 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Ahora %s añadir los puentes a Tor %s" diff --git a/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..356eaa7 --- /dev/null +++ b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# karvjorm <karvonen.jorma(a)gmail.com>, 2014 +# kalossi <ossikallunki(a)gmail.com>, 2013 +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: 2014-02-16 11:50+0000\n" +"Last-Translator: karvjorm <karvonen.jorma(a)gmail.com>\n" +"Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Mitä ovat sillat?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Siltareitittimet %s ovat Tor-reitittimiä, jotka auttavat sinua kiertämään sensuuria." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Toinen tapa löytää julkinen siltaosoite on lähettää sähköpostiosoite (osoitteesta %s tai %s) osoitteeseen %s rivillä 'get bridges' itse viestin rungossa." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Siltani ei toimi! Tarvitsen apua!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Jos Tor-ohjelmasi ei toimi, sinun pitäisi lähettää sähköpostia osoitteeseen %s. Sisällytä viestiin mahdollisimman paljon tietoa tapauksesta mukaanlukien luettelo käyttämistäsi silloista, käyttämästäsi ohjelmistopaketin tiedostonimestä/versiosta, saamasi Tor-virheilmoitukset, jne." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Yllä olevien rivien käyttämiseksi siirry Vidalia-verkon asetussivulle ja napsauta \"Palvelutarjoajani estää yhteyden Tor-verkkoon\". Lisää sitten jokainen siltaosoite yksi kerrallaan." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Siltoja ei ole tällä hetkellä saatavilla" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Päivitä selaimesi Firefoxiin" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Kirjoita kaksi sanaa" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Vaihe 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Hanki %s Tor-selainpaketti %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Vaihe 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Hanki %s sillat %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Vaihe 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Nyt %s lisää sillat Toriin %s" diff --git a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..7b665d1 --- /dev/null +++ b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po @@ -0,0 +1,104 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# lunar <lunar(a)torproject.org>, 2013 +# mehditaileb <mehditaileb(a)liberte-info.net>, 2011 +# Onizuka, 2013 +# Alain-Olivier Breysse, 2014 +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: 2014-01-01 21:00+0000\n" +"Last-Translator: Alain-Olivier Breysse\n" +"Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: fr_CA\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Que sont les ponts?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Les ponts relais %s sont des relais Tor qui vous aident à contourner la censure." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "J'ai besoin d'une alternative pour obtenir des ponts!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Une autre manière de trouver des adresses publiques de pont est d'envoyer un courriel (à partir d'une adresse %s ou %s) à %s avec la ligne « get bridges » seule dans le corps du courriel." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Mes ponts ne fonctionnent pas, j'ai besoin d'aide!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Si votre Tor ne fonctionne pas, envoyer un courriel à %s. Essayer d'inclure autant d'informations que possible concernant votre cas, incluant la liste des ponts utilisés, le nom de fichier et la version de l'offre groupée, les messages donnés par Tor, etc..." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Pour utiliser les lignes ci-dessus, aller dans l'onglet des paramètres réseau de Vidalia et cocher « Mon FAI bloque les connexions au réseau Tor ». Puis ajouter les adresses de chaque pont une à la fois." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Aucune pont disponible présentement." + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Changer votre navigateur pour Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Taper les deux mots" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Étape 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Obtenir %s l'offre groupée de navigation Tor %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Étape 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Obtenir %s les ponts %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Étape 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Maintenant %s ajouter les ponts à Tor %s" diff --git a/lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..1449290 --- /dev/null +++ b/lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po @@ -0,0 +1,101 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# MasIs <is.roadster(a)gmail.com>, 2013 +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-12-10 10:16+0000\n" +"Last-Translator: MasIs <is.roadster(a)gmail.com>\n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Apa itu 'bridge'?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s 'Bridge relays' %s adalah perelai Tor yang membantu Anda mengelakkan sensor." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Adakah cara lain untuk memperoleh 'bridges'?" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Cara lain untuk memperoleh alamat 'public bridge' adalah dengan mengirimkan email (dari sebuah %s atau %s alamat) ke %s yang hanya berisi 'get bridges' pada isi email." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Bridge saya gagal! Bantu saya!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Jika Tor Anda gagal bekerja, Anda harus menulis email %s. Cantumkan seluruh permasalahan yang Anda dapati, termasuk daftar 'bridge' yang Anda gunakan, nama file 'bundle' atau versi yang Anda pakai, pesan error Tor, dan sebagainya." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Untuk menggunakan baris di atas, pilih halaman pengaturan Vidalia's Network, dan klik \"My ISP blocks connections to the Tor network\". Kemudian tambahkan alamat 'bridge' satu per satu." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Saat ini tidak ada 'bridge' yang tersedia." + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Ubah browser Anda menjadi Firefox." + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Ketikkan kedua kata tersebut." + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Langkah 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Dapatkan %s bundel Tor Browser %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Langkah 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Dapatkan %s 'bridge' %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Langkah 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "%s Tambahkan 'bridge' ke Tor %s" diff --git a/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..8ae3ca8 --- /dev/null +++ b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# soksophea <sksophea(a)gmail.com>, 2014 +# soksophea <sksophea(a)gmail.com>, 2013 +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: 2014-02-07 02:29+0000\n" +"Last-Translator: Sutha <sutha(a)open.org.kh>\n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "តើប្រ៊ីតជាអ្វី?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s ប្រ៊ីតបញ្ជូនបន្ត %s គឺ Tor បញ្ជូនបន្តដែលជួយអ្នកបញ្ចៀសការរិះគន់។" + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "ខ្ញុំត្រូវការវិធីសាស្ត្រឆ្លាស់គ្នានៃការទទួលបានប្រ៊ីត!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "វិធីផ្សេងទៀតដើម្បីរកមើលអាសយដ្ឋានប្រ៊ីតសាធារណៈគឺ ការផ្ញើអ៊ីមែល (ពីអាសយដ្ឋាន %s ឬ %s) ទៅកាន់ %s ដែលមានបន្ទាត់អក្សរ 'get bridges' នៅក្នុងតួនៃអ៊ីមែល។" + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "ប្រ៊ីតរបស់ខ្ញុំមិនដំណើរការ! ខ្ញុំត្រូវការជំនួយ!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "បើ Tor របស់អ្នកមិនដំណើរការទេ អ្នកគួរតែផ្ញើអ៊ីមែលទៅ %s។ ដោយព្យាយាមរួមបញ្ចូលព័ត៌មានអំពីករណីរបស់អ្នកឲ្យបានច្រើន រួមបញ្ចូលបញ្ជីប្រ៊ីតដែលអ្នកបានប្រើ បាច់ឈ្មោះឯកសារ/កំណែដែលអ្នកបានប្រើ សារដែល Tor បានបោះបង់។ល។" + +#: lib/bridgedb/templates/bridges.html:10 +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 "ដើម្បីប្រើបន្ទាត់អក្សរខាងលើ អ្នកត្រូវទៅកាន់ទំព័រការកំណត់បណ្ដាញរបស់ Vidalia រួចចុច \"ISP របស់ខ្ញុំទប់ស្កាត់ការតភ្ជាប់ទៅកាន់បណ្ដាញ Tor\" ។ បន្ទាប់មកបន្ថែមអាសយដ្ឋានប្រ៊ីតម្ដងមួយៗ។" + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "បច្ចុប្បន្នមិនមានប្រ៊ីត" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "ធ្វើបច្ចុប្បន្នភាពកម្មវិធីអ៊ីនធឺណិតរបស់អ្នកទៅ Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "វាយពាក្យពីរ" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "ជំហានទី១" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "យក %s បាច់កម្មវិធីអ៊ីនធឺណិត Tor %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "ជំហានទី២" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "យក %s ប្រ៊ីត %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "ជំហានទី៣" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "ឥឡូវ %s បន្ថែមប្រ៊ីតទៅកាន់ Tor %s" diff --git a/lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..d509e3c --- /dev/null +++ b/lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po @@ -0,0 +1,101 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# VHR <viktor.hr(a)gmail.com>, 2014 +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: 2014-03-12 22:21+0000\n" +"Last-Translator: VHR <viktor.hr(a)gmail.com>\n" +"Language-Team: Macedonian (http://www.transifex.com/projects/p/torproject/language/mk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: mk\n" +"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Што се премостувања?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s релеи за Премостувања %s се Tor релеи кои ти помагаат да го заобиколиш цензурирањето." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Ми треба алтернативен начин да добијам премостувања!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Друг начин да се најдат адресите на јавните премостувања е да се прати е-пошта (од %s или %s адреса) на %s со текст 'get bridges' во содржината на поштата." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Моите премостувања не функционираат! Ми треба помош!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Ако твојот Tor не функционира, треба да пратиш е-пошта на %s. Пробај да внесеш колку што можеш повеќе информации за твојот случај, вклушително и листа од премостувања кои ги користиш, името/верзијата на пакетот кој го користиш, пораките кои ги добиваш од Tor, итн." + +#: lib/bridgedb/templates/bridges.html:10 +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 "За да ги користиш горниве линии, оди на страната на подесувања на Vidalia's Network, и избери \"Мојот ISP ги блокира врските кон мрежата на Tor\". Потоа додај ја адресата на секое премостување еднаш." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Премостувањата се моментално недостапни" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Надгради го твојот прегледувач во Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Напиши ги двата збора" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Чекор 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Земи %s пакет прелистувач Tor %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Чекор 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Земи %s премостувања %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Чекор 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Сега %s додај ги премостувањата во Tor %s" diff --git a/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..da9c017 --- /dev/null +++ b/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# kagazz <lourenxo_619(a)hotmail.com>, 2014 +# TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 +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: 2014-03-08 14:40+0000\n" +"Last-Translator: TiagoJMMC <tiagojmmc(a)gmail.com>\n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "O que são 'bridges'?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Os retransmissores bridge %s são retransmissores Tor que o ajudam a contornar a censura." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Preciso de uma alternativa para aceder a bridges!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Uma outra maneira de encontrar endereços para bridges públicas passa por enviar um email (a partir de um endereço %s ou %s) para %s, unicamente com o texto 'get bridges' no corpo do email." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "As minhas bridges não funcionam! Preciso de ajuda!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Se o seu Tor não funcionar, deverá enviar um email para %s. Tente incluir o máximo de informação possível relativa ao seu problema, incluindo a lista de bridges utilizadas, o nome de ficheiro/versão do bundle utilizado, as mensagens indicadas pelo Tor, etc." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Para utilizar as linhas supramencionadas, aceda à página de configurações de rede do Vidalia e clique em \"O meu ISP bloqueia ligações à rede Tor\". De seguida, adicione os endereços bridge um a um." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "De momento não existem bridges disponíveis" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Actualize o seu navegador Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Escreva as duas palavras" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Passo 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Obtenha o %s Tor Browser Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Passo 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Obtenha as %s bridges %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Passo 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Agora %s adicione as bridges ao Tor %s" diff --git a/lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po index 6aec43d..a8b6727 100644 --- a/lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po @@ -40,7 +40,7 @@ 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 "อีกหนึ่งช่องทาง สำหรับค้นหาที่อยู่ของสะพานสาธารณะ สามารถทำได้ผ่านการส่งอีเมล (จาก %s หรือ ที่อยู่ %s) ไปสู่ %s ด้วยเส้นทาง \"การเข้าถึงสะพาน\" ภายในเนื้อหาของอีเมล" +msgstr "อีกหนึ่งช่องทาง สำหรับค้นหาที่อยู่ของสะพานสาธารณะ สามารถทำได้ผ่านการส่งอีเมล (จาก %s หรือ ที่อยู่ %s) ไปสู่ %s ด้วยเส้นทาง \"\n\"การเข้าถึงสะพาน\" ภายในเนื้อหาของอีเมล" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..2b03216 --- /dev/null +++ b/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# ghostishev, 2014 +# AVATOR <sclub2018(a)yandex.ua>, 2013 +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: 2014-03-13 10:40+0000\n" +"Last-Translator: ghostishev\n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Що таке ретранслятор типу міст?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Мости %s це ретранслятори Tor, які допомагають обійти цензуру." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Мені потрібен альтернативний спосіб отримання списку мостів!" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "Інший спосіб знайти публічний міст - надіслати листа (з адреси %s або %s) на %s з одним рядком 'get bridges' в тілі листа." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Мої мости не працюють! Допоможіть!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "Якщо Tor не працює - напишіть %s. Опишіть проблему якомога більш докладно, Введіть список використаних мостів, ім'я файлу / версію, яку ви використовували, повідомлення про помилки та інше." + +#: lib/bridgedb/templates/bridges.html:10 +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 "Для використання рядків вище, відкрийте сторінку Vidalia налаштування Мережі, і натисніть\n\"Мій провайдер Інтернет блокує з'єднання з мережею Tor\". Потім додайте кожну адресу моста\nза раз." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "На цей час немає доступних мостів" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Оновіть ваш браузер до Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Введіть два слова" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Крок 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Отримайте %s пакет Tor Browser %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Крок 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Отримайте %s мости %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Крок 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Тепер %s додайте мости в Tor %s" diff --git a/lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..ccec1bd --- /dev/null +++ b/lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po @@ -0,0 +1,100 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +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: 2014-02-28 16:31+0000\n" +"Last-Translator: 修銘張 <cges30901(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "什麼是網橋？" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s 網橋中繼 %s 是 Tor 中繼，可以幫助您規避審查。" + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "我需要使用其他方式獲取網橋！" + +#: lib/bridgedb/templates/base.html:40 +#, 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 "獲取公開的網橋地址還有另一種方式：使用 %s 或 %s 電子郵件發送電子郵件至 %s，並在郵件正文中包含文字「get bridges」。" + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "網橋無法正常運行，我需要幫助！" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +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 "如果Tor 無法正常運行，請發送電子郵件至 %s。請在郵件中提供盡可能詳細的訊息，例如：使用的網橋列表，所用的軟體包檔案名稱/版本，Tor 所顯示的信息等等。" + +#: lib/bridgedb/templates/bridges.html:10 +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 "如需使用以上地址，請打開 Vidalia 網路設定，點選「我的 ISP 阻擋了對 Tor 網路的連接\"，然後依次添加網橋地址。" + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "目前無可用的網橋中繼" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "請將你的瀏覽器升級為 Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "請輸入圖中的兩個單字" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "第 1 步" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "獲取 %s Tor Browser Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "第 2 步" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "獲取 %s bridges %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "第 3 步" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "現在 %s 將網橋添加到 Tor %s"

1 0

[bridgedb/master] Merge branch 'release-0.1.6'
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit f266f32c365eb7a16cf156cc02f7e492266a7b51 Merge: 783babc 24dc8dc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 26 05:46:11 2014 +0000 Merge branch 'release-0.1.6' .travis.yml | 8 +- CHANGELOG | 13 + Makefile | 5 +- bridgedb.conf | 7 +- lib/bridgedb/Bridges.py | 52 +- lib/bridgedb/Dist.py | 24 +- lib/bridgedb/EmailServer.py | 32 +- lib/bridgedb/HTTPServer.py | 208 ++++-- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 104 +++ lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 101 +++ lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 104 +++ lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 +++ lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 +++ lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 2 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 102 +++ lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 100 +++ lib/bridgedb/runner.py | 2 +- lib/bridgedb/templates/base.html | 12 +- lib/bridgedb/test/test_HTTPServer.py | 669 +++++++++++++++++ lib/bridgedb/test/test_bridgedb.py | 12 +- lib/bridgedb/test/test_txrecaptcha.py | 21 +- lib/bridgedb/txrecaptcha.py | 52 +- scripts/gen_bridge_descriptors | 870 ----------------------- setup.py | 8 +- 28 files changed, 2106 insertions(+), 1012 deletions(-)

1 0

[bridgedb/develop] Explicitly require CaptchaProtectedResource.checkSolution() to be True.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit acf37dc00b4d9e2b8e3619a56f1711bb503d9e5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 18 04:50:04 2014 +0000 Explicitly require CaptchaProtectedResource.checkSolution() to be True. * FIXES #11231. --- lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 47009df..27dd61e 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -215,7 +215,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): :returns: A rendered HTML page containing a ReCaptcha challenge image for the client to solve. """ - if self.checkSolution(request): + if self.checkSolution(request) is True: try: rendered = self.resource.render(request) except Exception as err:

1 0

[bridgedb/develop] Start writing unittests for the bridgedb.HTTPServer module.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 9a4bd295a89f2be7f700bfa68d34bcba03954e40 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 18 04:12:46 2014 +0000 Start writing unittests for the bridgedb.HTTPServer module. The ReCaptchaProtectedResourceTests.test_render_POST_* unittests expose the bug in #11231. --- lib/bridgedb/test/test_HTTPServer.py | 371 ++++++++++++++++++++++++++++++++++ 1 file changed, 371 insertions(+) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py new file mode 100644 index 0000000..da910c6 --- /dev/null +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -0,0 +1,371 @@ +# -*- encoding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# :copyright: (c) 2014, Isis Lovecruft +# (c) 2014, The Tor Project, Inc. +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Unittests for :mod:`bridgedb.HTTPServer`.""" + +import os +import shutil + +import ipaddr + +from BeautifulSoup import BeautifulSoup + +from twisted.internet import reactor +from twisted.trial import unittest +from twisted.web.resource import Resource +from twisted.web.test import requesthelper + +from bridgedb import HTTPServer + +import logging +logging.disable(50) + + +class ReplaceErrorPageTests(unittest.TestCase): + """Tests for :func:`bridgedb.HTTPServer.replaceErrorPage`.""" + + def test_replaceErrorPage(self): + """``replaceErrorPage`` should return the expected html.""" + exc = Exception("vegan gümmibären") + errorPage = HTTPServer.replaceErrorPage(exc) + self.assertSubstring("Something went wrong", errorPage) + self.assertNotSubstring("vegan gümmibären", errorPage) + + +class CaptchaProtectedResourceTests(unittest.TestCase): + """Tests for :mod:`bridgedb.HTTPServer.CaptchaProtectedResource`.""" + + def setUp(self): + self.dist = None + self.sched = None + self.pagename = b'somepage.html' + self.root = Resource() + self.protectedResource = HTTPServer.WebResourceBridges(self.dist, + self.sched) + self.captchaResource = HTTPServer.CaptchaProtectedResource( + useForwardedHeader=True, resource=self.protectedResource) + self.root.putChild(self.pagename, self.captchaResource) + + def test_render_GET_noCaptcha(self): + """render_GET() should return a page without a CAPTCHA, which has the + image alt text. + """ + request = requesthelper.DummyRequest([self.pagename]) + request.method = b'GET' + page = self.captchaResource.render_GET(request) + self.assertSubstring( + "Your browser is not displaying images properly", page) + + def test_render_GET_missingTemplate(self): + """render_GET() with a missing template should raise an error and + return the result of replaceErrorPage(). + """ + oldLookup = HTTPServer.lookup + try: + HTTPServer.lookup = None + request = requesthelper.DummyRequest([self.pagename]) + request.method = b'GET' + page = self.captchaResource.render_GET(request) + errorPage = HTTPServer.replaceErrorPage(Exception('kablam')) + self.assertEqual(page, errorPage) + finally: + HTTPServer.lookup = oldLookup + + def test_getClientIP_XForwardedFor(self): + """CaptchaProtectedResource.getClientIP() should return the IP address + from the 'X-Forwarded-For' header when ``useForwardedHeader=True``. + """ + requestIP = b'6.6.6.6' + request = requesthelper.DummyRequest([self.pagename]) + request.setHeader(b'X-Forwarded-For', requestIP) + request.method = b'GET' + + #child = root.getChild(pagename, request) + page = self.captchaResource.render_GET(request) + clientIP = self.captchaResource.getClientIP(request) + #self.assertEquals(requestIP, clientIP) + + def test_render_POST(self): + """render_POST() with a wrong 'captcha_response_field' should return + a redirect to the CaptchaProtectedResource page. + """ + pagename = 'captcha.html' + self.root.putChild(pagename, self.captchaResource) + + def redirect(request): + newRequest = type(request) + newRequest.uri = pagename + return newRequest + + request = requesthelper.DummyRequest(['captcha.html']) + request.method = b'POST' + request.redirect = redirect(request) + + page = self.captchaResource.render_POST(request) + self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + 'refresh') + + +class GimpCaptchaProtectedResourceTests(unittest.TestCase): + """Tests for :mod:`bridgedb.HTTPServer.GimpCaptchaProtectedResource`.""" + + def setUp(self): + """Create a :class:`HTTPServer.WebResourceBridges` and protect it with + a :class:`GimpCaptchaProtectedResource`. + """ + # Create our cached CAPTCHA directory: + self.captchaDir = 'captchas' + if not os.path.isdir(self.captchaDir): + os.makedirs(self.captchaDir) + + # Set up our resources to fake a minimal HTTP(S) server: + self.pagename = b'captcha.html' + self.root = Resource() + # (None, None) is the (distributor, scheduleInterval): + self.protectedResource = HTTPServer.WebResourceBridges(None, None) + self.captchaResource = HTTPServer.GimpCaptchaProtectedResource( + secretKey='42', + publicKey='23', + hmacKey='abcdefghijklmnopqrstuvwxyz012345', + captchaDir='captchas', + useForwardedHeader=True, + resource=self.protectedResource) + + self.root.putChild(self.pagename, self.captchaResource) + + # Set up the basic parts of our faked request: + self.request = requesthelper.DummyRequest([self.pagename]) + self.request.URLPath = lambda: request.uri # Fake the URLPath too + self.request.redirect = self.doRedirect(self.request) + + def doRedirect(self, request): + """Stub method to add a redirect() to DummyResponse.""" + newRequest = type(request) + newRequest.uri = self.pagename + return newRequest + + def tearDown(self): + """Delete the cached CAPTCHA directory if it still exists.""" + if os.path.isdir(self.captchaDir): + shutil.rmtree(self.captchaDir) + + def test_extractClientSolution(self): + """A (challenge, sollution) pair extracted from a request resulting + from a POST should have the same unmodified (challenge, sollution) as + the client originally POSTed. + """ + expectedChallenge = '23232323232323232323' + expectedResponse = 'awefawefaefawefaewf' + + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', expectedChallenge) + self.request.addArg('captcha_response_field', expectedResponse) + + response = self.captchaResource.extractClientSolution(self.request) + (challenge, response) = response + self.assertEqual(challenge, expectedChallenge) + self.assertEqual(response, expectedResponse) + + def test_checkSolution(self): + """checkSolution() should return False is the solution is invalid.""" + expectedChallenge = '23232323232323232323' + expectedResponse = 'awefawefaefawefaewf' + + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', expectedChallenge) + self.request.addArg('captcha_response_field', expectedResponse) + + valid = self.captchaResource.checkSolution(self.request) + self.assertFalse(valid) + + def test_getCaptchaImage(self): + """Retrieving a (captcha, challenge) pair with an empty captchaDir + should return None for both of the (captcha, challenge) strings. + """ + self.request.method = b'GET' + response = self.captchaResource.getCaptchaImage(self.request) + (image, challenge) = response + # Because we created the directory, there weren't any CAPTCHAs to + # retrieve from it: + self.assertIs(image, None) + self.assertIs(challenge, None) + + def test_getCaptchaImage_noCaptchaDir(self): + """Retrieving a (captcha, challenge) with an missing captchaDir should + raise a bridgedb.captcha.GimpCaptchaError. + """ + shutil.rmtree(self.captchaDir) + self.request.method = b'GET' + self.assertRaises(HTTPServer.captcha.GimpCaptchaError, + self.captchaResource.getCaptchaImage, self.request) + + def test_render_GET_missingTemplate(self): + """render_GET() with a missing template should raise an error and + return the result of replaceErrorPage(). + """ + oldLookup = HTTPServer.lookup + try: + HTTPServer.lookup = None + self.request.method = b'GET' + page = self.captchaResource.render_GET(self.request) + errorPage = HTTPServer.replaceErrorPage(Exception('kablam')) + self.assertEqual(page, errorPage) + finally: + HTTPServer.lookup = oldLookup + + def test_render_POST_blankFields(self): + """render_POST() with a blank 'captcha_response_field' should return + a redirect to the CaptchaProtectedResource page. + """ + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', '') + self.request.addArg('captcha_response_field', '') + + page = self.captchaResource.render_POST(self.request) + self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + 'refresh') + + def test_render_POST_wrongSolution(self): + """render_POST() with a wrong 'captcha_response_field' should return + a redirect to the CaptchaProtectedResource page. + """ + expectedChallenge = '23232323232323232323' + expectedResponse = 'awefawefaefawefaewf' + + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', expectedChallenge) + self.request.addArg('captcha_response_field', expectedResponse) + + page = self.captchaResource.render_POST(self.request) + self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + 'refresh') + + +class ReCaptchaProtectedResourceTests(unittest.TestCase): + """Tests for :mod:`bridgedb.HTTPServer.ReCaptchaProtectedResource`.""" + + def setUp(self): + """Create a :class:`HTTPServer.WebResourceBridges` and protect it with + a :class:`ReCaptchaProtectedResource`. + """ + # Create our cached CAPTCHA directory: + self.captchaDir = 'captchas' + if not os.path.isdir(self.captchaDir): + os.makedirs(self.captchaDir) + + # Set up our resources to fake a minimal HTTP(S) server: + self.pagename = b'captcha.html' + self.root = Resource() + # (None, None) is the (distributor, scheduleInterval): + self.protectedResource = HTTPServer.WebResourceBridges(None, None) + self.captchaResource = HTTPServer.ReCaptchaProtectedResource( + recaptchaPrivKey='42', + recaptchaPubKey='23', + remoteip='111.111.111.111', + useForwardedHeader=True, + resource=self.protectedResource) + + self.root.putChild(self.pagename, self.captchaResource) + + # Set up the basic parts of our faked request: + self.request = requesthelper.DummyRequest([self.pagename]) + self.request.URLPath = lambda: request.uri # Fake the URLPath too + self.request.redirect = self.doRedirect(self.request) + + def doRedirect(self, request): + """Stub method to add a redirect() to DummyResponse.""" + newRequest = type(request) + newRequest.uri = self.pagename + return newRequest + + def tearDown(self): + """Cleanup method for removing timed out connections on the reactor. + + This seems to be the solution for the dirty reactor due to + ``DelayedCall``s which is mentioned at the beginning of this + file. There doesn't seem to be any documentation anywhere which + proposes this solution, although this seems to solve the problem. + """ + for delay in reactor.getDelayedCalls(): + try: + delay.cancel() + except (AlreadyCalled, AlreadyCancelled): + pass + + def test_checkSolution_blankFields(self): + """:meth:`HTTPServer.ReCaptchaProtectedResource.checkSolution` should + return a redirect if is the solution field is blank. + """ + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', '') + self.request.addArg('captcha_response_field', '') + + self.assertIsInstance( + self.captchaResource.checkSolution(self.request), + HTTPServer.txrecaptcha.RecaptchaResponse) + + def test_getRemoteIP_useRandomIP(self): + """Check that removing our remoteip setting produces a random IP.""" + self.captchaResource.recaptchaRemoteIP = None + ip = self.captchaResource.getRemoteIP() + realishIP = ipaddr.IPv4Address(ip).compressed + self.assertTrue(realishIP) + self.assertNotEquals(realishIP, '111.111.111.111') + + def test_getRemoteIP_useConfiguredIP(self): + """Check that our remoteip setting is used if configured.""" + ip = self.captchaResource.getRemoteIP() + realishIP = ipaddr.IPv4Address(ip).compressed + self.assertTrue(realishIP) + self.assertEquals(realishIP, '111.111.111.111') + + def test_render_GET_missingTemplate(self): + """render_GET() with a missing template should raise an error and + return the result of replaceErrorPage(). + """ + oldLookup = HTTPServer.lookup + try: + HTTPServer.lookup = None + self.request.method = b'GET' + page = self.captchaResource.render_GET(self.request) + errorPage = HTTPServer.replaceErrorPage(Exception('kablam')) + self.assertEqual(page, errorPage) + finally: + HTTPServer.lookup = oldLookup + + def test_render_POST_blankFields(self): + """render_POST() with a blank 'captcha_response_field' should return + a redirect to the CaptchaProtectedResource page. + """ + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', '') + self.request.addArg('captcha_response_field', '') + + page = self.captchaResource.render_POST(self.request) + print page + self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + 'refresh') + + def test_render_POST_wrongSolution(self): + """render_POST() with a wrong 'captcha_response_field' should return + a redirect to the CaptchaProtectedResource page. + """ + expectedChallenge = '23232323232323232323' + expectedResponse = 'awefawefaefawefaewf' + + self.request.method = b'POST' + self.request.addArg('captcha_challenge_field', expectedChallenge) + self.request.addArg('captcha_response_field', expectedResponse) + + page = self.captchaResource.render_POST(self.request) + print page + self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + 'refresh')

1 0

[bridgedb/develop] Fix CaptchaProtectedResourceTests.test_render_GET_noCaptcha unittest.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 7753289270a992dd51326164803ff4c7076e4da8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 18 04:39:38 2014 +0000 Fix CaptchaProtectedResourceTests.test_render_GET_noCaptcha unittest. We shouldn't return ``(None, None)`` in a stub method when all the other methods and child classes expect ``(str, str)``. --- lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 96ee029..a67d5ae 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -142,7 +142,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): string. If unable to retrieve a CAPTCHA, returns ``(None, None)``. """ - return (None, None) + return ('', '') def extractClientSolution(self, request): """Extract the client's CAPTCHA solution from a POST request.

1 0

[bridgedb/develop] Update documentation for CaptchaProtectedResource.getCaptchaImage().
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 573996bd57420ccf5d009a95f20fdc6367edd24a Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 18 04:48:06 2014 +0000 Update documentation for CaptchaProtectedResource.getCaptchaImage(). --- lib/bridgedb/HTTPServer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index a67d5ae..47009df 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -139,8 +139,8 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): :returns: A 2-tuple of ``(image, challenge)``, where ``image`` is a binary, JPEG-encoded image, and ``challenge`` is a unique - string. If unable to retrieve a CAPTCHA, returns - ``(None, None)``. + string. If unable to retrieve a CAPTCHA, returns a tuple + containing two empty strings. """ return ('', '')

1 0

[bridgedb/develop] Add optional debugging logs to test_HTTPServer.py.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 619d0a588f0c0fe6cd9a2d1a812258c8042acb30 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 17:43:28 2014 +0000 Add optional debugging logs to test_HTTPServer.py. --- lib/bridgedb/test/test_HTTPServer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index da910c6..e0c81f8 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -11,6 +11,7 @@ """Unittests for :mod:`bridgedb.HTTPServer`.""" +import logging import os import shutil @@ -25,8 +26,11 @@ from twisted.web.test import requesthelper from bridgedb import HTTPServer -import logging + +# For additional logger output for debugging, comment out the following: logging.disable(50) +# and then uncomment the following line: +#HTTPServer.logging.getLogger().setLevel(10) class ReplaceErrorPageTests(unittest.TestCase):

1 0

[bridgedb/develop] Add a mocked DummyBridge class to test_HTTPServer.py.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit f0ca59c8d1792d2fcbea54b0eb29feb10ecacdb0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 17:46:32 2014 +0000 Add a mocked DummyBridge class to test_HTTPServer.py. This is used to test that bridges are actually returned on 'bridges.html' results pages, and is missing all of the real class's methods except for `getConfigLine()`. The latter method needs to be mocked because is used in `HTTPServer.WebResourceBridges.render()` to get the bridge line to display to a client. --- lib/bridgedb/test/test_HTTPServer.py | 49 ++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 119d2fc..05e041c 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -11,8 +11,11 @@ """Unittests for :mod:`bridgedb.HTTPServer`.""" +from __future__ import print_function + import logging import os +import random import shutil import ipaddr @@ -354,7 +357,6 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): self.request.addArg('captcha_response_field', '') page = self.captchaResource.render_POST(self.request) - print page self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], 'refresh') @@ -370,6 +372,49 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): self.request.addArg('captcha_response_field', expectedResponse) page = self.captchaResource.render_POST(self.request) - print page self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], 'refresh') + + +class DummyBridge(object): + """A mock :class:`bridgedb.Bridges.Bridge` which only supports a mocked + ``getConfigLine`` method.""" + + def _randORPort(self): return random.randint(9001, 9999) + def _randPTPort(self): return random.randint(6001, 6666) + def _returnFour(self): return random.randint(2**24, 2**32-1) + def _returnSix(self): return random.randint(2**24, 2**128-1) + + def __init__(self, transports=[]): + """Create a mocked bridge suitable for testing distributors and web + resource rendering. + """ + self.nickname = "bridge-{0}".format(self._returnFour()) + self.ip = ipaddr.IPv4Address(self._returnFour()) + self.orport = self._randORPort() + self.transports = transports + self.running = True + self.stable = True + self.blockingCountries = {} + self.desc_digest = None + self.ei_digest = None + self.verified = False + self.fingerprint = "".join(random.choice('abcdef0123456789') + for _ in xrange(40)) + self.or_addresses = {ipaddr.IPv6Address(self._returnSix()): + self._randORPort()} + + def getConfigLine(self, includeFingerprint=True, + addressClass=ipaddr.IPv4Address, + transport=None, + request=None): + """Get a "torrc" bridge config line to give to a client.""" + line = [] + if transport is not None: + #print("getConfigLine got transport=%r" % transport) + line.append(str(transport)) + line.append("%s:%s" % (self.ip, self.orport)) + if includeFingerprint is True: line.append(self.fingerprint) + bridgeLine = " ".join([item for item in line]) + #print "Created config line: %r" % bridgeLine + return bridgeLine

1 0