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

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 5cc0e8b76f0794ce54a97df87a419edc11a00163 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 22:15:38 2014 +0000 Update translations for tor-launcher-network-settings --- pt_BR/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index 1cc5f0c..b78b35c 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "A conexão internet deste computador encontra-se sob censura ou proxy."> +<!ENTITY torSettings.configurePrompt2 "É preciso configurar bridge ou "> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> <!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Através do Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envie um e-mail para bridges(a)torproject.org com a mensagem 'get bridges'.  Contudo, para tornar mais difícil para um invasor descobrir uma grande quantidade de endereços, você deve enviar esse pedido a partir de um dos seguintes provedores de e-mail (listados em ordem de preferência)."> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Pelo serviço de assistência"> <!ENTITY torsettings.bridgeHelp4 "Como última opção, você pode solicitar endereços de pontes enviando uma mensagem de e-mail educada para help(a)rt.torproject.org. . Note que uma pessoa terá que responder a cada solicitação">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 2fc2e34b4685c388f7f57dd912f527beabc90c85 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 22:15:34 2014 +0000 Update translations for tor-launcher-properties_completed --- pt_BR/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index a0ec914..0741ccb 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Terminado torlauncher.forAssistance=Para assistência, contacte -torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do tor log estão prontas para serem copiadas em um editor de texto ou em uma mensagem de e-mail. +torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do Tor log estão prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail. torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de retransmissores torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografada

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 28 Aug '14

28 Aug '14

commit 16615c83fee2120c14612785744e0bca75397364 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 22:15:31 2014 +0000 Update translations for tor-launcher-properties --- pt_BR/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index aa1ca8a..0741ccb 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Terminado torlauncher.forAssistance=Para assistência, contacte -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do Tor log estão prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail. torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de retransmissores torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografada

1 0

r26930: {website} fix broken link noticed by seth (website/trunk/docs/en)
by Roger Dingledine 28 Aug '14

28 Aug '14

Author: arma Date: 2014-08-28 20:13:12 +0000 (Thu, 28 Aug 2014) New Revision: 26930 Modified: website/trunk/docs/en/faq.wml Log: fix broken link noticed by seth Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-08-23 20:33:42 UTC (rev 26929) +++ website/trunk/docs/en/faq.wml 2014-08-28 20:13:12 UTC (rev 26930) @@ -4188,9 +4188,9 @@ <p> We don't want to encourage people to use paths longer than this — it increases load on the network without (as far as we can tell) providing - any more security. Remember that -<a href="https://svn.torproject.org/svn/tor/trunk/doc/design-paper/tor-design.html#s…"> - the best way to attack Tor is to attack the endpoints and ignore the middle + any more security. Remember that +<a href="https://svn.torproject.org/svn/projects/design-paper/tor-design.html#subsec…">the +best way to attack Tor is to attack the endpoints and ignore the middle of the path</a>. Also, using paths longer than 3 could harm anonymity, first because it makes <a href="http://freehaven.net/anonbib/#ccs07-doa">"denial of

1 0

[ooni-probe/master] The measurement timeout now can be set by a nettest
by art＠torproject.org 28 Aug '14

28 Aug '14

commit e9dfc890a4f465817e9a46a61ca492f7c4dadcfa Author: kudrom <kudrom(a)riseup.net> Date: Fri Aug 22 16:00:14 2014 +0200 The measurement timeout now can be set by a nettest --- ooni/nettests/blocking/bridge_reachability.py | 6 ------ ooni/tasks.py | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index efe0b7b..9957430 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -49,12 +49,6 @@ class BridgeReachability(nettest.NetTestCase): self.tor_progress = 0 self.timeout = int(self.localOptions['timeout']) - if self.timeout > config.advanced.measurement_timeout: - log.err("The measurement timeout is less than the bridge reachability test timeout") - log.err("Adjust your ooniprobe.conf file by setting the " - "advanced: measurement_timeout: value to %d" % self.timeout) - raise errors.InvalidConfigFile("advanced->measurement_timeout < %d" % self.timeout) - self.report['error'] = None self.report['success'] = None self.report['timeout'] = self.timeout diff --git a/ooni/tasks.py b/ooni/tasks.py index a869254..f2f4f75 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -113,7 +113,10 @@ class Measurement(TaskWithTimeout): self.netTestMethod = getattr(self.testInstance, test_method) - if config.advanced.measurement_timeout: + if 'timeout' in dir(test_instance): + if isinstance(test_instance.timeout, int) or isinstance(test_instance.timeout, float): + self.timeout = test_instance.timeout + elif config.advanced.measurement_timeout: self.timeout = config.advanced.measurement_timeout TaskWithTimeout.__init__(self)

1 0

[ooni-probe/master] PEP8 cleanup
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 93fdf3a412069992530bf8d2f93e4254fabd0742 Author: kudrom <kudrom(a)riseup.net> Date: Fri Aug 22 16:00:47 2014 +0200 PEP8 cleanup --- ooni/tasks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/tasks.py b/ooni/tasks.py index f2f4f75..650e0b0 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -4,6 +4,7 @@ from ooni import errors as e from ooni.settings import config from twisted.internet import defer, reactor + class BaseTask(object): _timer = None @@ -60,6 +61,7 @@ class BaseTask(object): """ pass + class TaskWithTimeout(BaseTask): timeout = 30 # So that we can test the callLater calls @@ -87,6 +89,7 @@ class TaskWithTimeout(BaseTask): self._timer = self.clock.callLater(self.timeout, self._timedOut) return BaseTask.start(self) + class Measurement(TaskWithTimeout): def __init__(self, test_instance, test_method, test_input): """ @@ -131,7 +134,6 @@ class Measurement(TaskWithTimeout): class ReportEntry(TaskWithTimeout): - def __init__(self, reporter, entry): self.reporter = reporter self.entry = entry

1 0

[ooni-probe/master] Merge branch 'feature/12919'
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 8f11b7493b6c4d6c0b8ec2855d97e25c8e003074 Merge: 9442790 93fdf3a Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Aug 25 01:27:48 2014 +0200 Merge branch 'feature/12919' * feature/12919: PEP8 cleanup The measurement timeout now can be set by a nettest ooni/nettests/blocking/bridge_reachability.py | 6 ------ ooni/tasks.py | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-)

1 0

[ooni-probe/master] Make links RST style.
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 2ee089bbb1069fd7327e333d08c0cd0c06c33f57 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 28 19:43:11 2014 +0200 Make links RST style. --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 12d3fff..78973da 100644 --- a/README.rst +++ b/README.rst @@ -93,7 +93,7 @@ On debian based systems this can be done with:: Other platforms (with Vagrant) ------------------------------ -1. [Install Vagrant](https://www.vagrantup.com/downloads.html) and [Install Virtualbox](https://www.virtualbox.org/wiki/Downloads) +1. Install Vagrant (https://www.vagrantup.com/downloads.html) and Install Virtualbox (https://www.virtualbox.org/wiki/Downloads) 2. On OSX: @@ -233,7 +233,7 @@ See option advanced.obfsproxy_binary, in ooniprobe.conf. Install the latest version of obfsproxy for your platform. -[Download Obfsproxy](https://www.torproject.org/projects/obfsproxy.html.en) +Download Obfsproxy: https://www.torproject.org/projects/obfsproxy.html.en Setting capabilities on your virtualenv python binary ===================================================== @@ -249,7 +249,7 @@ Reporting bugs ============== You can report bugs and issues you find with ooni-probe on The Tor Projec issue -tracker [filing them under the "Ooni" component](https://trac.torproject.org/projects/tor/newticket?component=Oon…. +tracker filing them under the "Ooni" component: https://trac.torproject.org/projects/tor/newticket?component=Ooni. You can either register an account or use the group account "cypherpunks" with password "writecode". @@ -263,13 +263,13 @@ You can download the code for ooniprobe from the following git repository:: git clone https://git.torproject.org/ooni-probe.git -It is also viewable on the web via [https://gitweb.torproject.org/ooni-probe.git](https://git.torproject.org/oo…. +It is also viewable on the web via: https://gitweb.torproject.org/ooni-probe.git. You should then submit patches for review as pull requests to this github repository: https://github.com/TheTorProject/ooni-probe -Read this article to learn how to [create a pull request on github](https://help.github.com/articles/creating-a-pull-request). +Read this article to learn how to create a pull request on github (https://help.github.com/articles/creating-a-pull-request) If you prefer not to use github (or don't have an account), you may also submit patches as attachments to tickets.

1 0

[oonib/master] Fix markup
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 59871b62e01d5f579d0936cea30f7f6e8bf56fce Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Aug 28 19:29:53 2014 +0200 Fix markup --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 2b4873d..27df278 100644 --- a/README.rst +++ b/README.rst @@ -20,7 +20,7 @@ Dependencies and Installation ============================= Distro dependencies (Debian) -------------------=--------- +---------------------------- There are a few dependencies which we recommend you get from your distribution's archives::

1 0

[oonib/master] Improved http error handling, the test coverage and some cleanups
by art＠torproject.org 28 Aug '14

28 Aug '14

commit df768a6c02bef81a7d4f58e14057e74cfcc2eca5 Author: kudrom <kudrom(a)riseup.net> Date: Sat Jul 5 15:52:58 2014 +0200 Improved http error handling, the test coverage and some cleanups --- .gitignore | 2 ++ oonib/api.py | 2 ++ oonib/handlers.py | 4 +++- oonib/main/api.py | 8 ++++++++ oonib/main/handlers.py | 19 +++++++++++++++++++ oonib/test/handler_helpers.py | 8 ++++++++ oonib/test/test_global_handler.py | 19 +++++++++++++++++++ oonib/test/test_report.py | 5 +++++ 8 files changed, 66 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 628ccf5..7fc5cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ installed-files.txt # client config: oonib.conf + +oonib.pid diff --git a/oonib/api.py b/oonib/api.py index 2427837..baa151b 100644 --- a/oonib/api.py +++ b/oonib/api.py @@ -1,5 +1,6 @@ from cyclone import web +from oonib.main.api import mainAPI from oonib.deck.api import deckAPI from oonib.report.api import reportAPI from oonib.input.api import inputAPI @@ -24,4 +25,5 @@ if config.main.policy_file: if config.main.bouncer_file: ooniBouncer = web.Application(bouncerAPI, debug=True, name='bouncer') +ooniBackendAPI += mainAPI ooniBackend = web.Application(ooniBackendAPI, debug=True, name='collector') diff --git a/oonib/handlers.py b/oonib/handlers.py index f92d684..bbf8ade 100644 --- a/oonib/handlers.py +++ b/oonib/handlers.py @@ -9,8 +9,10 @@ from oonib import log class OONIBHandler(web.RequestHandler): def write_error(self, status_code, exception=None, **kw): self.set_status(status_code) - if hasattr(exception, 'log_message'): + if hasattr(exception, 'log_message') and exception.log_message is not None: self.write({'error': exception.log_message}) + elif 400 <= status_code < 600: + self.write({'error': status_code}) else: log.error(exception) self.write({'error': 'error'}) diff --git a/oonib/main/__init__.py b/oonib/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/oonib/main/api.py b/oonib/main/api.py new file mode 100644 index 0000000..5bc9761 --- /dev/null +++ b/oonib/main/api.py @@ -0,0 +1,8 @@ +from cyclone import web + +from oonib.main import handlers +from oonib.config import config + +mainAPI = [ + (r"/.*", handlers.OONIBGlobalHandler) +] diff --git a/oonib/main/handlers.py b/oonib/main/handlers.py new file mode 100644 index 0000000..37810e7 --- /dev/null +++ b/oonib/main/handlers.py @@ -0,0 +1,19 @@ +from oonib.handlers import OONIBHandler + + +class OONIBGlobalHandler(OONIBHandler): + """ + Global handler to catch all orphaned requests. + """ + def default(self): + # XXX: Waiting to a stable release of cyclone which implements the default handler + return self.write_error(404) + + def get(self): + return self.default() + + def post(self): + return self.default() + + def options(self): + return self.default() diff --git a/oonib/test/handler_helpers.py b/oonib/test/handler_helpers.py index 2d704a2..843d5c5 100644 --- a/oonib/test/handler_helpers.py +++ b/oonib/test/handler_helpers.py @@ -1,5 +1,7 @@ +import os import socket import json +import shutil from twisted.internet import reactor, defer from twisted.trial import unittest @@ -38,11 +40,17 @@ class HandlerTestCase(unittest.TestCase): return self._port def setUp(self, *args, **kw): + self.filenames = set() + self.directories = set() if self.app: self._listener = reactor.listenTCP(self.port, self.app) return unittest.TestCase.setUp(self, *args, **kw) def tearDown(self): + for filename in self.filenames: + os.remove(filename) + for dir in self.directories: + shutil.rmtree(dir) if self._listener: for report in reports.values(): try: diff --git a/oonib/test/test_global_handler.py b/oonib/test/test_global_handler.py new file mode 100644 index 0000000..675cf6c --- /dev/null +++ b/oonib/test/test_global_handler.py @@ -0,0 +1,19 @@ +import json + +from twisted.internet import defer + +from cyclone import web + +from oonib.test.handler_helpers import HandlerTestCase +from oonib.main.api import mainAPI + + +class GlobalHandler(HandlerTestCase): + app = web.Application(mainAPI, name='mainAPI') + + @defer.inlineCallbacks + def test_global_handler(self): + response = yield self.request("/foo") + res = json.loads(response.body) + self.assertIn("error", res.keys()) + self.assertIn(404, res.values()) diff --git a/oonib/test/test_report.py b/oonib/test/test_report.py index 9ed02de..698b667 100644 --- a/oonib/test/test_report.py +++ b/oonib/test/test_report.py @@ -87,6 +87,7 @@ class TestReport(HandlerTestCase): response_body = json.loads(response.body) self.assertIn('backend_version', response_body) self.assertIn('report_id', response_body) + self.filenames.add(response_body['report_id']) @defer.inlineCallbacks def test_create_invalid_report(self): @@ -121,6 +122,7 @@ class TestReport(HandlerTestCase): response_body = json.loads(response.body) with open(report_id) as f: + self.filenames.add(report_id) written_report = yaml.safe_load_all(f) written_report_header = written_report.next() @@ -165,9 +167,12 @@ class TestReport(HandlerTestCase): written_report_path = os.path.join(written_report_header['probe_cc'], report_file_name(written_report_header)) with open(written_report_path) as f: + self.filenames.add(written_report_path) written_report = yaml.safe_load_all(f) written_report.next() for i in range(report_entry_count): self.assertEqual(yaml.safe_load(sample_report_entry), written_report.next()) + + self.directories.add('ZZ')

1 0