September 2013 - tor-commits - lists.torproject.org

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 13 Sep '13

13 Sep '13

commit 860fabb16a7bc8c07c820791f0294297e5aa0881 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 23:16:02 2013 +0000 Update translations for torbirdy_completed --- de/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 1586cc5..e008bf7 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -55,7 +55,7 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.label "Folgende Keyserver benutzen:"> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> -<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router nutzen"> +<!ENTITY torbirdy.panel.usetor.label "Tor Zweibel Router benutzen"> <!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) nutzen"> <!ENTITY torbirdy.panel.usewhonix.label "Whonix nutzen"> <!ENTITY torbirdy.panel.preferences.label "TorBirdy Einstellungen öffnen">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 13 Sep '13

13 Sep '13

commit e868f83969e596a43b38d4872962010261f7cccb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 23:15:57 2013 +0000 Update translations for torbirdy --- de/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 1586cc5..e008bf7 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -55,7 +55,7 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.label "Folgende Keyserver benutzen:"> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> -<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router nutzen"> +<!ENTITY torbirdy.panel.usetor.label "Tor Zweibel Router benutzen"> <!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) nutzen"> <!ENTITY torbirdy.panel.usewhonix.label "Whonix nutzen"> <!ENTITY torbirdy.panel.preferences.label "TorBirdy Einstellungen öffnen">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 12 Sep '13

12 Sep '13

commit 52482e2c3512c27c8e44dff355b660dcad9a7036 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 19:16:29 2013 +0000 Update translations for torbirdy_completed --- zh_CN/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 7c3e945..f73ac12 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "测试代理设置"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label "代理设置"> -<!ENTITY torbirdy.prefs.privacy.label "隐私设置"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 设置"> -<!ENTITY torbirdy.prefs.security.label "安全设置"> +<!ENTITY torbirdy.prefs.proxy.label "代理"> +<!ENTITY torbirdy.prefs.privacy.label "隐私"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "安全"> <!ENTITY torbirdy.prefs.recommended.text "使用推荐的 TorBirdy (Tor) 代理设置"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "选择匿名服务">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 12 Sep '13

12 Sep '13

commit aa643f83d83012072ece81f0b6cbf4ae6be55ed9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 19:16:24 2013 +0000 Update translations for torbirdy --- zh_CN/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 79e8260..f73ac12 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "测试代理设置"> <!ENTITY torbirdy.prefs.extra2.key "g"> -<!ENTITY torbirdy.prefs.proxy.label ""> -<!ENTITY torbirdy.prefs.privacy.label ""> -<!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.proxy.label "代理"> +<!ENTITY torbirdy.prefs.privacy.label "隐私"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "安全"> <!ENTITY torbirdy.prefs.recommended.text "使用推荐的 TorBirdy (Tor) 代理设置"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "选择匿名服务">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 12 Sep '13

12 Sep '13

commit 424f1e08965cff5d9ca7f467e1044f225a7ae044 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 18:16:18 2013 +0000 Update translations for torbirdy_completed --- de/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 487014f..1586cc5 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Proxyeinstellungen Testen"> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label "Proxy Einstellungen"> -<!ENTITY torbirdy.prefs.privacy.label "Privatsphären Einstellungen"> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail-Einstellungen"> -<!ENTITY torbirdy.prefs.security.label "Sicherheitseinstellungen"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privatsphäre"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Sicherheit"> <!ENTITY torbirdy.prefs.recommended.text "Empfohlene Proxy Einstellungen für TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Anonymisierungsdienst auswählen">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 12 Sep '13

12 Sep '13

commit c69bb4ee41b02129014295ec9c9905d9ccfcb546 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 18:16:14 2013 +0000 Update translations for torbirdy --- de/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index e737429..1586cc5 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "d"> <!ENTITY torbirdy.prefs.extra2.button "Proxyeinstellungen Testen"> <!ENTITY torbirdy.prefs.extra2.key "p"> -<!ENTITY torbirdy.prefs.proxy.label ""> -<!ENTITY torbirdy.prefs.privacy.label ""> -<!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privatsphäre"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Sicherheit"> <!ENTITY torbirdy.prefs.recommended.text "Empfohlene Proxy Einstellungen für TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Anonymisierungsdienst auswählen">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 12 Sep '13

12 Sep '13

commit 700eb6976700ba1925a2b4933c780f0aca567e97 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 15:15:59 2013 +0000 Update translations for torbirdy_completed --- es/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 2285eb8..597184e 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "r"> <!ENTITY torbirdy.prefs.extra2.button "Probar configuración para proxy"> <!ENTITY torbirdy.prefs.extra2.key "b"> -<!ENTITY torbirdy.prefs.proxy.label "Configuración para proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Parámetros de privacidad"> -<!ENTITY torbirdy.prefs.enigmail.label "Preferencias de Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Preferencias de seguridad"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privacidad"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Seguridad"> <!ENTITY torbirdy.prefs.recommended.text "Usar la configuración de proxy recomendada para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "y"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 12 Sep '13

12 Sep '13

commit a17fb84fc5cbb52668b8a5b28cac6e467e160fab Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 12 15:15:56 2013 +0000 Update translations for torbirdy --- es/torbirdy.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd index 7276044..597184e 100644 --- a/es/torbirdy.dtd +++ b/es/torbirdy.dtd @@ -16,10 +16,10 @@ <!ENTITY torbirdy.prefs.extra1.key "r"> <!ENTITY torbirdy.prefs.extra2.button "Probar configuración para proxy"> <!ENTITY torbirdy.prefs.extra2.key "b"> -<!ENTITY torbirdy.prefs.proxy.label ""> -<!ENTITY torbirdy.prefs.privacy.label ""> -<!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privacidad"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Seguridad"> <!ENTITY torbirdy.prefs.recommended.text "Usar la configuración de proxy recomendada para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "y"> <!ENTITY torbirdy.prefs.anonservice.text "Escoger un servicio de anonimización">

1 0

[ooni-probe/master] Add support for specifying nettests via their shorthand name.
by art＠torproject.org 12 Sep '13

12 Sep '13

commit 32697d26de961e2f08f43d5b5142ae875462bafe Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Sep 11 18:00:31 2013 +0200 Add support for specifying nettests via their shorthand name. (cherry picked from commit cd8084ecdd5742bda39fc3294522464ddef852f0) --- ooni/deck.py | 24 +++++++++++++++++++++++- ooni/errors.py | 6 ++++++ ooni/oonicli.py | 10 +++++++--- ooni/settings.py | 2 +- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 3b9e7ea..9108222 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -67,6 +67,22 @@ class InputFile(object): file_hash = sha256(f.read()) assert file_hash.hexdigest() == digest +def nettest_to_path(path): + """ + Takes as input either a path or a nettest name. + + Returns: + + full path to the nettest file. + """ + path_via_name = os.path.join(config.nettest_directory, path + '.py') + if os.path.exists(path): + return path + elif os.path.exists(path_via_name): + return path_via_name + else: + raise e.NetTestNotFound(path) + class Deck(InputFile): def __init__(self, deck_hash=None, deckFile=None): self.id = deck_hash @@ -95,8 +111,14 @@ class Deck(InputFile): test_deck = yaml.safe_load(f) for test in test_deck: + try: + nettest_path = nettest_to_path(test['options']['test_file']) + except e.NetTestNotFound: + log.err("Could not find %s" % test['options']['test_file']) + log.msg("Skipping...") + continue net_test_loader = NetTestLoader(test['options']['subargs'], - test_file=test['options']['test_file']) + test_file=nettest_path) #XXX: If the deck specifies the collector, we use the specified collector # And it should also specify the test helper address to use # net_test_loader.collector = test['options']['collector'] diff --git a/ooni/errors.py b/ooni/errors.py index b29b778..a124487 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -189,6 +189,12 @@ class CouldNotFindTestHelper(Exception): class CouldNotFindTestCollector(Exception): pass +class NetTestNotFound(Exception): + pass + +class MissingRequiredOption(Exception): + pass + def get_error(error_key): if error_key == 'test-helpers-key-missing': return CouldNotFindTestHelper diff --git a/ooni/oonicli.py b/ooni/oonicli.py index c511aa0..8622e09 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -14,7 +14,7 @@ from ooni import errors from ooni.settings import config from ooni.director import Director -from ooni.deck import Deck +from ooni.deck import Deck, nettest_to_path from ooni.reporter import YAMLReporter, OONIBReporter from ooni.nettest import NetTestLoader, MissingRequiredOption @@ -141,13 +141,17 @@ def runWithDirector(): deck.loadDeck(global_options['testdeck']) else: log.debug("No test deck detected") + test_file = nettest_to_path(global_options['test_file']) net_test_loader = NetTestLoader(global_options['subargs'], - test_file=global_options['test_file']) + test_file=test_file) deck.insert(net_test_loader) - except MissingRequiredOption, option_name: + except errors.MissingRequiredOption, option_name: log.err('Missing required option: "%s"' % option_name) print net_test_loader.usageOptions().getUsage() sys.exit(2) + except errors.NetTestNotFound, path: + log.err('Requested NetTest file not found (%s)' % path) + sys.exit(3) except usage.UsageError, e: log.err(e) print net_test_loader.usageOptions().getUsage() diff --git a/ooni/settings.py b/ooni/settings.py index 227eb34..7d8a7bd 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -33,7 +33,7 @@ class OConfig(object): self.data_directory = self.advanced['data_dir'] else: self.data_directory = '/usr/share/ooni/' - self.nettest_directory = os.path.join(self.data_directory, 'nettests') + self.nettest_directory = abspath(os.path.join(__file__, '..', 'nettests')) self.ooni_home = os.path.join(expanduser('~'), '.ooni') self.inputs_directory = os.path.join(self.ooni_home, 'inputs')

1 0

[ooni-probe/master] Merge pull request #192 from TheTorProject/feature/move_nettests
by art＠torproject.org 12 Sep '13

12 Sep '13

commit 76b79c5d9a3de11d709de84588f025cdfde11b22 Merge: ee3911f 0d33427 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Sep 12 04:03:27 2013 -0700 Merge pull request #192 from TheTorProject/feature/move_nettests Feature/move nettests README.md | 2 +- Vagrantfile | 2 +- data/nettests/blocking/__init__.py | 1 - data/nettests/blocking/dnsconsistency.py | 175 ----- data/nettests/blocking/http_requests.py | 129 ---- data/nettests/blocking/tcpconnect.py | 69 -- .../experimental/bridge_reachability/bridget.py | 462 ----------- .../experimental/bridge_reachability/echo.py | 132 ---- data/nettests/experimental/chinatrigger.py | 108 --- data/nettests/experimental/dns_injection.py | 63 -- data/nettests/experimental/domclass_collector.py | 33 - .../experimental/http_filtering_bypassing.py | 84 -- .../experimental/http_keyword_filtering.py | 45 -- data/nettests/experimental/http_trix.py | 47 -- .../experimental/http_uk_mobile_networks.py | 85 -- data/nettests/experimental/keyword_filtering.py | 52 -- data/nettests/experimental/parasitictraceroute.py | 129 ---- data/nettests/experimental/script.py | 90 --- data/nettests/experimental/squid.py | 117 --- data/nettests/experimental/tls_handshake.py | 809 -------------------- data/nettests/manipulation/captiveportal.py | 650 ---------------- data/nettests/manipulation/daphne.py | 119 --- data/nettests/manipulation/dnsspoof.py | 75 -- .../manipulation/http_header_field_manipulation.py | 190 ----- data/nettests/manipulation/http_host.py | 152 ---- .../manipulation/http_invalid_request_line.py | 108 --- data/nettests/manipulation/traceroute.py | 144 ---- data/nettests/scanning/http_url_list.py | 98 --- data/nettests/third_party/Makefile | 3 - data/nettests/third_party/README | 14 - data/nettests/third_party/netalyzr.py | 58 -- decks/basic.deck | 4 +- decks/before_i_commit.testdeck | 8 +- decks/short_no_root.deck | 10 +- docs/source/index.rst | 16 +- docs/source/tests/dnsconsistency.rst | 4 +- docs/source/tests/http_requests.rst | 6 +- ooni/deck.py | 24 +- ooni/errors.py | 6 + ooni/nettests/blocking/__init__.py | 1 + ooni/nettests/blocking/dnsconsistency.py | 175 +++++ ooni/nettests/blocking/http_requests.py | 129 ++++ ooni/nettests/blocking/tcpconnect.py | 69 ++ .../experimental/bridge_reachability/bridget.py | 462 +++++++++++ .../experimental/bridge_reachability/echo.py | 132 ++++ ooni/nettests/experimental/chinatrigger.py | 108 +++ ooni/nettests/experimental/dns_injection.py | 63 ++ ooni/nettests/experimental/domclass_collector.py | 33 + .../experimental/http_filtering_bypassing.py | 84 ++ .../experimental/http_keyword_filtering.py | 45 ++ ooni/nettests/experimental/http_trix.py | 47 ++ .../experimental/http_uk_mobile_networks.py | 85 ++ ooni/nettests/experimental/keyword_filtering.py | 52 ++ ooni/nettests/experimental/parasitictraceroute.py | 129 ++++ ooni/nettests/experimental/script.py | 90 +++ ooni/nettests/experimental/squid.py | 117 +++ ooni/nettests/experimental/tls_handshake.py | 809 ++++++++++++++++++++ ooni/nettests/manipulation/captiveportal.py | 650 ++++++++++++++++ ooni/nettests/manipulation/daphne.py | 119 +++ ooni/nettests/manipulation/dnsspoof.py | 75 ++ .../manipulation/http_header_field_manipulation.py | 190 +++++ ooni/nettests/manipulation/http_host.py | 152 ++++ .../manipulation/http_invalid_request_line.py | 108 +++ ooni/nettests/manipulation/traceroute.py | 144 ++++ ooni/nettests/scanning/http_url_list.py | 98 +++ ooni/nettests/third_party/Makefile | 3 + ooni/nettests/third_party/README | 14 + ooni/nettests/third_party/netalyzr.py | 58 ++ ooni/oonicli.py | 10 +- ooni/settings.py | 2 +- 70 files changed, 4304 insertions(+), 4272 deletions(-)

1 0