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

[oonib/master] Run coveralls when the tests have been run.
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 458b71ae71be0bee8fc2ba9b9109377d127e7620 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 28 19:27:35 2014 +0200 Run coveralls when the tests have been run. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0509603..b6617b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,4 +42,4 @@ script: - echo "Build successful." - $(which coverage) run $(which trial) oonib after_success: - - pip install coveralls + - coveralls

1 0

[oonib/master] Update Tor to latest stable release
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 1e5e851b8e104ff7efb1b67d1a85c3d201333467 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 2 14:00:25 2014 +0200 Update Tor to latest stable release --- scripts/build_tor2web_tor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_tor2web_tor.sh b/scripts/build_tor2web_tor.sh index 35daf69..e23a245 100755 --- a/scripts/build_tor2web_tor.sh +++ b/scripts/build_tor2web_tor.sh @@ -4,7 +4,7 @@ OPENSSL_VERSION=1.0.1e LIBEVENT_VERSION=2.0.21-stable ZLIB_VERSION=1.2.8 -TOR_VERSION=0.2.4.20 +TOR_VERSION=0.2.4.22 ZLIB_SHA256=36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d SCRIPT_ROOT=`pwd`

1 0

[oonib/master] Fix check condition inside of build_tor2web script.
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 06ae860106c30960475103a0c28ae49100347b63 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 2 13:32:56 2014 +0200 Fix check condition inside of build_tor2web script. --- scripts/build_tor2web_tor.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_tor2web_tor.sh b/scripts/build_tor2web_tor.sh index cebc55f..35daf69 100755 --- a/scripts/build_tor2web_tor.sh +++ b/scripts/build_tor2web_tor.sh @@ -19,10 +19,10 @@ https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.t… https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.t…" -if [ command -v shasum ]; then +if [ `command -v shasum` ]; then SHA256SUM='shasum -a 256' fi -if [ command -v sha256sum ]; then +if [ `command -v sha256sum` ]; then SHA256SUM='sha256sum' fi if [ ! $SHA256SUM ]; then

1 0

[oonib/master] Detect which command to run for computing sha256 sum.
by art＠torproject.org 28 Aug '14

28 Aug '14

commit 4e10fff9cb7a02c4db4704d91aa40b9461eb0301 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jun 2 12:34:59 2014 +0200 Detect which command to run for computing sha256 sum. --- scripts/build_tor2web_tor.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/build_tor2web_tor.sh b/scripts/build_tor2web_tor.sh index b510c51..cebc55f 100755 --- a/scripts/build_tor2web_tor.sh +++ b/scripts/build_tor2web_tor.sh @@ -19,6 +19,17 @@ https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.t… https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.t…" +if [ command -v shasum ]; then + SHA256SUM='shasum -a 256' +fi +if [ command -v sha256sum ]; then + SHA256SUM='sha256sum' +fi +if [ ! $SHA256SUM ]; then + echo "Could not find a suitable command for computing sha256 hash!"; + exit; +fi + # get key for nickm (libevent) gpg --fingerprint 0xb35bf85bf19489d04e28c33c21194ebb165733ea if [ $? -ne 0 ]; then @@ -70,7 +81,7 @@ cd libevent-$LIBEVENT_VERSION # set up zlib cd $SCRIPT_ROOT -echo "$ZLIB_SHA256 zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c +echo "$ZLIB_SHA256 zlib-$ZLIB_VERSION.tar.gz" | $SHA256SUM -c if [ $? -ne 0 ]; then exit ;fi tar xfz zlib-$ZLIB_VERSION.tar.gz

1 0

[oonib/master] Add test helper that can be used to discover the resolver being used by a probe.
by art＠torproject.org 28 Aug '14

28 Aug '14

commit df43691bedae4e5024aa39d6b10d47b99dc946e4 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jun 25 15:43:28 2014 +0200 Add test helper that can be used to discover the resolver being used by a probe. --- oonib.conf.example | 6 ++++++ oonib/oonibackend.py | 37 +++++++++++++++++++++++++------------ oonib/testhelpers/dns_helpers.py | 29 ++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 13 deletions(-) diff --git a/oonib.conf.example b/oonib.conf.example index c25d405..6b07414 100644 --- a/oonib.conf.example +++ b/oonib.conf.example @@ -52,6 +52,12 @@ helpers: tcp_port: 57005 resolver_address: '8.8.8.8:53' + dns_discovery: + address: null + udp_port: 53 + tcp_port: 53 + resolver_address: null + ssl: address: null private_key: 'private.key' diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index 3e6598c..2a9fa7d 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -10,13 +10,9 @@ from twisted.application import internet, service from twisted.names import dns -from cyclone import web - from oonib.testhelpers import dns_helpers, ssl_helpers from oonib.testhelpers import http_helpers, tcp_helpers -from oonib import log - from oonib.config import config if config.main.uid and config.main.gid: @@ -30,42 +26,59 @@ serviceCollection = service.IServiceCollection(application) if config.helpers['ssl'].port: print "Starting SSL helper on %s" % config.helpers['ssl'].port ssl_helper = internet.SSLServer(int(config.helpers['ssl'].port), - http_helpers.HTTPReturnJSONHeadersHelper(), - ssl_helpers.SSLContext(config)) + http_helpers.HTTPReturnJSONHeadersHelper(), + ssl_helpers.SSLContext(config)) ssl_helper.setServiceParent(serviceCollection) # Start the DNS Server related services if config.helpers['dns'].tcp_port: print "Starting TCP DNS Helper on %s" % config.helpers['dns'].tcp_port tcp_dns_helper = internet.TCPServer(int(config.helpers['dns'].tcp_port), - dns_helpers.DNSTestHelper()) + dns_helpers.DNSTestHelper()) tcp_dns_helper.setServiceParent(serviceCollection) if config.helpers['dns'].udp_port: print "Starting UDP DNS Helper on %s" % config.helpers['dns'].udp_port udp_dns_factory = dns.DNSDatagramProtocol(dns_helpers.DNSTestHelper()) udp_dns_helper = internet.UDPServer(int(config.helpers['dns'].udp_port), - udp_dns_factory) + udp_dns_factory) udp_dns_helper.setServiceParent(serviceCollection) +if config.helpers['dns_discovery'].udp_port: + print ("Starting UDP DNS Discovery Helper on %s" % + config.helpers['dns_discovery'].udp_port) + udp_dns_discovery = internet.UDPServer(int(config.helpers['dns_discovery'].udp_port), + dns.DNSDatagramProtocol( + dns_helpers.DNSResolverDiscovery() + )) + udp_dns_discovery.setServiceParent(serviceCollection) + +if config.helpers['dns_discovery'].tcp_port: + print ("Starting TCP DNS Discovery Helper on %s" % + config.helpers['dns_discovery'].tcp_port) + tcp_dns_discovery = internet.TCPServer(int(config.helpers['dns_discovery'].tcp_port), + dns_helpers.DNSResolverDiscovery()) + tcp_dns_discovery.setServiceParent(serviceCollection) + + # XXX this needs to be ported # Start the OONI daphn3 backend if config.helpers['daphn3'].port: print "Starting Daphn3 helper on %s" % config.helpers['daphn3'].port daphn3_helper = internet.TCPServer(int(config.helpers['daphn3'].port), - tcp_helpers.Daphn3Server()) + tcp_helpers.Daphn3Server()) daphn3_helper.setServiceParent(serviceCollection) if config.helpers['tcp-echo'].port: print "Starting TCP echo helper on %s" % config.helpers['tcp-echo'].port tcp_echo_helper = internet.TCPServer(int(config.helpers['tcp-echo'].port), - tcp_helpers.TCPEchoHelper()) + tcp_helpers.TCPEchoHelper()) tcp_echo_helper.setServiceParent(serviceCollection) if config.helpers['http-return-json-headers'].port: print "Starting HTTP return request helper on %s" % config.helpers['http-return-json-headers'].port http_return_request_helper = internet.TCPServer( - int(config.helpers['http-return-json-headers'].port), - http_helpers.HTTPReturnJSONHeadersHelper()) + int(config.helpers['http-return-json-headers'].port), + http_helpers.HTTPReturnJSONHeadersHelper()) http_return_request_helper.setServiceParent(serviceCollection) diff --git a/oonib/testhelpers/dns_helpers.py b/oonib/testhelpers/dns_helpers.py index fbf932b..ff31dde 100644 --- a/oonib/testhelpers/dns_helpers.py +++ b/oonib/testhelpers/dns_helpers.py @@ -1,4 +1,4 @@ -from twisted.names import client, server +from twisted.names import client, server, dns from oonib.config import config @@ -21,3 +21,30 @@ class DNSTestHelper(server.DNSServerFactory): def handleQuery(self, message, protocol, address): server.DNSServerFactory.handleQuery(self, message, protocol, address) + + +class DNSResolverDiscovery(server.DNSServerFactory): + """ + This test helper is used to discover the IP address of the resolver being + used by a ooniprobe client. + To use it you should set it up on a machine that has been delegated as the + authoritative name server for a specific subdomain. + You can do so by adding the following to your zone file: + + mysubdomain IN NS ns.mysubdomain.example.org. + ns.mysubdomain.example.org IN A 10.42.42.42 + + Replace 10.42.42.42 with the IP address of the machine running oonib. + + You will then be able to perform A lookups on subdomains of + mysubdomain.example.org and retrieve in the query answer section the IP + address of the resolver that was used for performing the request. + """ + def handleQuery(self, message, protocol, address): + query = message.queries[0] + if query.type == dns.A: + ans = dns.RRHeader(bytes(query.name), + payload=dns.Record_A(bytes(address[0]), 0)) + message.answers = [ans] + message.answer = 1 + self.sendReply(protocol, message, address)

1 0

[stem/master] Don't fail validation if consensus method 1 isn't present
by atagar＠torproject.org 28 Aug '14

28 Aug '14

commit b3820fe7859fa9666b1352ecdb3916ab51ec7b6d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 28 09:48:25 2014 -0700 Don't fail validation if consensus method 1 isn't present Change from proposal 215. Tor no longer requires that consensus method 1 is around as a fallback. Pointed out thanks to Sebastian. --- docs/change_log.rst | 1 + stem/descriptor/networkstatus.py | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index b52a377..4ec16a0 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -43,6 +43,7 @@ The following are only available within Stem's `git repository * **Descriptors** * Improved speed for parsing consensus documents by around 30% (:trac:`12859`) + * Don't fail if consensus method 1 is not present, as it is no longer required (:spec:`fc8a6f0`) * **Utilities** diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 115f07b..c861236 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -690,9 +690,6 @@ class _DocumentHeader(object): raise ValueError("A network status document's consensus-methods must be a list of integer values, but was '%s'" % value) self.consensus_methods = consensus_methods - - if validate and not (1 in self.consensus_methods): - raise ValueError('Network status votes must include consensus-method version 1') elif keyword == 'consensus-method': # "consensus-method" Integer

1 0

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

28 Aug '14

commit 3ed9a3c5b5c6be29c0e674a94dd7cef41e28a39c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 14:45:38 2014 +0000 Update translations for tor-launcher-network-settings --- it/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 0360233..69b1821 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?"> <!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.configurePrompt2 "Ho bisogno di configurare un ponte o un settaggio proxy"> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor."> <!ENTITY torSettings.connectPrompt3 "Questo funzionerà nella maggior parte delle situazioni.">

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 e8d43396cb75e04531a749ec62ad56667197eb23 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 14:45:34 2014 +0000 Update translations for tor-launcher-properties_completed --- it/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index 65fbaaf..b5729ed 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Fatto torlauncher.forAssistance=Per richiedere assistenza, contattare %S -torlauncher.copiedNLogMessages=Copia completa. % S un messaggio di log è pronto per essere incollato in un editor di testo o in un messaggio e-mail. +torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail. torlauncher.bootstrapStatus.conn_dir=Connessione ad una directory dei relay torlauncher.bootstrapStatus.handshake_dir=Sto creando una connessione cifrata alla directory

1 0

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

28 Aug '14

commit a82c28b1106377d1ed4b4e8abb27e50288e526c2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 28 14:45:31 2014 +0000 Update translations for tor-launcher-properties --- it/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index c6b10d6..b5729ed 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Fatto torlauncher.forAssistance=Per richiedere assistenza, contattare %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail. torlauncher.bootstrapStatus.conn_dir=Connessione ad una directory dei relay torlauncher.bootstrapStatus.handshake_dir=Sto creando una connessione cifrata alla directory

1 0

[tor/master] Resume expanding abbreviations for command-line options
by nickm＠torproject.org 28 Aug '14

28 Aug '14

commit 37a76d75dd38a1ebd45627bb6e29e40f60917188 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Aug 27 06:10:35 2014 -0400 Resume expanding abbreviations for command-line options The fix for bug 4647 accidentally removed our hack from bug 586 that rewrote HashedControlPassword to __HashedControlSessionPassword when it appears on the commandline (which allowed the user to set her own HashedControlPassword in the torrc file while the controller generates a fresh session password for each run). Fixes bug 12948; bugfix on 0.2.5.1-alpha. --- changes/bug12948 | 8 ++++++++ src/or/config.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug12948 b/changes/bug12948 new file mode 100644 index 0000000..431c0a1 --- /dev/null +++ b/changes/bug12948 @@ -0,0 +1,8 @@ + o Major bugfixes: + - Resume expanding abbreviations for command-line options. The fix + for bug 4647 accidentally removed our hack from bug 586 that rewrote + HashedControlPassword to __HashedControlSessionPassword when it + appears on the commandline (which allowed the user to set her + own HashedControlPassword in the torrc file while the controller + generates a fresh session password for each run). Fixes bug 12948; + bugfix on 0.2.5.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 6bb6209..921503b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1932,7 +1932,8 @@ config_parse_commandline(int argc, char **argv, int ignore_errors, } param = tor_malloc_zero(sizeof(config_line_t)); - param->key = is_cmdline ? tor_strdup(argv[i]) : tor_strdup(s); + param->key = is_cmdline ? tor_strdup(argv[i]) : + tor_strdup(config_expand_abbrev(&options_format, s, 1, 1)); param->value = arg; param->command = command; param->next = NULL;

1 0