June 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Several attempts to diagnose ticket 25686
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit faf45800611a35be6a4e1381818e69852877f62e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 11 16:14:57 2018 -0400 Several attempts to diagnose ticket 25686 There are a few reasons that relays might be uploading desciptors without saying X-Desc-Gen-Reason: 1. They are running an old version of our software, before 0.3.2.stable. 2. They are not running our software, but they are claiming they are. 3. They are uploading through a proxy that strips X-Desc-Gen-Reason. 4. They somehow had a bug in their software. According to the 25686 data, 1 is the most common reason. This ticket is an attempt to diagnose case 4, or prove that case 4 doesn't actually happen. --- changes/bug25686_diagnostic | 4 ++++ src/or/directory.c | 5 +++-- src/or/router.c | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/bug25686_diagnostic b/changes/bug25686_diagnostic new file mode 100644 index 000000000..96323145d --- /dev/null +++ b/changes/bug25686_diagnostic @@ -0,0 +1,4 @@ + o Minor features (relay, diagnostic): + - Add several checks to detect whether Tor relays are uploading their + descriptors without specifying why they regenerated. Diagnostic for + ticket 25686. diff --git a/src/or/directory.c b/src/or/directory.c index f14bdde90..47058352f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1810,9 +1810,10 @@ directory_send_command(dir_connection_t *conn, tor_assert(payload); httpcommand = "POST"; url = tor_strdup("/tor/"); - if (why) { - smartlist_add_asprintf(headers, "X-Desc-Gen-Reason: %s\r\n", why); + if (!why) { + why = "for no reason at all"; } + smartlist_add_asprintf(headers, "X-Desc-Gen-Reason: %s\r\n", why); break; } case DIR_PURPOSE_UPLOAD_VOTE: diff --git a/src/or/router.c b/src/or/router.c index 83e5538a5..cacd1132a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1866,7 +1866,7 @@ static routerinfo_t *desc_routerinfo = NULL; static extrainfo_t *desc_extrainfo = NULL; /** Why did we most recently decide to regenerate our descriptor? Used to * tell the authorities why we're sending it to them. */ -static const char *desc_gen_reason = NULL; +static const char *desc_gen_reason = "uninitialized reason"; /** Since when has our descriptor been "clean"? 0 if we need to regenerate it * now. */ static time_t desc_clean_since = 0; @@ -2454,6 +2454,9 @@ router_rebuild_descriptor(int force) desc_clean_since = time(NULL); desc_needs_upload = 1; desc_gen_reason = desc_dirty_reason; + if (BUG(desc_gen_reason == NULL)) { + desc_gen_reason = "descriptor was marked dirty earlier, for no reason."; + } desc_dirty_reason = NULL; control_event_my_descriptor_changed(); return 0; @@ -2510,6 +2513,9 @@ void mark_my_descriptor_dirty(const char *reason) { const or_options_t *options = get_options(); + if (BUG(reason == NULL)) { + reason = "marked descriptor dirty for unspecified reason"; + } if (server_mode(options) && options->PublishServerDescriptor_) log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason); desc_clean_since = 0;

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 76e9de7c6d1a22d89053dd4fa8671d5696c52634 Merge: 8c8ed91aa 1c80eb92f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25686_diagnostic | 4 ++++ src/or/directory.c | 5 +++-- src/or/router.c | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 1c80eb92fa6c5240b1029c5ee1febe2d20b7d882 Merge: bbbb5f39b ff70cc84f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25686_diagnostic | 4 ++++ src/or/directory.c | 5 +++-- src/or/router.c | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit ff70cc84f8b00e710171bc988ababc9fe1be88e9 Merge: 53513e4bf faf458006 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:56:17 2018 -0400 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 changes/bug25686_diagnostic | 4 ++++ src/or/directory.c | 5 +++-- src/or/router.c | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 2e71f3ccfee3451263d2ec35343dea3548e7e4b5 Merge: bc5d90423 1c80eb92f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25686_diagnostic | 4 ++++ src/or/directory.c | 5 +++-- src/or/router.c | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.3] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit ff70cc84f8b00e710171bc988ababc9fe1be88e9 Merge: 53513e4bf faf458006 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:56:17 2018 -0400 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 changes/bug25686_diagnostic | 4 ++++ src/or/directory.c | 5 +++-- src/or/router.c | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/master] Heed --disable-unittests properly
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit b7fae0f48ce63371cd2454a0b59d423778a2a7c6 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jun 2 12:53:04 2018 +0300 Heed --disable-unittests properly --- changes/bug24891 | 4 ++++ src/common/include.am | 10 ++++++++++ src/or/include.am | 4 ++++ src/test/include.am | 11 +++++++++-- src/trunnel/include.am | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/changes/bug24891 b/changes/bug24891 new file mode 100644 index 000000000..403b2b112 --- /dev/null +++ b/changes/bug24891 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Refrain from compiling unit testing related object files + when --disable-unittests is set to configure script. + Fixes bug 24891; bugfix on 0.2.5.1-alpha. diff --git a/src/common/include.am b/src/common/include.am index bce3fa20f..cfaf99367 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -74,7 +74,11 @@ LIBOR_CTIME_A_SRC = \ src/common/di_ops.c src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC) +if UNITTESTS_ENABLED src_common_libor_ctime_testing_a_SOURCES = $(LIBOR_CTIME_A_SRC) +else +src_common_libor_ctime_testing_a_SOURCES = +endif src_common_libor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@ src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS) @@ -137,9 +141,15 @@ src_common_libor_a_SOURCES = $(LIBOR_A_SRC) src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC) +if UNITTESTS_ENABLED src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC) src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC) +else +src_common_libor_testing_a_SOURCES = +src_common_libor_crypto_testing_a_SOURCES = +src_common_libor_event_testing_a_SOURCES = +endif src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) diff --git a/src/or/include.am b/src/or/include.am index bc0b9d2bf..0e2aac4aa 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -130,7 +130,11 @@ LIBTOR_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) endif src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) +if UNITTESTS_ENABLED src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES) +else +src_or_libtor_testing_a_SOURCES = +endif src_or_tor_SOURCES = src/or/tor_main.c AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or diff --git a/src/test/include.am b/src/test/include.am index 9543635c8..48257467a 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -79,7 +79,10 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ # This seems to matter nowhere but on Windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. -src_test_test_SOURCES = \ +src_test_test_SOURCES = + +if UNITTESTS_ENABLED +src_test_test_SOURCES += \ src/test/log_test_helpers.c \ src/test/hs_test_helpers.c \ src/test/rend_test_helpers.c \ @@ -178,14 +181,18 @@ src_test_test_SOURCES = \ src/test/testing_common.c \ src/test/testing_rsakeys.c \ src/ext/tinytest.c +endif -src_test_test_slow_SOURCES = \ +src_test_test_slow_SOURCES = +if UNITTESTS_ENABLED +src_test_test_slow_SOURCES += \ src/test/test_slow.c \ src/test/test_crypto_slow.c \ src/test/test_util_slow.c \ src/test/testing_common.c \ src/test/testing_rsakeys.c \ src/ext/tinytest.c +endif src_test_test_memwipe_SOURCES = \ src/test/test-memwipe.c diff --git a/src/trunnel/include.am b/src/trunnel/include.am index ca79ff3a3..b249fb302 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -41,7 +41,12 @@ TRUNNELHEADERS = \ src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) src_trunnel_libor_trunnel_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) +if UNITTESTS_ENABLED src_trunnel_libor_trunnel_testing_a_SOURCES = $(TRUNNELSOURCES) +else +src_trunnel_libor_trunnel_testing_a_SOURCES = +endif + src_trunnel_libor_trunnel_testing_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_trunnel_libor_trunnel_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)

1 0

[tor/master] Merge remote-tracking branch 'rl1987/bug24891'
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 8c8ed91aae24aa1188275dfb6fbd5f6fcbcbe1a8 Merge: 1b04dab60 b7fae0f48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:46:50 2018 -0400 Merge remote-tracking branch 'rl1987/bug24891' changes/bug24891 | 4 ++++ src/common/include.am | 10 ++++++++++ src/or/include.am | 4 ++++ src/test/include.am | 11 +++++++++-- src/trunnel/include.am | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-)

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 13 Jun '18

13 Jun '18

commit 6b0fc688e65962babadb48b4c6b38f8962aa9b20 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 13 10:19:35 2018 +0000 Update translations for support-tbb --- es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es.json b/es.json index f0999c4e3..7a0545a49 100644 --- a/es.json +++ b/es.json @@ -135,7 +135,7 @@ "id": "#tbb-22", "control": "tbb-22", "title": "¿Cómo puedo hacer que Tor se ejecute más rápido? ¿El Navegador Tor es más lento que otros navegadores?", - "description": "Usar el Navegador Tor a veces puede ser más lento que usar otros navegadores. La red Tor tiene más de un millón de usuarios diarios, y apenas más de 6000 repetidores para enrutar todo su tráfico, y la carga sobre cada servidor a veces puede causar retraso. Puedes ayudar a mejorar la velocidad de la red ejecutando tu propio repetidor, o animando a otros a hacerlo. Dicho eso, Tor es mucho más rápido de lo que solía ser y puede en que en realidad no notes ningún cambio en la velocidad en comparación con otros navegadores." + "description": "Usar el Navegador Tor a veces puede ser más lento que usar otros navegadores. La red Tor tiene más de un millón de usuarios diarios, y apenas más de 6000 repetidores para enrutar todo su tráfico, y la carga sobre cada servidor a veces puede causar retraso. Puedes ayudar a mejorar la velocidad de la red con tu propio repetidor, o animando a otros a hacerlo. Dicho eso, Tor es mucho más rápido de lo que solía ser y puede en que en realidad no notes ningún cambio en la velocidad en comparación con otros navegadores." }, "tbb-23": { "id": "#tbb-23", @@ -231,7 +231,7 @@ "id": "#tbb-38", "control": "tbb-38", "title": "¿El administrador de mi red podrá determinar que estoy usando el Navegador Tor?", - "description": "Al usar Tor / Navegador Tor, no podemos garantizar que nadie descubra que estás usando Tor. En su lugar, la meta es que nadie sepa lo que estás haciendo con Tor. Usar transportes intercambiables (pluggable transports) puede hacer que identificar el tráfico de Tor sea más difícil, pero no imposible." + "description": "Al usar Tor o el Navegador Tor, no podemos evitar que alguien descubra que estás usando Tor. En cambio, la meta es que nadie sepa lo que estás haciendo con Tor. Usar transportes intercambiables (pluggable transports) puede hacer que identificar el tráfico de Tor sea más difícil, pero no imposible." }, "tbb-39": { "id": "#tbb-39",

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 13 Jun '18

13 Jun '18

commit 1e1198637a5196501f43f9483fa8ad8e016ed539 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 13 09:49:36 2018 +0000 Update translations for support-tbb --- es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es.json b/es.json index afaafca32..f0999c4e3 100644 --- a/es.json +++ b/es.json @@ -231,7 +231,7 @@ "id": "#tbb-38", "control": "tbb-38", "title": "¿El administrador de mi red podrá determinar que estoy usando el Navegador Tor?", - "description": "Al usar Tor / Navegador Tor, no procuramos la garantía de que nadie podrá determinar que estás usando Tor. En su lugar, la meta es que nadie sepa lo que estás haciendo con Tor. Usar transportes intercambiables (pluggable transports) puede hacer que identificar el tráfico de Tor sea más difícil, pero no imposible." + "description": "Al usar Tor / Navegador Tor, no podemos garantizar que nadie descubra que estás usando Tor. En su lugar, la meta es que nadie sepa lo que estás haciendo con Tor. Usar transportes intercambiables (pluggable transports) puede hacer que identificar el tráfico de Tor sea más difícil, pero no imposible." }, "tbb-39": { "id": "#tbb-39",

1 0