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

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 26 May '14

26 May '14

commit 09952df64088e892a235771ccf30b79cdf28d184 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 26 17:45:51 2014 +0000 Update translations for tor-and-https --- pt_BR.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 05d3827..68d7be6 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -1,12 +1,13 @@ # # Translators: +# Communia <ameaneantie(a)riseup.net>, 2014 # Anastasia01, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-24 18:11+0000\n" -"PO-Revision-Date: 2014-05-26 15:35+0000\n" -"Last-Translator: Anastasia01\n" +"PO-Revision-Date: 2014-05-26 17:34+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,21 +27,21 @@ msgstr "" #: C/tor-and-https.svg:14 #, no-wrap msgid "Tor and HTTPS" -msgstr "" +msgstr "Tor e HTTPS" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". #: C/tor-and-https.svg:346 #, no-wrap msgid "Site.com" -msgstr "" +msgstr "Site.com" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". #: C/tor-and-https.svg:346 #, no-wrap msgid "user / pw" -msgstr "" +msgstr "usuário/pw" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". @@ -54,14 +55,14 @@ msgstr "dados" #: C/tor-and-https.svg:346 #, no-wrap msgid "location" -msgstr "" +msgstr "localização " #. (itstool) path: defs/text #. Keep it short: 3em max. #: C/tor-and-https.svg:346 #, no-wrap msgid "WiFi" -msgstr "" +msgstr "WIFI" #. (itstool) path: defs/text #. Keep it short: 4em max. @@ -82,14 +83,14 @@ msgstr "Hacker" #: C/tor-and-https.svg:346 #, no-wrap msgid "Lawyer" -msgstr "" +msgstr "Advogado" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. #: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" -msgstr "" +msgstr "Administrador de sistema" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. @@ -102,14 +103,14 @@ msgstr "" #: C/tor-and-https.svg:346 #, no-wrap msgid "NSA" -msgstr "" +msgstr "ANS (Agência Nacional de Seguranca- National Security Agency)" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. #: C/tor-and-https.svg:346 #, no-wrap msgid "Tor relay" -msgstr "" +msgstr "Retransmissor Tor" #. (itstool) path: defs/text #: C/tor-and-https.svg:346

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 May '14

26 May '14

commit b0f333c6593a616b60cf81a665a02e19917cecd1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 26 17:45:03 2014 +0000 Update translations for bridgedb --- pt_BR/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index f5cdadc..8be14c3 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Communia <ameaneantie(a)riseup.net>, 2013 +# Communia <ameaneantie(a)riseup.net>, 2013-2014 # Augustine <evandro(a)geocities.com>, 2013 # Humberto Sartini <humberto(a)hss.blog.br>, 2014 # Anastasia01, 2014 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-26 16:02+0000\n" -"Last-Translator: Anastasia01\n" +"PO-Revision-Date: 2014-05-26 17:41+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +59,7 @@ msgstr "Você excedeu o limite de taxa. Mais devagar, por favor! O tempo mínimo #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "COMANDOS: (combinar COMANDOS para especificar múltiplas opções simultaneamente)" #: lib/bridgedb/strings.py:27 msgid "Welcome to BridgeDB!" @@ -68,7 +68,7 @@ msgstr "Bemvindo ao BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:29 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "Tipos de transportes atualmente compatíveis" #: lib/bridgedb/strings.py:30 #, python-format

1 0

[tor-browser/tor-browser-24.5.0esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 1bfe1ef04e14d677555db8009544736c24ddf299 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 26 10:19:36 2014 -0700 fixup! Tor Browser's Firefox preference overrides. Bug #11253: Turn on TLS 1.1 and 1.2. Also disable a deprecated Audio API for safety. --- browser/app/profile/000-tor-browser.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b6b9252..a6ff777 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -148,6 +148,13 @@ pref("javascript.options.baselinejit.content", false); pref("javascript.options.asmjs", false); pref("javascript.options.typeinference", false); +// Audio_data is deprecated in future releases, but still present +// in FF24. This is a dangerous combination (spotted by iSec) +pref("media.audio_data.enabled", false); + +// Enable TLS 1.1 and 1.2: +// https://trac.torproject.org/projects/tor/ticket/11253 +pref("security.tls.version.max", 3); // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 26 May '14

26 May '14

commit 814c31a85a25b3e1ea56d04863179141e4cb55cd Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 26 17:15:55 2014 +0000 Update translations for tor-and-https_completed --- fr_CA.po | 77 +++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 265ea87..8cdecd6 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-21 09:17+0200\n" -"PO-Revision-Date: 2014-05-21 14:22+0000\n" +"POT-Creation-Date: 2014-05-24 18:11+0000\n" +"PO-Revision-Date: 2014-05-26 17:11+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" @@ -14,82 +14,123 @@ msgstr "" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: C/tor-and-https.svg223(svg/title) +#. (itstool) path: C/tor-and-https.svg/svg@direction +#. (itstool) comment: C/tor-and-https.svg/svg@direction +#. Specify "ltr" for left-to-right languages or "rtl" for right-to-left +#. languages (e.g. Arabic or Hebrew). +#: C/tor-and-https.svg:3 +msgid "ltr" +msgstr "ltr" + +#. (itstool) path: svg/title +#: C/tor-and-https.svg:14 #, no-wrap msgid "Tor and HTTPS" msgstr "Tor et HTTPS" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "Site.com" msgstr "Site.com" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "user / pw" msgstr "utilisateur/mdp" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "data" msgstr "données" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 7em max. Seven times the capital letter "M". +#: C/tor-and-https.svg:346 #, no-wrap msgid "location" msgstr "emplacement" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 3em max. +#: C/tor-and-https.svg:346 +#, no-wrap +msgid "WiFi" +msgstr "Wi-Fi" + +#. (itstool) path: defs/text +#. Keep it short: 4em max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "ISP" msgstr "FSI" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Hacker" msgstr "Pirate" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Lawyer" msgstr "Avocat" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" msgstr "Adminsys" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Police" msgstr "Police" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "NSA" msgstr "NSA" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#. Keep it short: 8em is ok, 9em is max. +#: C/tor-and-https.svg:346 #, no-wrap msgid "Tor relay" msgstr "Relais Tor" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Key" msgstr "Clef" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Internet connection" msgstr "Connexion Internet" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Eavesdropping" msgstr "Écoute" -#: C/tor-and-https.svg224(defs/text) +#. (itstool) path: defs/text +#: C/tor-and-https.svg:346 #, no-wrap msgid "Data sharing" msgstr "Partage de données"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 26 May '14

26 May '14

commit a694902d29b7ecfb82d15d3c5ef88173d53d1f00 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 26 17:15:53 2014 +0000 Update translations for tor-and-https --- fr_CA.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 81ec3c2..8cdecd6 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 22:21+0000\n" +"POT-Creation-Date: 2014-05-24 18:11+0000\n" +"PO-Revision-Date: 2014-05-26 17:11+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" @@ -20,7 +20,7 @@ msgstr "" #. languages (e.g. Arabic or Hebrew). #: C/tor-and-https.svg:3 msgid "ltr" -msgstr "" +msgstr "ltr" #. (itstool) path: svg/title #: C/tor-and-https.svg:14 @@ -30,107 +30,107 @@ msgstr "Tor et HTTPS" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Site.com" msgstr "Site.com" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "user / pw" msgstr "utilisateur/mdp" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "data" msgstr "données" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "location" msgstr "emplacement" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "WiFi" msgstr "Wi-Fi" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "ISP" msgstr "FSI" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Hacker" msgstr "Pirate" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Lawyer" msgstr "Avocat" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" msgstr "Adminsys" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Police" msgstr "Police" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "NSA" msgstr "NSA" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Tor relay" msgstr "Relais Tor" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Key" msgstr "Clef" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Internet connection" msgstr "Connexion Internet" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Eavesdropping" msgstr "Écoute" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:346 #, no-wrap msgid "Data sharing" msgstr "Partage de données"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 May '14

26 May '14

commit 4b21c04a1aff0258996b14c32855454ce9611ffe Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 26 17:15:03 2014 +0000 Update translations for bridgedb --- fi/LC_MESSAGES/bridgedb.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po index c1011d2..faed824 100644 --- a/fi/LC_MESSAGES/bridgedb.po +++ b/fi/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-26 16:44+0000\n" +"PO-Revision-Date: 2014-05-26 17:11+0000\n" "Last-Translator: Finland355 <ville.ehrukainen2(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ msgstr "Yleiset avaimet" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "Tämä sähköposti luotiin: sateenkaarilla,yksisarvisilla ja säihkeellä ajassa: %s %s %s" #: lib/bridgedb/strings.py:42 #, python-format @@ -168,12 +168,12 @@ msgstr "" #: lib/bridgedb/strings.py:94 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Tarvitsetko IPv6 osoitteet?" #: lib/bridgedb/strings.py:95 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Tarvitsetko %s" #: lib/bridgedb/strings.py:99 msgid "Your browser is not displaying images properly." @@ -224,7 +224,7 @@ msgstr "" #: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Pyydä IPv6 siltoja." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:126 @@ -237,11 +237,11 @@ msgstr "" #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" -msgstr "" +msgstr "Ilmoita Bugista" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "" +msgstr "Lähdekoodi" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" @@ -269,17 +269,17 @@ msgstr "" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Vaihe %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Lataa %s Tor Browser %s" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Vaihe %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format @@ -289,12 +289,12 @@ msgstr "Hanki %s sillat %s" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Vaihe %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Nyt %s lisää sillat Tor Browseriin %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -308,7 +308,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:53 msgid "Advanced Options" -msgstr "" +msgstr "Edistyneet Asetukset" #: lib/bridgedb/templates/options.html:89 msgid "No"

1 0

[ooni-probe/master] Added flag to disable geoip.
by art＠torproject.org 26 May '14

26 May '14

commit 55ef4ad7df5c6f0e6e9f0d7c1be55525417c9a02 Author: kudrom <kudrom(a)riseup.net> Date: Thu May 15 20:58:18 2014 +0200 Added flag to disable geoip. --- ooni/director.py | 3 ++- ooni/oonicli.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/director.py b/ooni/director.py index b95639a..1bb3668 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -127,7 +127,8 @@ class Director(object): log.msg("Connecting to Tor Control Port...") yield self.getTorState() - yield config.probe_ip.lookup() + if not config.global_options['no-geoip']: + yield config.probe_ip.lookup() @property def measurementSuccessRatio(self): diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 889b108..1e3e7ef 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -31,6 +31,7 @@ class Options(usage.Options): optFlags = [["help", "h"], ["resume", "r"], ["no-collector", "n"], + ["no-geoip", "g"], ["list", "s"], ["printdeck", "p"], ["verbose", "v"]

1 0

[ooni-probe/master] Added annotations mechanism and improved the UX of the disable geoip flag
by art＠torproject.org 26 May '14

26 May '14

commit 49f78b1294dc31555187351fa9a637dd71a80e84 Author: kudrom <kudrom(a)riseup.net> Date: Thu May 22 00:30:58 2014 +0200 Added annotations mechanism and improved the UX of the disable geoip flag --- ooni/director.py | 7 ++++++- ooni/nettest.py | 11 +++++++++++ ooni/oonicli.py | 4 +++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 1bb3668..be5d551 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -127,7 +127,12 @@ class Director(object): log.msg("Connecting to Tor Control Port...") yield self.getTorState() - if not config.global_options['no-geoip']: + if config.global_options['no-geoip']: + annotations = config.global_options['annotations'].lower() + aux = map(lambda x: x in annotations, ["city", "country", "asn"]) + if annotations is None or not all(aux): + log.msg("You should add annotations for the country, city and ASN") + else: yield config.probe_ip.lookup() @property diff --git a/ooni/nettest.py b/ooni/nettest.py index fb0bf95..16e65f5 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -613,6 +613,17 @@ class NetTestCase(object): This is the internal setup method to be overwritten by templates. """ self.report = {} + if "annotations" in config.global_options and config.global_options["annotations"] is not None: + annotations = [] + for annotation in config.global_options["annotations"].split(","): + pair = annotation.split(":") + if len(pair) == 2: + key = pair[0].strip() + value = pair[1].strip() + annotations.append({key: value}) + else: + log.err("Invalid annotation: %s" % annotation) + self.report["annotations"] = annotations self.inputs = None def requirements(self): diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 1e3e7ef..37f514e 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -49,7 +49,9 @@ class Options(usage.Options): ["configfile", "f", None, "Specify a path to the ooniprobe configuration file"], ["datadir", "d", None, - "Specify a path to the ooniprobe data directory"] + "Specify a path to the ooniprobe data directory"], + ["annotations", "a", None, + "Annotate the report with a key:value[, key:value] format."] ] compData = usage.Completions(

1 0

[ooni-probe/master] Fixed bug in input handling
by art＠torproject.org 26 May '14

26 May '14

commit c59a59fd8cd13f5684d9d0e4c11bb1fe4ef03adf Author: kudrom <kudrom(a)riseup.net> Date: Thu May 22 00:43:00 2014 +0200 Fixed bug in input handling --- ooni/director.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index be5d551..1a00f08 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -128,9 +128,11 @@ class Director(object): yield self.getTorState() if config.global_options['no-geoip']: - annotations = config.global_options['annotations'].lower() - aux = map(lambda x: x in annotations, ["city", "country", "asn"]) - if annotations is None or not all(aux): + aux = [False] + if 'annotations' in config.global_options and config.global_options['annotations'] is not None: + annotations = config.global_options['annotations'].lower() + aux = map(lambda x: x in annotations, ["city", "country", "asn"]) + if not all(aux): log.msg("You should add annotations for the country, city and ASN") else: yield config.probe_ip.lookup()

1 0

[ooni-probe/master] Place the annotations inside of the report headers.
by art＠torproject.org 26 May '14

26 May '14

commit 5a283100c38a56221683f2dc73c57aceafb0cf36 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon May 26 18:45:44 2014 +0200 Place the annotations inside of the report headers. Store annotations as dict, not list. --- ooni/director.py | 4 ++-- ooni/nettest.py | 13 +------------ ooni/oonicli.py | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 1a00f08..4f0d4a1 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -129,8 +129,8 @@ class Director(object): if config.global_options['no-geoip']: aux = [False] - if 'annotations' in config.global_options and config.global_options['annotations'] is not None: - annotations = config.global_options['annotations'].lower() + if config.global_options.get('annotations') is not None: + annotations = [k.lower() for k in config.global_options['annotations'].keys()] aux = map(lambda x: x in annotations, ["city", "country", "asn"]) if not all(aux): log.msg("You should add annotations for the country, city and ASN") diff --git a/ooni/nettest.py b/ooni/nettest.py index 16e65f5..866e2d2 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -613,19 +613,8 @@ class NetTestCase(object): This is the internal setup method to be overwritten by templates. """ self.report = {} - if "annotations" in config.global_options and config.global_options["annotations"] is not None: - annotations = [] - for annotation in config.global_options["annotations"].split(","): - pair = annotation.split(":") - if len(pair) == 2: - key = pair[0].strip() - value = pair[1].strip() - annotations.append({key: value}) - else: - log.err("Invalid annotation: %s" % annotation) - self.report["annotations"] = annotations self.inputs = None - + def requirements(self): """ Place in here logic that will be executed before the test is to be run. diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 37f514e..ec1ed9a 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -147,6 +147,19 @@ def runWithDirector(logging=True, start_tor=True): sys.exit(0) + if global_options.get('annotations') is not None: + annotations = {} + for annotation in global_options["annotations"].split(","): + pair = annotation.split(":") + if len(pair) == 2: + key = pair[0].strip() + value = pair[1].strip() + annotations[key] = value + else: + log.err("Invalid annotation: %s" % annotation) + sys.exit(1) + global_options["annotations"] = annotations + #XXX: This should mean no bouncer either! if global_options['no-collector']: log.msg("Not reporting using a collector") @@ -261,6 +274,8 @@ def runWithDirector(logging=True, start_tor=True): raise errors.TorNotRunning test_details = net_test_loader.testDetails + test_details['annotations'] = global_options['annotations'] + yaml_reporter = YAMLReporter(test_details, report_filename=global_options['reportfile']) reporters = [yaml_reporter]

1 0