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

[tor/master] sched: Use SCHED_BUG() macro in scheduler
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit 3931a6f264355d7fe017219f76bd5bec1d8bcbd8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 3 14:38:30 2017 -0400 sched: Use SCHED_BUG() macro in scheduler When a BUG() occurs, this macro will print extra information about the state of the scheduler and the given channel if any. This will help us greatly to fix future bugs in the scheduler especially when they occur rarely. Fixes #23753 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23753 | 4 ++++ src/or/scheduler.c | 2 +- src/or/scheduler_kist.c | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug23753 b/changes/bug23753 new file mode 100644 index 000000000..8782a8e2d --- /dev/null +++ b/changes/bug23753 @@ -0,0 +1,4 @@ + o Minor features (logging, scheduler): + - Introduce a SCHED_BUG() function to log extra information about the + scheduler state if we ever catch a bug in the scheduler. Closes ticket + 23753. diff --git a/src/or/scheduler.c b/src/or/scheduler.c index c656c80e9..67911ff81 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -607,7 +607,7 @@ scheduler_release_channel,(channel_t *chan)) } if (chan->scheduler_state == SCHED_CHAN_PENDING) { - if (smartlist_pos(channels_pending, chan) == -1) { + if (SCHED_BUG(smartlist_pos(channels_pending, chan) == -1, chan)) { log_warn(LD_SCHED, "Scheduler asked to release channel %" PRIu64 " " "but it wasn't in channels_pending", chan->global_identifier); diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index d269fb49b..ea6910c70 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -116,7 +116,7 @@ channel_outbuf_length(channel_t *chan) /* In theory, this can not happen because we can not scheduler a channel * without a connection that has its outbuf initialized. Just in case, bug * on this so we can understand a bit more why it happened. */ - if (BUG(BASE_CHAN_TO_TLS(chan)->conn == NULL)) { + if (SCHED_BUG(BASE_CHAN_TO_TLS(chan)->conn == NULL, chan)) { return 0; } return buf_datalen(TO_CONN(BASE_CHAN_TO_TLS(chan)->conn)->outbuf); @@ -370,7 +370,7 @@ socket_can_write(socket_table_t *table, const channel_t *chan) { socket_table_ent_t *ent = NULL; ent = socket_table_search(table, chan); - IF_BUG_ONCE(!ent) { + if (SCHED_BUG(!ent, chan)) { return 1; // Just return true, saying that kist wouldn't limit the socket } @@ -390,7 +390,7 @@ update_socket_info(socket_table_t *table, const channel_t *chan) { socket_table_ent_t *ent = NULL; ent = socket_table_search(table, chan); - IF_BUG_ONCE(!ent) { + if (SCHED_BUG(!ent, chan)) { return; // Whelp. Entry didn't exist for some reason so nothing to do. } update_socket_info_impl(ent); @@ -402,7 +402,7 @@ update_socket_written(socket_table_t *table, channel_t *chan, size_t bytes) { socket_table_ent_t *ent = NULL; ent = socket_table_search(table, chan); - IF_BUG_ONCE(!ent) { + if (SCHED_BUG(!ent, chan)) { return; // Whelp. Entry didn't exist so nothing to do. }

1 0

[tor/maint-0.3.2] Test that IPv6-only clients can use microdescriptors
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit 27ea6fcd31ceb7dd9e48e5586aa05f05bfe86e0a Author: teor <teor2345(a)gmail.com> Date: Wed Nov 1 17:13:07 2017 +1100 Test that IPv6-only clients can use microdescriptors When running "make test-network-all", test that IPv6-only clients can use microdescriptors. IPv6-only microdescriptor client support was fixed in tor 0.3.0.1-alpha. Requires chutney master 61c28b9 or later. Closes ticket 24109. --- changes/ticket24109 | 4 ++++ src/test/include.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket24109 b/changes/ticket24109 new file mode 100644 index 000000000..f66271817 --- /dev/null +++ b/changes/ticket24109 @@ -0,0 +1,4 @@ + o Minor features (integration tests): + - Test that IPv6-only clients can use microdescriptors when running + "make test-network-all". Requires chutney master 61c28b9 or later. + Closes ticket 24109. diff --git a/src/test/include.am b/src/test/include.am index 7300b8541..610918e9d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -43,9 +43,9 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ single-onion-v23 # only run if we can ping6 ::1 (localhost) # IPv6-only v3 single onion services don't work yet, so we don't test the -# single-onion-v23-ipv6 flavor -TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6 \ - single-onion-ipv6 +# single-onion-v23-ipv6-md flavor +TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ + single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23

1 0

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

02 Nov '17

commit f865993653604d7e3e8256d052398591627f8989 Merge: a46dcc070 27ea6fcd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 2 10:26:30 2017 -0400 Merge branch 'maint-0.3.2' changes/ticket24109 | 4 ++++ src/test/include.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] Test that IPv6-only clients can use microdescriptors
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit 27ea6fcd31ceb7dd9e48e5586aa05f05bfe86e0a Author: teor <teor2345(a)gmail.com> Date: Wed Nov 1 17:13:07 2017 +1100 Test that IPv6-only clients can use microdescriptors When running "make test-network-all", test that IPv6-only clients can use microdescriptors. IPv6-only microdescriptor client support was fixed in tor 0.3.0.1-alpha. Requires chutney master 61c28b9 or later. Closes ticket 24109. --- changes/ticket24109 | 4 ++++ src/test/include.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket24109 b/changes/ticket24109 new file mode 100644 index 000000000..f66271817 --- /dev/null +++ b/changes/ticket24109 @@ -0,0 +1,4 @@ + o Minor features (integration tests): + - Test that IPv6-only clients can use microdescriptors when running + "make test-network-all". Requires chutney master 61c28b9 or later. + Closes ticket 24109. diff --git a/src/test/include.am b/src/test/include.am index 7300b8541..610918e9d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -43,9 +43,9 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ single-onion-v23 # only run if we can ping6 ::1 (localhost) # IPv6-only v3 single onion services don't work yet, so we don't test the -# single-onion-v23-ipv6 flavor -TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6 \ - single-onion-ipv6 +# single-onion-v23-ipv6-md flavor +TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ + single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit 33652fce623b926551617873bcaa686d335794b4 Merge: aed642a4b 27ea6fcd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 2 10:26:30 2017 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24109 | 4 ++++ src/test/include.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.2] Test that IPv6-only clients can use microdescriptors
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit 27ea6fcd31ceb7dd9e48e5586aa05f05bfe86e0a Author: teor <teor2345(a)gmail.com> Date: Wed Nov 1 17:13:07 2017 +1100 Test that IPv6-only clients can use microdescriptors When running "make test-network-all", test that IPv6-only clients can use microdescriptors. IPv6-only microdescriptor client support was fixed in tor 0.3.0.1-alpha. Requires chutney master 61c28b9 or later. Closes ticket 24109. --- changes/ticket24109 | 4 ++++ src/test/include.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket24109 b/changes/ticket24109 new file mode 100644 index 000000000..f66271817 --- /dev/null +++ b/changes/ticket24109 @@ -0,0 +1,4 @@ + o Minor features (integration tests): + - Test that IPv6-only clients can use microdescriptors when running + "make test-network-all". Requires chutney master 61c28b9 or later. + Closes ticket 24109. diff --git a/src/test/include.am b/src/test/include.am index 7300b8541..610918e9d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -43,9 +43,9 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ single-onion-v23 # only run if we can ping6 ::1 (localhost) # IPv6-only v3 single onion services don't work yet, so we don't test the -# single-onion-v23-ipv6 flavor -TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6 \ - single-onion-ipv6 +# single-onion-v23-ipv6-md flavor +TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ + single-onion-ipv6-md # only run if we can find a stable (or simply another) version of tor TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23

1 0

[tor/release-0.3.2] Tweak a comment for a minor but important distinction
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit 6a9a118f9077c02ce60052275dcede88d9fd2aa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 2 10:22:32 2017 -0400 Tweak a comment for a minor but important distinction --- src/or/hs_circuit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index a23edc36a..ee952f4d6 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -588,7 +588,7 @@ get_lspecs_from_extend_info(const extend_info_t *ei, smartlist_t *lspecs) link_specifier_set_ls_len(ls, link_specifier_getlen_un_legacy_id(ls)); smartlist_add(lspecs, ls); - /* ed25519 ID is only included if the node has it. */ + /* ed25519 ID is only included if the extend_info has it. */ if (!ed25519_public_key_is_zero(&ei->ed_identity)) { ls = link_specifier_new(); link_specifier_set_ls_type(ls, LS_ED25519_ID);

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit aed642a4b277ec46bd40913735ae82c0baf10f5a Merge: 588be5b02 6a9a118f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 2 10:22:35 2017 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23820 | 5 ++++ src/or/hs_circuit.c | 66 ++++++++++++++++++++++++++++++++++----------- src/or/hs_client.c | 27 ++++++++++++++++--- src/or/hs_common.c | 78 ++++++++++++++++++++--------------------------------- src/or/hs_config.c | 16 ++++++++--- src/or/hs_service.c | 50 ++++++++++++++++++++-------------- src/test/include.am | 4 ++- 7 files changed, 153 insertions(+), 93 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit 3aab8307a57c668c24dae17b94f780b3f6783c67 Merge: 8687d9cf4 a2bc979d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 2 10:19:29 2017 -0400 Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2 changes/bug23820 | 5 ++++ src/or/hs_circuit.c | 66 ++++++++++++++++++++++++++++++++++----------- src/or/hs_client.c | 27 ++++++++++++++++--- src/or/hs_common.c | 78 ++++++++++++++++++++--------------------------------- src/or/hs_config.c | 16 ++++++++--- src/or/hs_service.c | 50 ++++++++++++++++++++-------------- src/test/include.am | 4 ++- 7 files changed, 153 insertions(+), 93 deletions(-)

1 0

[tor/release-0.3.2] Changes file for 23820
by nickm＠torproject.org 02 Nov '17

02 Nov '17

commit a2bc979d9d498954e1a2955ce917781caed80634 Author: teor <teor2345(a)gmail.com> Date: Thu Oct 26 17:25:16 2017 +1100 Changes file for 23820 --- changes/bug23820 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug23820 b/changes/bug23820 new file mode 100644 index 000000000..4e920d049 --- /dev/null +++ b/changes/bug23820 @@ -0,0 +1,5 @@ + o Minor bugfixes (IPv6, v3 single onion services): + - Remove buggy code for IPv6-only v3 single onion services, and reject + attempts to configure them. This release supports IPv4, dual-stack, and + IPv6-only v3 hidden services; and IPv4 and dual-stack v3 single onion + services. Fixes bug 23820; bugfix on 0.3.2.1-alpha.

1 0