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

[tor-browser-bundle/master] Bug 11156: Fix additional case of spurious PT startup errors
by mikeperry＠torproject.org 23 Apr '14

23 Apr '14

commit cf25b42ce0d6144379cb9e1aa82216523bb73592 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 23 17:12:50 2014 +0200 Bug 11156: Fix additional case of spurious PT startup errors --- gitian/patches/bug11156.patch | 87 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch index ba6e266..33dacad 100644 --- a/gitian/patches/bug11156.patch +++ b/gitian/patches/bug11156.patch @@ -162,3 +162,90 @@ index cb39729..d78c7bb 100644 -- 1.8.1.2 +From 1a3eb5c72dd0feb43a542ca465c57dd0801ff7cc Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Tue, 8 Apr 2014 16:59:46 +0100 +Subject: [PATCH 1/4] Don't halt bootstrap to figure out if we should restart + PT proxies. + +Instead, figure out if we should restart PT proxies _immediately_ after +we re-read the config file. +--- + changes/bug11156 | 5 +++++ + src/or/config.c | 6 ++++++ + src/or/transports.c | 3 +-- + 3 files changed, 12 insertions(+), 2 deletions(-) + create mode 100644 changes/bug11156 + +diff --git a/changes/bug11156 b/changes/bug11156 +new file mode 100644 +index 0000000..bb20ed1e +--- /dev/null ++++ b/changes/bug11156 +@@ -0,0 +1,5 @@ ++ o Minor bugfixes (clients): ++ - Fix a bug where a client-side Tor with pluggable transports ++ would take 60 seconds to bootstrap if a config re-read was ++ triggered at just the right timing during bootstrap. Refixes bug ++ 11156; bugfix on 0.2.5.3-alpha. +\ No newline at end of file +diff --git a/src/or/config.c b/src/or/config.c +index dbf643c..c2d6545 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -1433,6 +1433,12 @@ options_act(const or_options_t *old_options) + sweep_transport_list(); + sweep_proxy_list(); + ++ /* Start the PT proxy configuration. By doing this configuration ++ here, we also figure out which proxies need to be restarted and ++ which not. */ ++ if (pt_proxies_configuration_pending()) ++ pt_configure_remaining_proxies(); ++ + /* Bail out at this point if we're not going to be a client or server: + * we want to not fork, and to log stuff to stderr. */ + if (!running_tor) +diff --git a/src/or/transports.c b/src/or/transports.c +index 7e496fe..e1876d6 100644 +--- a/src/or/transports.c ++++ b/src/or/transports.c +@@ -534,8 +534,7 @@ launch_managed_proxy(managed_proxy_t *mp) + } + + /** Check if any of the managed proxies we are currently trying to +- * configure have anything new to say. This is called from +- * run_scheduled_events(). */ ++ * configure has anything new to say. */ + void + pt_configure_remaining_proxies(void) + { +-- +1.8.1.2 + +From 4719a2f5248b8cf6d70daef91fd1cf9fd65628f4 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Mon, 21 Apr 2014 14:17:35 +0300 +Subject: [PATCH 4/4] fixup! Don't halt bootstrap to figure out if we should + restart PT proxies. + +--- + src/or/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/or/config.c b/src/or/config.c +index c2d6545..551b09f 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -1436,7 +1436,7 @@ options_act(const or_options_t *old_options) + /* Start the PT proxy configuration. By doing this configuration + here, we also figure out which proxies need to be restarted and + which not. */ +- if (pt_proxies_configuration_pending()) ++ if (pt_proxies_configuration_pending() && !net_is_disabled()) + pt_configure_remaining_proxies(); + + /* Bail out at this point if we're not going to be a client or server: +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Bump nightly to new FF24.5.0ESR.
by mikeperry＠torproject.org 23 Apr '14

23 Apr '14

commit b168a83c5266291b63294659c98b322904d805ca Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 23 08:29:10 2014 -0700 Bump nightly to new FF24.5.0ESR. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f483670..f602aa2 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.4.0esr +FIREFOX_VERSION=24.5.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master

1 0

[torspec/master] Clarify that 0 is the only reserved circID value
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 78de0f958204b463e6dbf64831d925a21c4350cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 11:31:27 2014 -0400 Clarify that 0 is the only reserved circID value Fixes 11565. --- tor-spec.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tor-spec.txt b/tor-spec.txt index 604a1e7..2555af4 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -761,6 +761,10 @@ see tor-design.pdf. (An OP with no public key MAY choose any CircID it wishes, since an OP never needs to process a CREATE cell.) + The CircID value 0 is specifically reserved for cells that do not + belong to any circuit: CircID 0 must not be used for circuits. No + other CircID value, including 0x8000 or 0x80000000, is reserved. + 5.1.2. EXTEND and EXTENDED cells To extend an existing circuit, the client sends a EXTEND or EXTENDED2

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 23 Apr '14

23 Apr '14

commit 4cafd927fb3b71d48403bc754d44b9f73de2d672 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 23 15:15:46 2014 +0000 Update translations for torbutton-torbuttonproperties --- fr_CA/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA/torbutton.properties b/fr_CA/torbutton.properties index 95cbdc2..fa3b890 100644 --- a/fr_CA/torbutton.properties +++ b/fr_CA/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Le test automatique de mandataire Tor n'a pas torbutton.prefs.recommended = (recommandé) torbutton.prefs.optional = (optionnel) torbutton.prefs.crucial = (crucial) -torbutton.popup.external.title = Download an external file type? -torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n -torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.external.title = Télécharger un type de fichier externe? +torbutton.popup.external.app = Le navigateur Tor ne peut pas afficher ce fichier. Il vous faudra l'ouvrir avec une autre application.\n\n +torbutton.popup.external.note = Certains types de fichiers peuvent entraîner la connexion d'applications à Internet sans utiliser Tor.\n\n +torbutton.popup.external.suggest = Par sécurité, vous devriez seulement ouvrir les fichiers télécharger quand vous êtes hors ligne, ou en utilisant un CD autonome Tor comme Tails.\n +torbutton.popup.launch = Télécharger le fichier torbutton.popup.cancel = Annuler -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Télécharger automatiquement les fichiers à partir de maintenant torbutton.popup.test.no_http_proxy = Test du mandataire Tor : le mandataire HTTP local n'est pas joignable. Est-ce que Polipo tourne correctement? torbutton.popup.captcha.title = Éviter les catchas de Google? torbutton.popup.captcha.ask = Torbutton a détecté un captcha Google. Voulez-vous être redirigé vers un autre moteur de recherche pour cette recherche?

1 0

[tor/master] Merge remote-tracking branch 'public/bug10268'
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 7a8cac14d52b6e107990cb251bd75b148ef35567 Merge: 6683331 6d0991e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 11:11:08 2014 -0400 Merge remote-tracking branch 'public/bug10268' changes/bug10268 | 6 ++++++ src/or/dnsserv.c | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-)

1 0

[tor/master] Give no answer, not NOTIMPL, for unsupported DNS query types
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 6d0991ea0872bf8a7b093709a4c7bf1619433917 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 22:03:19 2014 -0400 Give no answer, not NOTIMPL, for unsupported DNS query types According to reports, most programs degrade somewhat gracefully on getting no answer for an MX or a CERT for www.example.com, but many flip out completely on a NOTIMPL error. Also, treat a QTYPE_ALL query as just asking for an A record. The real fix here is to implement proposal 219 or something like it. Fixes bug 10268; bugfix on 0.2.0.1-alpha. Based on a patch from "epoch". --- changes/bug10268 | 6 ++++++ src/or/dnsserv.c | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/changes/bug10268 b/changes/bug10268 new file mode 100644 index 0000000..3035e76 --- /dev/null +++ b/changes/bug10268 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - When receing a DNS query for an unsupported type, reply with + no answer rather than with a NOTIMPL error. This behavior isn't + correct either, but it will break fewer client programs, we hope. + Fixes bug 10268; bugfix on 0.2.0.1-alpha. Original patch + from "epoch". diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 4190e9c..ecd45be 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -35,7 +35,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) entry_connection_t *entry_conn; edge_connection_t *conn; int i = 0; - struct evdns_server_question *q = NULL; + struct evdns_server_question *q = NULL, *supported_q = NULL; struct sockaddr_storage addr; struct sockaddr *sa; int addrlen; @@ -87,31 +87,37 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) for (i = 0; i < req->nquestions; ++i) { if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET) continue; + if (! q) + q = req->questions[i]; switch (req->questions[i]->type) { case EVDNS_TYPE_A: case EVDNS_TYPE_AAAA: case EVDNS_TYPE_PTR: - q = req->questions[i]; + /* We always pick the first one of these questions, if there is + one. */ + if (! supported_q) + supported_q = q; + break; default: break; } } + if (supported_q) + q = supported_q; if (!q) { log_info(LD_APP, "None of the questions we got were ones we're willing " "to support. Sending NOTIMPL."); evdns_server_request_respond(req, DNS_ERR_NOTIMPL); return; } - if (q->type != EVDNS_TYPE_A && q->type != EVDNS_TYPE_AAAA) { - tor_assert(q->type == EVDNS_TYPE_PTR); - } /* Make sure the name isn't too long: This should be impossible, I think. */ if (err == DNS_ERR_NONE && strlen(q->name) > MAX_SOCKS_ADDR_LEN-1) err = DNS_ERR_FORMAT; - if (err != DNS_ERR_NONE) { - /* We got an error? Then send back an answer immediately; we're done. */ + if (err != DNS_ERR_NONE || !supported_q) { + /* We got an error? There's no question we're willing to answer? Then + * send back an answer immediately; we're done. */ evdns_server_request_respond(req, err); return; } @@ -126,12 +132,15 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) TO_CONN(conn)->port = port; TO_CONN(conn)->address = tor_dup_addr(&tor_addr); - if (q->type == EVDNS_TYPE_A || q->type == EVDNS_TYPE_AAAA) + if (q->type == EVDNS_TYPE_A || q->type == EVDNS_TYPE_AAAA || + q->type == EVDNS_QTYPE_ALL) { entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE; - else + } else { + tor_assert(q->type == EVDNS_TYPE_PTR); entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; + } - if (q->type == EVDNS_TYPE_A) { + if (q->type == EVDNS_TYPE_A || q->type == EVDNS_QTYPE_ALL) { entry_conn->ipv4_traffic_ok = 1; entry_conn->ipv6_traffic_ok = 0; entry_conn->prefer_ipv6_traffic = 0;

1 0

[tor/master] Merge remote-tracking branch 'public/bug11200'
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 66833311eb5bf717c55637093ec769588a54c11e Merge: 830492f d01cf18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 11:07:52 2014 -0400 Merge remote-tracking branch 'public/bug11200' changes/bug11200 | 5 +++++ src/or/networkstatus.c | 8 ++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/master] should_disable_dir_fetches() now returns 1 if DisableNetwork==1
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit d01cf18ecbb02bca7e4168b28f28d8b84f03da70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 14 10:42:49 2014 -0400 should_disable_dir_fetches() now returns 1 if DisableNetwork==1 This change prevents LD_BUG warnings and bootstrap failure messages when we try to do directory fetches when starting with DisableNetwork == 1, a consensus present, but no descriptors (or insufficient descriptors) yet. Fixes bug 11200 and bug 10405. It's a bugfix on 0.2.3.9-alpha. Thanks to mcs for walking me through the repro instructions! --- changes/bug11200 | 5 +++++ src/or/networkstatus.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug11200 b/changes/bug11200 new file mode 100644 index 0000000..b4b61c9 --- /dev/null +++ b/changes/bug11200 @@ -0,0 +1,5 @@ + - Minor bugfixes: + + - Avoid generating spurious warnings and failure messages when + starting with DisableNetwork enabled. Fixes bug 11200 and bug + 10405; bugfix on 0.2.3.9-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 49478a7..1819c4e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -898,6 +898,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) *msg_out = NULL; } + if (options->DisableNetwork) { + if (msg_out) { + *msg_out = "DisableNetwork is set."; + } + log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)"); + return 1; + } + if (options->UseBridges) { if (!any_bridge_descriptors_known()) { if (msg_out) {

1 0

[tor/master] Don't halt bootstrap to figure out if we should restart PT proxies.
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit bf7cb6acf66abf3a9aa4be6819e6cf160579dab0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 8 16:59:46 2014 +0100 Don't halt bootstrap to figure out if we should restart PT proxies. Instead, figure out if we should restart PT proxies _immediately_ after we re-read the config file. --- changes/bug11156 | 5 +++++ src/or/config.c | 6 ++++++ src/or/transports.c | 3 +-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/bug11156 b/changes/bug11156 new file mode 100644 index 0000000..bb20ed1e --- /dev/null +++ b/changes/bug11156 @@ -0,0 +1,5 @@ + o Minor bugfixes (clients): + - Fix a bug where a client-side Tor with pluggable transports + would take 60 seconds to bootstrap if a config re-read was + triggered at just the right timing during bootstrap. Refixes bug + 11156; bugfix on 0.2.5.3-alpha. \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index dbf643c..551b09f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1433,6 +1433,12 @@ options_act(const or_options_t *old_options) sweep_transport_list(); sweep_proxy_list(); + /* Start the PT proxy configuration. By doing this configuration + here, we also figure out which proxies need to be restarted and + which not. */ + if (pt_proxies_configuration_pending() && !net_is_disabled()) + pt_configure_remaining_proxies(); + /* Bail out at this point if we're not going to be a client or server: * we want to not fork, and to log stuff to stderr. */ if (!running_tor) diff --git a/src/or/transports.c b/src/or/transports.c index 7e496fe..e1876d6 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -534,8 +534,7 @@ launch_managed_proxy(managed_proxy_t *mp) } /** Check if any of the managed proxies we are currently trying to - * configure have anything new to say. This is called from - * run_scheduled_events(). */ + * configure has anything new to say. */ void pt_configure_remaining_proxies(void) {

1 0

[tor/master] Rename the got_hup element of managed proxies.
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit fa0c5da68ba472eed004cd87f198854885cff453 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 8 17:22:36 2014 +0100 Rename the got_hup element of managed proxies. Since we need to toggle that element in non-SIGHUP situations too where the config was re-read (like in SETCONF or RESETCONF). --- src/or/transports.c | 27 ++++++++++++++------------- src/or/transports.h | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index e1876d6..6f478bc 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -554,11 +554,12 @@ pt_configure_remaining_proxies(void) tor_assert(mp->conf_state != PT_PROTO_BROKEN && mp->conf_state != PT_PROTO_FAILED_LAUNCH); - if (mp->got_hup) { - mp->got_hup = 0; + if (mp->was_around_before_config_read) { + /* This proxy is marked by a config read. Check whether we need + to restart it. */ + + mp->was_around_before_config_read = 0; - /* This proxy is marked by a SIGHUP. Check whether we need to - restart it. */ if (proxy_needs_restart(mp)) { log_info(LD_GENERAL, "Preparing managed proxy '%s' for restart.", mp->argv[0]); @@ -1363,14 +1364,12 @@ pt_kickstart_proxy(const smartlist_t *transport_list, managed_proxy_create(transport_list, proxy_argv, is_server); } else { /* known proxy. add its transport to its transport list */ - if (mp->got_hup) { - /* If the managed proxy we found is marked by a SIGHUP, it means - that it's not useless and should be kept. If it's marked for - removal, unmark it and increase the unconfigured proxies so - that we try to restart it if we need to. Afterwards, check if - a transport_t for 'transport' used to exist before the SIGHUP - and make sure it doesn't get deleted because we might reuse - it. */ + if (mp->was_around_before_config_read) { + /* If this managed proxy was around even before we read the + config this time, it means that it was already enabled before + and is not useless and should be kept. If it's marked for + removal, unmark it and make sure that we check whether it + needs to be restarted. */ if (mp->marked_for_removal) { mp->marked_for_removal = 0; check_if_restarts_needed = 1; @@ -1424,8 +1423,10 @@ pt_prepare_proxy_list_for_config_read(void) tor_assert(mp->conf_state == PT_PROTO_COMPLETED); + /* Mark all proxies for removal, and also note that they have been + here before the config read. */ mp->marked_for_removal = 1; - mp->got_hup = 1; + mp->was_around_before_config_read = 1; SMARTLIST_FOREACH(mp->transports_to_launch, char *, t, tor_free(t)); smartlist_clear(mp->transports_to_launch); } SMARTLIST_FOREACH_END(mp); diff --git a/src/or/transports.h b/src/or/transports.h index 7b524f2..1365ead 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -97,7 +97,7 @@ typedef struct { * this flag to signify that this proxy might need to be restarted * so that it can listen for other transports according to the new * torrc. */ - unsigned int got_hup : 1; + unsigned int was_around_before_config_read : 1; /* transports to-be-launched by this proxy */ smartlist_t *transports_to_launch;

1 0