October 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Revert "Temporarily disable compilation of the v3 hs fuzzing code"
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit 4d2de821ce9ab7a79e1a8bf5123adafd4326d023 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 09:41:47 2017 -0400 Revert "Temporarily disable compilation of the v3 hs fuzzing code" This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403. --- scripts/codegen/fuzzing_include_am.py | 1 + src/test/fuzz/include.am | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index e01bc8daa..fee6d4494 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -7,6 +7,7 @@ FUZZERS = """ diff-apply extrainfo hsdescv2 + hsdescv3 http http-connect iptsv2 diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 472cbfc8a..cd16dc05b 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -17,9 +17,8 @@ FUZZING_LIBS = \ src/trunnel/libor-trunnel-testing.a \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ \ + @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ \ @TOR_ZSTD_LIBS@ @@ -95,6 +94,14 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS) src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG) src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS) +src_test_fuzz_fuzz_hsdescv3_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_hsdescv3.c +src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS) +src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS) +src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG) +src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS) + src_test_fuzz_fuzz_http_SOURCES = \ src/test/fuzz/fuzzing_common.c \ src/test/fuzz/fuzz_http.c @@ -142,6 +149,7 @@ FUZZERS = \ src/test/fuzz/fuzz-diff-apply \ src/test/fuzz/fuzz-extrainfo \ src/test/fuzz/fuzz-hsdescv2 \ + src/test/fuzz/fuzz-hsdescv3 \ src/test/fuzz/fuzz-http \ src/test/fuzz/fuzz-http-connect \ src/test/fuzz/fuzz-iptsv2 \ @@ -193,6 +201,13 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS) src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG) src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS) +src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \ + $(src_test_fuzz_fuzz_hsdescv3_SOURCES) +src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS) + src_test_fuzz_lf_fuzz_http_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) @@ -235,6 +250,7 @@ LIBFUZZER_FUZZERS = \ src/test/fuzz/lf-fuzz-diff-apply \ src/test/fuzz/lf-fuzz-extrainfo \ src/test/fuzz/lf-fuzz-hsdescv2 \ + src/test/fuzz/lf-fuzz-hsdescv3 \ src/test/fuzz/lf-fuzz-http \ src/test/fuzz/lf-fuzz-http-connect \ src/test/fuzz/lf-fuzz-iptsv2 \ @@ -278,6 +294,11 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \ src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) +src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \ + $(src_test_fuzz_fuzz_hsdescv3_SOURCES) +src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) +src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) + src_test_fuzz_liboss_fuzz_http_a_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) @@ -310,6 +331,7 @@ OSS_FUZZ_FUZZERS = \ src/test/fuzz/liboss-fuzz-diff-apply.a \ src/test/fuzz/liboss-fuzz-extrainfo.a \ src/test/fuzz/liboss-fuzz-hsdescv2.a \ + src/test/fuzz/liboss-fuzz-hsdescv3.a \ src/test/fuzz/liboss-fuzz-http.a \ src/test/fuzz/liboss-fuzz-http-connect.a \ src/test/fuzz/liboss-fuzz-iptsv2.a \

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit 4af1653e0f5fe305aff340e7b7f47c1f965ef3ca Merge: dfe03a55f c4ef21ff5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 26 10:43:05 2017 -0400 Merge branch 'maint-0.3.2' changes/bug21509 | 3 +++ scripts/codegen/fuzzing_include_am.py | 1 + src/test/fuzz/fuzz_hsdescv3.c | 4 +++- src/test/fuzz/include.am | 28 +++++++++++++++++++++++++--- 4 files changed, 32 insertions(+), 4 deletions(-)

1 0

[tor/master] fuzzing: Make hsdescv3 use the decoding API correctly
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit c4ef21ff5eff26182428d388e0614b4f0c5eed58 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 09:52:15 2017 -0400 fuzzing: Make hsdescv3 use the decoding API correctly Fixes #21509 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21509 | 3 +++ src/test/fuzz/fuzz_hsdescv3.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug21509 b/changes/bug21509 new file mode 100644 index 000000000..593a01ef2 --- /dev/null +++ b/changes/bug21509 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service v3, fuzzing): + - Fix the hidden service v3 descriptor decoding fuzzing to use the latest + decoding API correctly. Fixes bug 21509; bugfix on 0.3.2.1-alpha. diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 3fd21148f..03c509e2e 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -55,10 +55,12 @@ int fuzz_main(const uint8_t *data, size_t sz) { hs_descriptor_t *desc = NULL; + uint8_t subcredential[DIGEST256_LEN]; char *fuzzing_data = tor_memdup_nulterm(data, sz); + memset(subcredential, 'A', sizeof(subcredential)); - hs_desc_decode_descriptor(fuzzing_data, NULL, &desc); + hs_desc_decode_descriptor(fuzzing_data, subcredential, &desc); if (desc) { log_debug(LD_GENERAL, "Decoding okay"); hs_descriptor_free(desc);

1 0

[tor/master] doc: Add fedora packager point of contact
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit dfe03a55fcf8071fef65a3998022d87848135b06 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 10:07:56 2017 -0400 doc: Add fedora packager point of contact This is a link to the user page on the Fedora project website: https://koji.fedoraproject.org/koji/userinfo?userID=2234 Fixes #24015 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/HACKING/ReleasingTor.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 62029b44f..fc7326934 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -172,6 +172,7 @@ new Tor release: - {tails-rm} at boum dot org - {simon} at sdeziel.info - {yuri} at rawbw.com + - {mh+tor} at scrit.ch 4. Add the version number to Trac. To do this, go to Trac, log in, select "Admin" near the top of the screen, then select "Versions" from

1 0

[tor/release-0.3.2] Update entry guard state whenever we download a consensus.
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit cbc70437a7318f8e5abef0829ba8e02298ae53e2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:18:25 2017 +0300 Update entry guard state whenever we download a consensus. Update guard state even if we don't have enough dirinfo since that actually affects the future download of dirinfos. Fixes #23862 on 0.3.0.1-alpha --- src/or/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 65b0b8f4d..c340e4128 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -971,6 +971,15 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) { const or_options_t *options = get_options(); + /* if we have enough dir info, then update our guard status with + * whatever we just learned. */ + int invalidate_circs = guards_update_all(); + + if (invalidate_circs) { + circuit_mark_all_unused_circs(); + circuit_mark_all_dirty_circs_as_unusable(); + } + if (!router_have_minimum_dir_info()) { int quiet = suppress_logs || from_cache || directory_too_idle_to_fetch_descriptors(options, now); @@ -984,15 +993,6 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) update_all_descriptor_downloads(now); } - /* if we have enough dir info, then update our guard status with - * whatever we just learned. */ - int invalidate_circs = guards_update_all(); - - if (invalidate_circs) { - circuit_mark_all_unused_circs(); - circuit_mark_all_dirty_circs_as_unusable(); - } - /* Don't even bother trying to get extrainfo until the rest of our * directory info is up-to-date */ if (options->DownloadExtraInfo)

1 0

[tor/release-0.3.2] fix check-changes warning
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit 62cd64cc166081b17a0cf1fc9abd422c71e1f17b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 26 09:08:49 2017 -0400 fix check-changes warning --- changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/changes/bug23682 b/changes/bug23862 similarity index 100% rename from changes/bug23682 rename to changes/bug23862

1 0

[tor/release-0.3.2] Remove a duplicate call to update_microdesc_downloads()
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit 42a47c0e7da425a55b77aafe2dda2fea7563c761 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:18:38 2017 +0300 Remove a duplicate call to update_microdesc_downloads() This call happens before we update our entry guards, so it needs to be removed for the fix to #23862 to work. --- src/or/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 6470723cd..7a1364bd7 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2669,11 +2669,11 @@ handle_response_fetch_consensus(dir_connection_t *conn, /* If we launched other fetches for this consensus, cancel them. */ connection_dir_close_consensus_fetches(conn, flavname); - /* launches router downloads as needed */ + /* update the list of routers and directory guards */ routers_update_all_from_networkstatus(now, 3); update_microdescs_from_networkstatus(now); - update_microdesc_downloads(now); directory_info_has_arrived(now, 0, 0); + if (authdir_mode_v3(get_options())) { sr_act_post_consensus( networkstatus_get_latest_consensus_by_flavor(FLAV_NS));

1 0

[tor/release-0.3.2] Add changes file for #23862.
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit e0276dc1c64d4c2c9439e080d006dfb249fc7c53 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:54:48 2017 +0300 Add changes file for #23862. --- changes/bug23682 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug23682 b/changes/bug23682 new file mode 100644 index 000000000..301ce7367 --- /dev/null +++ b/changes/bug23682 @@ -0,0 +1,5 @@ + o Minor bugfixes (entry guards): + - Tor now updates its guard state when it reads a consensus regardless of + whether it's missing descriptors. That makes tor use its primary guards + to fetch descriptors in some edge cases where it would have used fallback + directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha. \ No newline at end of file

1 0

[tor/master] Merge remote-tracking branch 'asn/bug23862_v2'
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit e4f02f6c18dfac31ccdb684558a98ea570187491 Merge: 78222831a 1a6814c09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 26 09:09:14 2017 -0400 Merge remote-tracking branch 'asn/bug23862_v2' changes/bug23682 | 5 +++ src/or/directory.c | 4 +- src/or/directory.h | 3 ++ src/or/entrynodes.c | 6 +-- src/or/entrynodes.h | 4 ++ src/or/networkstatus.c | 2 +- src/test/test_routerlist.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 126 insertions(+), 7 deletions(-)

1 0

[tor/master] Fix offending unittest and add changes file for #23862.
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit 1a6814c096b0fa6fbfd2a1688b29dbc8143d6568 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 25 19:54:48 2017 +0300 Fix offending unittest and add changes file for #23862. --- changes/bug23682 | 5 +++++ src/test/test_routerlist.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug23682 b/changes/bug23682 new file mode 100644 index 000000000..301ce7367 --- /dev/null +++ b/changes/bug23682 @@ -0,0 +1,5 @@ + o Minor bugfixes (entry guards): + - Tor now updates its guard state when it reads a consensus regardless of + whether it's missing descriptors. That makes tor use its primary guards + to fetch descriptors in some edge cases where it would have used fallback + directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha. \ No newline at end of file diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index b131dd959..81451a4bc 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -508,8 +508,7 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg) tt_int_op(retval, OP_EQ, 0); /* Make sure that our primary guard was chosen */ - /* BUG #23862 falls back to dirserver list!! */ - expect_log_msg_containing("falling back to dirserver list"); + expect_log_msg_containing("Selected primary guard router3"); done: tor_free(consensus_text_md);

1 0