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

[tor/master] Merge remote-tracking branch 'tor-github/pr/1231'
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit e5812c91d6a682f9604032dde2285c87774ec3dd Merge: 29bd43ab0 2ea2d6f30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 11:34:27 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1231' src/core/or/circuitpadding.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)

1 0

[tor/master] Clarify comment for bug30942 and improve logline.
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 2ea2d6f30add2350adb29467d0f27203571388fc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 12 14:23:43 2019 -0500 Clarify comment for bug30942 and improve logline. --- src/core/or/circuitpadding.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 9ccad8744..47870bcaa 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -1800,8 +1800,6 @@ circpad_check_received_cell(cell_t *cell, circuit_t *circ, crypt_path_t *layer_hint, const relay_header_t *rh) { - unsigned domain = layer_hint?LD_APP:LD_EXIT; - /* First handle the padding commands, since we want to ignore any other * commands if this circuit is padding-specific. */ switch (rh->command) { @@ -1818,10 +1816,30 @@ circpad_check_received_cell(cell_t *cell, circuit_t *circ, } /* If this is a padding circuit we don't need to parse any other commands - * than the padding ones. Just drop them to the floor. */ + * than the padding ones. Just drop them to the floor. + * + * Note: we deliberately do not call circuit_read_valid_data() here. The + * vanguards addon (specifically the 'bandguards' component's dropped cell + * detection) will thus close this circuit, as it would for any other + * unexpected cell. However, default tor will *not* close the circuit. + * + * This is intentional. We are not yet certain that is it optimal to keep + * padding circuits open in cases like these, rather than closing them. + * We suspect that continuing to pad is optimal against a passive classifier, + * but as soon as the adversary is active (even as a client adversary) this + * might change. + * + * So as a way forward, we log the cell command and circuit number, to + * help us enumerate the most common instances of this in testing with + * vanguards, to see which are common enough to verify and handle + * properly. + * - Mike + */ if (circ->purpose == CIRCUIT_PURPOSE_C_CIRCUIT_PADDING) { - log_info(domain, "Ignored cell (%d) that arrived in padding circuit.", - rh->command); + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, + "Ignored cell (%d) that arrived in padding circuit " + " %u.", rh->command, CIRCUIT_IS_ORIGIN(circ) ? + TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0); return 0; }

1 0

[tor/master] Move the connection_edge_process_relay_cell() assignments out of if statements in circuit_receive_relay_cell()
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 64d2133a6164e201edb075154124e210cbbffe51 Author: Neel <neel(a)neelc.org> Date: Thu Aug 8 13:05:46 2019 -0400 Move the connection_edge_process_relay_cell() assignments out of if statements in circuit_receive_relay_cell() --- scripts/maint/practracker/exceptions.txt | 4 ++-- src/core/or/relay.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 75a8b5096..c9399da5d 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -117,8 +117,8 @@ problem function-size /src/core/or/connection_or.c:connection_or_compute_authent problem file-size /src/core/or/policies.c 3249 problem function-size /src/core/or/policies.c:policy_summarize() 107 problem function-size /src/core/or/protover.c:protover_all_supported() 117 -problem file-size /src/core/or/relay.c 3263 -problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 126 +problem file-size /src/core/or/relay.c 3264 +problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 127 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 109 problem function-size /src/core/or/relay.c:connection_ap_process_end_not_open() 192 problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 137 diff --git a/src/core/or/relay.c b/src/core/or/relay.c index d66caf3ad..a437b5479 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -265,8 +265,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, if (cell_direction == CELL_DIRECTION_OUT) { ++stats_n_relay_cells_delivered; log_debug(LD_OR,"Sending away from origin."); - if ((reason = connection_edge_process_relay_cell(cell, circ, conn, NULL)) - < 0) { + reason = connection_edge_process_relay_cell(cell, circ, conn, NULL); + if (reason < 0) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "connection_edge_process_relay_cell (away from origin) " "failed."); @@ -276,8 +276,9 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, if (cell_direction == CELL_DIRECTION_IN) { ++stats_n_relay_cells_delivered; log_debug(LD_OR,"Sending to origin."); - if ((reason = connection_edge_process_relay_cell(cell, circ, conn, - layer_hint)) < 0) { + reason = connection_edge_process_relay_cell(cell, circ, conn, + layer_hint); + if (reason < 0) { /* If a client is trying to connect to unknown hidden service port, * END_CIRC_AT_ORIGIN is sent back so we can then close the circuit. * Do not log warn as this is an expected behavior for a service. */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1224'
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 29bd43ab03fd09e9d23b33ae4f126382008739ea Merge: b51a822a8 64d2133a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 11:26:58 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1224' scripts/maint/practracker/exceptions.txt | 4 ++-- src/core/or/relay.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-)

1 0

[tor/master] Remove dead code from circpad_machine_remove_token().
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 0e4753e579c0288a295d1e0a585e1156dd26590a Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 19:38:14 2019 +0300 Remove dead code from circpad_machine_remove_token(). --- changes/bug31027 | 3 +++ src/core/or/circuitpadding.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug31027 b/changes/bug31027 new file mode 100644 index 000000000..dd3ce20b6 --- /dev/null +++ b/changes/bug31027 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove some dead code from circpad_machine_remove_token() to fix some + Coverity warnings (CID 1447298). Fixes bug 31027; bugfix on 0.4.1.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 0214cc421..626787da7 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -1083,8 +1083,11 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) state = circpad_machine_current_state(mi); + /* If we are not in a padding state (like start or end), we're done */ + if (!state) + return; /* Don't remove any tokens if we're not doing token removal */ - if (!state || state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) + if (state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) return; current_time = monotime_absolute_usec(); @@ -1103,10 +1106,6 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) timer_disable(mi->padding_timer); } - /* If we are not in a padding state (like start or end), we're done */ - if (!state) - return; - /* Perform the specified token removal strategy */ switch (state->token_removal) { case CIRCPAD_TOKEN_REMOVAL_CLOSEST_USEC:

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1160'
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit b51a822a80c5a4d391a3c5f294230982aeccf46b Merge: 78d2559d8 98c1262b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 11:25:45 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1160'

1 0

[tor/master] Always check the retval of circpad_machine_current_state().
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 98c1262b2a374de9dc2579a71a1c7464f4435f1d Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 19:46:43 2019 +0300 Always check the retval of circpad_machine_current_state(). --- changes/bug31024 | 4 ++++ src/core/or/circuitpadding.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug31024 b/changes/bug31024 new file mode 100644 index 000000000..888fb2a26 --- /dev/null +++ b/changes/bug31024 @@ -0,0 +1,4 @@ + o Minor bugfixes (circuitpadding): + - Add two NULL checks in unreachable places to silence Coverity (CID 144729 + and 1447291) and better future proof ourselves. Fixes bug 31024; bugfix + on 0.4.1.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 626787da7..c4670bbc2 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -450,6 +450,9 @@ circpad_is_token_removal_supported(circpad_machine_runtime_t *mi) /* Machines that do want token removal are less sensitive to performance. * Let's spend some time to check that our state is consistent and sane */ const circpad_state_t *state = circpad_machine_current_state(mi); + if (BUG(!state)) { + return 1; + } tor_assert_nonfatal(state->token_removal != CIRCPAD_TOKEN_REMOVAL_NONE); tor_assert_nonfatal(state->histogram_len == mi->histogram_len); tor_assert_nonfatal(mi->histogram_len != 0); @@ -1667,6 +1670,9 @@ circpad_estimate_circ_rtt_on_received(circuit_t *circ, } } else { const circpad_state_t *state = circpad_machine_current_state(mi); + if (BUG(!state)) { + return; + } /* Since monotime is unpredictably expensive, only update this field * if rtt estimates are needed. Otherwise, stop the rtt update. */

1 0

[tor/release-0.4.1] Fold in changelog/release-notes entries
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit c5a68c185b21fcd760ad0f6cbebbd6d34652c842 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 11:23:22 2019 -0400 Fold in changelog/release-notes entries --- ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ ReleaseNotes | 30 ++++++++++++++++++++++++++++++ changes/bug31343 | 9 --------- changes/bug31356_and_logs | 11 ----------- changes/ticket30591 | 3 --- changes/ticket30694 | 3 --- changes/ticket31374 | 4 ---- changes/ticket31406 | 3 --- 8 files changed, 68 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 661e7d971..44559554b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,34 @@ Changes in version 0.4.1.5 - 2019-08-20 BLURB HERE + o Directory authority changes: + - The directory authority "dizum" has a new IP address. Closes + ticket 31406. + + o Minor features (circuit padding logging): + - Demote noisy client-side warn logs about circuit padding to + protocol warnings. Add additional log messages and circuit ID + fields to help with bug 30992 and any other future issues. + + o Minor bugfixes (circuit padding negotiation): + - Bump the circuit padding protocol version to explicitly signify + that the HS setup machine support is finalized in 0.4.1.x-stable. + This also means that 0.4.1.x-alpha clients will not negotiate + padding with 0.4.1.x-stable relays, and 0.4.1.x-stable clients + will not negotiate padding with 0.4.1.x-alpha relays (or 0.4.0.x + relays). Fixes bug 31356; bugfix on 0.4.1.1-alpha. + o Minor bugfixes (circuit padding): - Ignore non-padding cells on padding circuits. This addresses various warning messages from subsystems that were not expecting padding circuits. Fixes bug 30942; bugfix on 0.4.1.1-alpha. + o Minor bugfixes (clock skew detection): + - Don't believe clock skew results from NETINFO cells that appear to + arrive before we sent the VERSIONS cells they are responding to. + Previously, we would accept them up to 3 minutes "in the past". + Fixes bug 31343; bugfix on 0.2.4.4-alpha. + o Minor bugfixes (compatibility, standards compliance): - Fix a bug that would invoke undefined behavior on certain operating systems when trying to asprintf() a string exactly @@ -13,11 +36,26 @@ Changes in version 0.4.1.5 - 2019-08-20 better to fix it anyway. Fixes bug 31001; bugfix on 0.2.2.11-alpha. Found and fixed by Tobias Stoeckmann. + o Minor bugfixes (compilation warning): + - Fix a compilation warning on Windows about casting a function + pointer for GetTickCount64(). Fixes bug 31374; bugfix + on 0.2.9.1-alpha. + + o Minor bugfixes (compilation): + - Avoid using labs() on time_t, which can cause compilation warnings + on 64-bit Windows builds. Fixes bug 31343; bugfix on 0.2.4.4-alpha. + o Minor bugfixes (distribution): - Do not ship any temporary files found in the scripts/maint/practracker directory. Fixes bug 31311; bugfix on 0.4.1.1-alpha. + o Testing (continuous integration): + - In Travis, make stem log a controller trace to the console. And + tail stem's tor log after failure. Closes ticket 30591. + - In Travis, only run the stem tests that use a tor binary. Closes + ticket 30694. + Changes in version 0.4.1.4-rc - 2019-07-25 Tor 0.4.1.4-rc fixes a few bugs from previous versions of Tor, and diff --git a/ReleaseNotes b/ReleaseNotes index b2d935d83..9137c7072 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -5,6 +5,10 @@ changes in each development snapshot, see the ChangeLog file. Changes in version 0.4.1.5 - 2019-08-20 BLURB BLURB + o Directory authority changes: + - The directory authority "dizum" has a new IP address. Closes + ticket 31406. + o Major features (circuit padding): - Onion service clients now add padding cells at the start of their INTRODUCE and RENDEZVOUS circuits, to make those circuits' traffic @@ -99,6 +103,11 @@ Changes in version 0.4.1.5 - 2019-08-20 at the end of a cell that we can fill with random bytes. Closes ticket 26846. + o Minor features (circuit padding logging): + - Demote noisy client-side warn logs about circuit padding to protocol + warnings. Add additional log messages and circuit ID fields to help + with bug 30992 and any other future issues. + o Minor features (circuit padding): - We now use a fast PRNG when scheduling circuit padding. Part of ticket 28636. @@ -255,6 +264,12 @@ Changes in version 0.4.1.5 - 2019-08-20 that do not use token removal or circuit RTT estimation. Fixes bug 29085; bugfix on 0.4.0.1-alpha. + o Minor bugfixes (clock skew detection): + - Don't believe clock skew results from NETINFO cells that appear to + arrive before we sent the VERSIONS cells they are responding to. + Previously, we would accept them up to 3 minutes "in the past". + Fixes bug 31343; bugfix on 0.2.4.4-alpha. + o Minor bugfixes (compatibility, standards compliance): - Fix a bug that would invoke undefined behavior on certain operating systems when trying to asprintf() a string exactly @@ -262,6 +277,15 @@ Changes in version 0.4.1.5 - 2019-08-20 better to fix it anyway. Fixes bug 31001; bugfix on 0.2.2.11-alpha. Found and fixed by Tobias Stoeckmann. + o Minor bugfixes (compilation warning): + - Fix a compilation warning on Windows about casting a function + pointer for GetTickCount64(). Fixes bug 31374; bugfix on + 0.2.9.1-alpha. + + o Minor bugfixes (compilation): + - Avoid using labs() on time_t, which can cause compilation warnings + on 64-bit Windows builds. Fixes bug 31343; bugfix on 0.2.4.4-alpha. + o Minor bugfixes (compilation, unusual configurations): - Avoid failures when building with the ALL_BUGS_ARE_FATAL option due to missing declarations of abort(), and prevent other such @@ -509,6 +533,12 @@ Changes in version 0.4.1.5 - 2019-08-20 services, using the chutney network single-onion-v23-ipv6-md. Closes ticket 27251. + o Testing (continuous integration): + - In Travis, make stem log a controller trace to the console. And tail + stem's tor log after failure. Closes ticket 30591. + - In Travis, only run the stem tests that use a tor binary. + Closes ticket 30694. + Changes in version 0.4.0.5 - 2019-05-02 This is the first stable release in the 0.4.0.x series. It contains diff --git a/changes/bug31343 b/changes/bug31343 deleted file mode 100644 index 17a8057ea..000000000 --- a/changes/bug31343 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes (compilation): - - Avoid using labs() on time_t, which can cause compilation warnings - on 64-bit Windows builds. Fixes bug 31343; bugfix on 0.2.4.4-alpha. - - o Minor bugfixes (clock skew detection): - - Don't believe clock skew results from NETINFO cells that appear to - arrive before the VERSIONS cells they are responding to were sent. - Previously, we would accept them up to 3 minutes "in the past". - Fixes bug 31343; bugfix on 0.2.4.4-alpha. diff --git a/changes/bug31356_and_logs b/changes/bug31356_and_logs deleted file mode 100644 index fb5307cb6..000000000 --- a/changes/bug31356_and_logs +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfixes (circuit padding negotiation): - - Bump circuit padding protover to explicitly signify that the hs setup - machine support is finalized in 0.4.1.x-stable. This also means that - 0.4.1.x-alpha clients will not negotiate padding with 0.4.1.x-stable - relays, and 0.4.1.x-stable clients will not negotiate padding with - 0.4.1.x-alpha relays (or 0.4.0.x relays). Fixes bug 31356; - bugfix on 0.4.1.1-alpha. - o Minor features (circuit padding logging): - - Demote noisy client-side warn log to a protocol warning. Add additional - log messages and circuit id fields to help with fixing bug 30992 and any - other future issues. diff --git a/changes/ticket30591 b/changes/ticket30591 deleted file mode 100644 index f97c02400..000000000 --- a/changes/ticket30591 +++ /dev/null @@ -1,3 +0,0 @@ - o Testing (continuous integration): - - In Travis, make stem log a controller trace to the console. And tail - stem's tor log after failure. Closes ticket 30591. diff --git a/changes/ticket30694 b/changes/ticket30694 deleted file mode 100644 index 70dbf6481..000000000 --- a/changes/ticket30694 +++ /dev/null @@ -1,3 +0,0 @@ - o Testing (continuous integration): - - In Travis, only run the stem tests that use a tor binary. - Closes ticket 30694. diff --git a/changes/ticket31374 b/changes/ticket31374 deleted file mode 100644 index e8eef9cd4..000000000 --- a/changes/ticket31374 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation warning): - - Fix a compilation warning on Windows about casting a function - pointer for GetTickCount64(). Fixes bug 31374; bugfix on - 0.2.9.1-alpha. diff --git a/changes/ticket31406 b/changes/ticket31406 deleted file mode 100644 index 0ebe6f6c4..000000000 --- a/changes/ticket31406 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (directory authority): - - A new IP address the directory authority "dizum" has been changed. Closes - ticket 31406;

1 0

[torspec/master] tor-spec: Clarify protover Padding=1 and Padding=2.
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 4c11245fe3781bbe022fb58bd3cff75b1049fab6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 13 17:59:00 2019 +0300 tor-spec: Clarify protover Padding=1 and Padding=2. --- tor-spec.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tor-spec.txt b/tor-spec.txt index 1a211bc..a23003c 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -2169,7 +2169,13 @@ see tor-design.pdf. Describes the padding capabilities of the relay. - "1" -- Relay supports circuit-level padding. + "1" -- [DEFUNCT] Relay supports circuit-level padding. This version MUST NOT + be used as it was also enabled in relays that don't actually support + circuit-level padding. Advertised by Tor versions from + tor-0.4.0.1-alpha and only up to and including tor-0.4.1.4-rc. + + "2" -- Relay supports the HS circuit setup padding machines (proposal 302). + Advertised by Tor versions from tor-0.4.1.5-rc and onwards. 9.12. "FlowCtrl"

1 0

[torspec/master] 0.4.1.5 is scheduled to be a stable release.
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit d03d6ace4b8075861feb0a7ac3ef8eedb204482c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 11:17:38 2019 -0400 0.4.1.5 is scheduled to be a stable release. --- tor-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tor-spec.txt b/tor-spec.txt index a23003c..21abfdf 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -2175,7 +2175,7 @@ see tor-design.pdf. tor-0.4.0.1-alpha and only up to and including tor-0.4.1.4-rc. "2" -- Relay supports the HS circuit setup padding machines (proposal 302). - Advertised by Tor versions from tor-0.4.1.5-rc and onwards. + Advertised by Tor versions from tor-0.4.1.5 and onwards. 9.12. "FlowCtrl"

1 0