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

[tor/master] Use correct sign for state file clock skew
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 1c017edac369a40c9a1633b0560e5f0d85b4e39e Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Sep 20 16:54:56 2017 -0500 Use correct sign for state file clock skew or_state_load() was using an incorrect sign convention when calling clock_skew_warning() to warn about state file clock skew. This caused the wording of the warning to be incorrect about the direction of the skew. --- changes/bug23606 | 4 ++++ src/or/statefile.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug23606 b/changes/bug23606 new file mode 100644 index 000000000..77f4d0cb9 --- /dev/null +++ b/changes/bug23606 @@ -0,0 +1,4 @@ + o Minor bugfixes (bootstrapping): + - When warning about state file clock skew, report the correct + direction for the detected skew. Fixes bug 23606; bugfix on + 0.2.8.1-alpha. diff --git a/src/or/statefile.c b/src/or/statefile.c index 9647aa883..86f26419b 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -404,8 +404,8 @@ or_state_load(void) log_info(LD_GENERAL, "Loaded state from \"%s\"", fname); /* Warn the user if their clock has been set backwards, * they could be tricked into using old consensuses */ - time_t apparent_skew = new_state->LastWritten - time(NULL); - if (apparent_skew > 0) + time_t apparent_skew = time(NULL) - new_state->LastWritten; + if (apparent_skew < 0) clock_skew_warning(NULL, (long)apparent_skew, 1, LD_GENERAL, "local state file", fname); } else {

1 0

[tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23607'
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 4c7a89a226be2f75400f3fc22d19ec9c31acd891 Merge: 0f6bbbc74 ad814cad4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 10:58:06 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug23607' changes/bug23606 | 4 ++++ changes/bug23607 | 4 ++++ src/or/statefile.c | 10 ++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] lintchanges fix
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 0f6bbbc74bef96a71480e0d59fb3e1a89c14a950 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 10:42:40 2017 -0400 lintchanges fix --- changes/ticket23604 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket23604 b/changes/ticket23604 index e65f63e31..eae8a48d2 100644 --- a/changes/ticket23604 +++ b/changes/ticket23604 @@ -1,4 +1,4 @@ - o Minor bugfixes (hidden service, circuit): + o Minor features (hidden service, circuit, logging): - Improve logging of many callsite in the circuit subsystem to print the circuit identifier(s). - Log when we cleanup an intro point from a service so we know when and

1 0

[torspec/master] version-spec: allow EXTRA_INFO to appear multiple times.
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit b50917d9c33d448947296472cc83e9f6ff1e98c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 09:55:42 2017 -0400 version-spec: allow EXTRA_INFO to appear multiple times. --- version-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/version-spec.txt b/version-spec.txt index 4a3dccf..1f25cd1 100644 --- a/version-spec.txt +++ b/version-spec.txt @@ -21,7 +21,7 @@ 2. The New Way After 0.1.0, versions are of the format: - MAJOR.MINOR.MICRO[.PATCHLEVEL][-STATUS_TAG][ (EXTRA_INFO)] + MAJOR.MINOR.MICRO[.PATCHLEVEL][-STATUS_TAG][ (EXTRA_INFO)]* The stuff in parentheses is optional. As before, MAJOR, MINOR, MICRO, and PATCHLEVEL are numbers, with an absent number equivalent to 0. All versions should be distinguishable purely by those four @@ -38,7 +38,8 @@ The EXTRA_INFO is also purely informational, often containing information about the SCM commit this version came from. It is surrounded by parentheses and can't contain whitespace. Unlike the STATUS_TAG this never impacts the way - that versions should be compared. + that versions should be compared. EXTRA_INFO may appear any number of + times. Tools should generally not parse EXTRA_INFO entries. Now, we start each development branch with (say) 0.1.1.1-alpha. The patchlevel increments consistently as the status tag changes, for

1 0

[torspec/master] Merge branch 'bug22110'
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 8aaa36d1a062b20ca263b6ac613b77a3ba1eb113 Merge: ae287fa b50917d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 10:40:39 2017 -0400 Merge branch 'bug22110' version-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.1] Bug 23608: Mock time for all channelpadding tests.
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit d70a793cfc3e01492bd627788aaba54ee291cb87 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 20 22:37:05 2017 +0000 Bug 23608: Mock time for all channelpadding tests. --- changes/bug23608 | 4 ++++ src/test/test_channelpadding.c | 43 +++++++++++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/changes/bug23608 b/changes/bug23608 new file mode 100644 index 000000000..16cf88aa3 --- /dev/null +++ b/changes/bug23608 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Fix additional channelpadding unit test failures by using mocked time + instead of actual time for all tests. Fixes bug 23608; + bugfix on 0.3.1.1-alpha. diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 1e9d59931..d54c9cc52 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -275,6 +275,7 @@ test_channelpadding_timers(void *arg) { channelpadding_decision_t decision; channel_t *chans[CHANNELS_TO_TEST]; + int64_t new_time; (void)arg; tor_libevent_postfork(); @@ -282,6 +283,10 @@ test_channelpadding_timers(void *arg) connection_array = smartlist_new(); monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); + timers_initialize(); channelpadding_new_consensus_params(NULL); @@ -339,8 +344,10 @@ test_channelpadding_timers(void *arg) } // Wait for the timers and then kill the event loop. - dont_stop_libevent = 1; - dummy_nop_timer(); + new_time = (monotime_coarse_absolute_msec()+1001)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, CHANNELS_TO_TEST); @@ -357,6 +364,7 @@ test_channelpadding_timers(void *arg) smartlist_free(connection_array); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return; @@ -366,13 +374,17 @@ void test_channelpadding_killonehop(void *arg) { channelpadding_decision_t decision; + int64_t new_time; (void)arg; tor_libevent_postfork(); routerstatus_t *relay = tor_malloc_zero(sizeof(routerstatus_t)); monotime_init(); - timers_initialize(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); + timers_initialize(); setup_mock_consensus(); setup_mock_network(); @@ -396,7 +408,10 @@ test_channelpadding_killonehop(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -415,7 +430,10 @@ test_channelpadding_killonehop(void *arg) tt_assert(relay3_client->pending_padding_callback); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -461,7 +479,10 @@ test_channelpadding_killonehop(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -481,7 +502,10 @@ test_channelpadding_killonehop(void *arg) tt_assert(relay3_client->pending_padding_callback); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -508,6 +532,7 @@ test_channelpadding_killonehop(void *arg) tor_free(relay); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); } @@ -749,6 +774,9 @@ test_channelpadding_negotiation(void *arg) * 4. Test channelpadding_reduced_padding */ monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); timers_initialize(); setup_mock_consensus(); setup_mock_network(); @@ -855,6 +883,7 @@ test_channelpadding_negotiation(void *arg) free_mock_consensus(); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return;

1 0

[tor/master] Bug 23608: Mock time for all channelpadding tests.
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit d70a793cfc3e01492bd627788aaba54ee291cb87 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 20 22:37:05 2017 +0000 Bug 23608: Mock time for all channelpadding tests. --- changes/bug23608 | 4 ++++ src/test/test_channelpadding.c | 43 +++++++++++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/changes/bug23608 b/changes/bug23608 new file mode 100644 index 000000000..16cf88aa3 --- /dev/null +++ b/changes/bug23608 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Fix additional channelpadding unit test failures by using mocked time + instead of actual time for all tests. Fixes bug 23608; + bugfix on 0.3.1.1-alpha. diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 1e9d59931..d54c9cc52 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -275,6 +275,7 @@ test_channelpadding_timers(void *arg) { channelpadding_decision_t decision; channel_t *chans[CHANNELS_TO_TEST]; + int64_t new_time; (void)arg; tor_libevent_postfork(); @@ -282,6 +283,10 @@ test_channelpadding_timers(void *arg) connection_array = smartlist_new(); monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); + timers_initialize(); channelpadding_new_consensus_params(NULL); @@ -339,8 +344,10 @@ test_channelpadding_timers(void *arg) } // Wait for the timers and then kill the event loop. - dont_stop_libevent = 1; - dummy_nop_timer(); + new_time = (monotime_coarse_absolute_msec()+1001)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, CHANNELS_TO_TEST); @@ -357,6 +364,7 @@ test_channelpadding_timers(void *arg) smartlist_free(connection_array); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return; @@ -366,13 +374,17 @@ void test_channelpadding_killonehop(void *arg) { channelpadding_decision_t decision; + int64_t new_time; (void)arg; tor_libevent_postfork(); routerstatus_t *relay = tor_malloc_zero(sizeof(routerstatus_t)); monotime_init(); - timers_initialize(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); + timers_initialize(); setup_mock_consensus(); setup_mock_network(); @@ -396,7 +408,10 @@ test_channelpadding_killonehop(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -415,7 +430,10 @@ test_channelpadding_killonehop(void *arg) tt_assert(relay3_client->pending_padding_callback); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -461,7 +479,10 @@ test_channelpadding_killonehop(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -481,7 +502,10 @@ test_channelpadding_killonehop(void *arg) tt_assert(relay3_client->pending_padding_callback); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -508,6 +532,7 @@ test_channelpadding_killonehop(void *arg) tor_free(relay); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); } @@ -749,6 +774,9 @@ test_channelpadding_negotiation(void *arg) * 4. Test channelpadding_reduced_padding */ monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); timers_initialize(); setup_mock_consensus(); setup_mock_network(); @@ -855,6 +883,7 @@ test_channelpadding_negotiation(void *arg) free_mock_consensus(); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return;

1 0

[tor/release-0.3.1] Bug 23608: Mock time for all channelpadding tests.
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit d70a793cfc3e01492bd627788aaba54ee291cb87 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 20 22:37:05 2017 +0000 Bug 23608: Mock time for all channelpadding tests. --- changes/bug23608 | 4 ++++ src/test/test_channelpadding.c | 43 +++++++++++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/changes/bug23608 b/changes/bug23608 new file mode 100644 index 000000000..16cf88aa3 --- /dev/null +++ b/changes/bug23608 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Fix additional channelpadding unit test failures by using mocked time + instead of actual time for all tests. Fixes bug 23608; + bugfix on 0.3.1.1-alpha. diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 1e9d59931..d54c9cc52 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -275,6 +275,7 @@ test_channelpadding_timers(void *arg) { channelpadding_decision_t decision; channel_t *chans[CHANNELS_TO_TEST]; + int64_t new_time; (void)arg; tor_libevent_postfork(); @@ -282,6 +283,10 @@ test_channelpadding_timers(void *arg) connection_array = smartlist_new(); monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); + timers_initialize(); channelpadding_new_consensus_params(NULL); @@ -339,8 +344,10 @@ test_channelpadding_timers(void *arg) } // Wait for the timers and then kill the event loop. - dont_stop_libevent = 1; - dummy_nop_timer(); + new_time = (monotime_coarse_absolute_msec()+1001)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, CHANNELS_TO_TEST); @@ -357,6 +364,7 @@ test_channelpadding_timers(void *arg) smartlist_free(connection_array); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return; @@ -366,13 +374,17 @@ void test_channelpadding_killonehop(void *arg) { channelpadding_decision_t decision; + int64_t new_time; (void)arg; tor_libevent_postfork(); routerstatus_t *relay = tor_malloc_zero(sizeof(routerstatus_t)); monotime_init(); - timers_initialize(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); + timers_initialize(); setup_mock_consensus(); setup_mock_network(); @@ -396,7 +408,10 @@ test_channelpadding_killonehop(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -415,7 +430,10 @@ test_channelpadding_killonehop(void *arg) tt_assert(relay3_client->pending_padding_callback); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -461,7 +479,10 @@ test_channelpadding_killonehop(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -481,7 +502,10 @@ test_channelpadding_killonehop(void *arg) tt_assert(relay3_client->pending_padding_callback); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!client_relay3->pending_padding_callback); @@ -508,6 +532,7 @@ test_channelpadding_killonehop(void *arg) tor_free(relay); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); } @@ -749,6 +774,9 @@ test_channelpadding_negotiation(void *arg) * 4. Test channelpadding_reduced_padding */ monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); timers_initialize(); setup_mock_consensus(); setup_mock_network(); @@ -855,6 +883,7 @@ test_channelpadding_negotiation(void *arg) free_mock_consensus(); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return;

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 5bf84b1f00e29a647c1734948d89c15c8a603225 Merge: 7ef22d0bf d70a793cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 10:39:10 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23608 | 4 ++++ src/test/test_channelpadding.c | 43 +++++++++++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit c7b7cf8e18f23a16eaca0520d90f5044fd646857 Merge: ac8e26a41 d70a793cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 10:39:10 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23608 | 4 ++++ src/test/test_channelpadding.c | 43 +++++++++++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 7 deletions(-)

1 0