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

[tor/maint-0.3.4] Bug 23512: Test fix: cmux is now allocated by new_fake_channel()
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit ad10cafd9f0157e6aaa6f1f68ab7d3ef9b8b1b2e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Sep 14 20:45:21 2018 +0000 Bug 23512: Test fix: cmux is now allocated by new_fake_channel() --- src/test/test_relay.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 5e226ade5..ffb013442 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -78,10 +78,6 @@ test_relay_close_circuit(void *arg) pchan = new_fake_channel(); tt_assert(pchan); - /* We'll need chans with working cmuxes */ - nchan->cmux = circuitmux_alloc(); - pchan->cmux = circuitmux_alloc(); - /* Make a fake orcirc */ orcirc = new_fake_orcirc(nchan, pchan); tt_assert(orcirc);

1 0

[tor/maint-0.3.4] Merge branch 'bug23512-v4-032' into bug23512-v4-033
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit 72cef6102845e556cf58636e47f8d411ba19f456 Merge: a546e0760 dd15998d2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 17 23:31:34 2018 +0000 Merge branch 'bug23512-v4-032' into bug23512-v4-033 changes/bug23512 | 6 +++ src/or/channeltls.h | 2 + src/or/circuitlist.c | 59 ++++++++++++++++++++++++ src/or/circuitlist.h | 2 + src/or/or.h | 12 +++++ src/or/relay.c | 1 + src/or/rephist.c | 21 +++++---- src/or/rephist.h | 10 +++-- src/or/scheduler_kist.c | 2 - src/test/test_relay.c | 116 +++++++++++++++++++++++++++++++++++++++++++++--- 10 files changed, 212 insertions(+), 19 deletions(-) diff --cc src/or/circuitlist.c index 7bdef0b87,da19a534e..78d8a6602 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@@ -51,10 -51,9 +51,11 @@@ * logic, which was originally circuit-focused. **/ #define CIRCUITLIST_PRIVATE +#include "torint.h" /* TOR_PRIuSZ */ + #include "or.h" #include "channel.h" + #include "channeltls.h" #include "circpathbias.h" #include "circuitbuild.h" #include "circuitlist.h" diff --cc src/or/rephist.h index 507272159,e67209d3e..37a91fd9b --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -13,9 -13,16 +13,9 @@@ #define TOR_REPHIST_H void rep_hist_init(void); -void rep_hist_note_connect_failed(const char* nickname, time_t when); -void rep_hist_note_connect_succeeded(const char* nickname, time_t when); -void rep_hist_note_disconnect(const char* nickname, time_t when); -void rep_hist_note_connection_died(const char* nickname, time_t when); -void rep_hist_note_extend_succeeded(const char *from_name, - const char *to_name); -void rep_hist_note_extend_failed(const char *from_name, const char *to_name); void rep_hist_dump_stats(time_t now, int severity); - void rep_hist_note_bytes_read(size_t num_bytes, time_t when); - void rep_hist_note_bytes_written(size_t num_bytes, time_t when); + void rep_hist_note_bytes_read(uint64_t num_bytes, time_t when); + void rep_hist_note_bytes_written(uint64_t num_bytes, time_t when); void rep_hist_make_router_pessimal(const char *id, time_t when);

1 0

[tor/maint-0.3.4] Bug 23512: Mock assert_circuit_ok in tests.
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit dfd3823047d05a878a7a559ab6fc539dcad240fc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Sep 14 20:28:47 2018 +0000 Bug 23512: Mock assert_circuit_ok in tests. This mocking was not available in 0.2.9. --- src/test/test_relay.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/test/test_relay.c b/src/test/test_relay.c index ce8ff1a91..f18de805f 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -48,12 +48,6 @@ new_fake_orcirc(channel_t *nchan, channel_t *pchan) circ->deliver_window = CIRCWINDOW_START_MAX; circ->n_chan_create_cell = NULL; - /* for assert_circ_ok */ - orcirc->p_crypto = (void*)1; - orcirc->n_crypto = (void*)1; - orcirc->n_digest = (void*)1; - orcirc->p_digest = (void*)1; - circuit_set_p_circid_chan(orcirc, get_unique_circ_id_by_chan(pchan), pchan); cell_queue_init(&(orcirc->p_chan_cells)); @@ -61,6 +55,13 @@ new_fake_orcirc(channel_t *nchan, channel_t *pchan) } static void +assert_circuit_ok_mock(const circuit_t *c) +{ + (void) c; + return; +} + +static void test_relay_close_circuit(void *arg) { channel_t *nchan = NULL, *pchan = NULL; @@ -95,6 +96,8 @@ test_relay_close_circuit(void *arg) MOCK(scheduler_channel_has_waiting_cells, scheduler_channel_has_waiting_cells_mock); + MOCK(assert_circuit_ok, + assert_circuit_ok_mock); /* Append it */ old_count = get_mock_scheduler_has_waiting_cells_count(); @@ -146,6 +149,7 @@ test_relay_close_circuit(void *arg) tor_free(orcirc); free_fake_channel(nchan); free_fake_channel(pchan); + UNMOCK(assert_circuit_ok); return; }

1 0

[tor/maint-0.3.4] Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit e91b999cf2dfbb250cbf6c674ea01d7cee518092 Merge: ad10cafd9 72e30f26e Author: teor <teor(a)torproject.org> Date: Fri Mar 8 19:37:18 2019 +1000 Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes src/or/rephist.c | 5 ++--- src/test/test_relay.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.3.4] Fix a pair of errors in bug23512
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit 72e30f26ec291baba202b71e121c3211af2db371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 20 14:18:09 2018 -0400 Fix a pair of errors in bug23512 --- src/or/rephist.c | 5 ++--- src/test/test_relay.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 211480284..20f9148f0 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1211,7 +1211,7 @@ rep_hist_load_mtbf_data(time_t now) /** Structure to track bandwidth use, and remember the maxima for a given * time period. */ -typedef struct bw_array_t { +struct bw_array_t { /** Observation array: Total number of bytes transferred in each of the last * NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */ uint64_t obs[NUM_SECS_ROLLING_MEASURE]; @@ -1238,7 +1238,7 @@ typedef struct bw_array_t { /** Circular array of the total bandwidth usage for the last NUM_TOTALS * periods */ uint64_t totals[NUM_TOTALS]; -} bw_array_t; +}; /** Shift the current period of b forward by one. */ STATIC void @@ -3297,4 +3297,3 @@ rep_hist_free_all(void) tor_assert_nonfatal(rephist_total_alloc == 0); tor_assert_nonfatal_once(rephist_total_num == 0); } - diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 1ec538395..57dcb2406 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -111,7 +111,7 @@ test_relay_close_circuit(void *arg) tt_int_op(new_count, OP_EQ, old_count + 1); /* Ensure our write totals are 0 */ - tt_int_op(find_largest_max(write_array), OP_EQ, 0); + tt_u64_op(find_largest_max(write_array), OP_EQ, 0); /* Mark the circuit for close */ circuit_mark_for_close(TO_CIRCUIT(orcirc), 0); @@ -120,7 +120,7 @@ test_relay_close_circuit(void *arg) advance_obs(write_array); commit_max(write_array); /* Check for two cells plus overhead */ - tt_int_op(find_largest_max(write_array), OP_EQ, + tt_u64_op(find_largest_max(write_array), OP_EQ, 2*(get_cell_network_size(nchan->wide_circ_ids) +TLS_PER_CELL_OVERHEAD)); @@ -233,4 +233,3 @@ struct testcase_t relay_tests[] = { TT_FORK, NULL, NULL }, END_OF_TESTCASES }; -

1 0

[tor/maint-0.3.4] Bug 25733: Avoid assert failure if all circuits time out.
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit e8d84b18aabf6a3d32a41700142048224e83ed8b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 16 22:49:27 2018 +0000 Bug 25733: Avoid assert failure if all circuits time out. Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert. --- changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug25733 b/changes/bug25733 new file mode 100644 index 000000000..775c1ae00 --- /dev/null +++ b/changes/bug25733 @@ -0,0 +1,4 @@ + o Minor bugfixes (Assert crash): + - Avoid an assert in the circuit build timeout code if we fail to + allow any circuits to actually complete. Fixes bug 25733; + bugfix on 0.2.2.2-alpha. diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 418acc002..735b3f0fc 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -753,11 +753,23 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) histogram[nth_max_bin[n]]); } - /* The following assert is safe, because we don't get called when we - * haven't observed at least CBT_MIN_MIN_CIRCUITS_TO_OBSERVE circuits. */ + /* bin_counts can become zero if all of our last CBT_NCIRCUITS_TO_OBSERVE + * circuits were abandoned before they completed. This shouldn't happen, + * though. We should have reset/re-learned a lower timeout first. */ + if (bin_counts == 0) { + ret = 0; + log_warn(LD_CIRC, + "No valid circuit build time data out of %d times, %u modes, " + "have_timeout=%d, %lfms", cbt->total_build_times, num_modes, + cbt->have_computed_timeout, cbt->timeout_ms); + goto done; + } + tor_assert(bin_counts > 0); ret /= bin_counts; + + done: tor_free(histogram); tor_free(nth_max_bin); @@ -1043,6 +1055,10 @@ circuit_build_times_update_alpha(circuit_build_times_t *cbt) * and less frechet-like. */ cbt->Xm = circuit_build_times_get_xm(cbt); + /* If Xm came back 0, then too many circuits were abandoned. */ + if (cbt->Xm == 0) + return 0; + tor_assert(cbt->Xm > 0); for (i=0; i< CBT_NCIRCUITS_TO_OBSERVE; i++) {

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit 8bd9b2a6a0c7ab01ef72dd26e04544b00f8c9fa8 Merge: 90301247f 72e30f26e Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:37:50 2019 +1000 Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9 changes/bug23512 | 6 +++ src/or/channeltls.h | 2 + src/or/circuitlist.c | 59 ++++++++++++++++++++++++++ src/or/circuitlist.h | 2 + src/or/or.h | 12 ++++++ src/or/relay.c | 1 + src/or/rephist.c | 26 +++++++----- src/or/rephist.h | 10 +++-- src/test/test_relay.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++--- 9 files changed, 210 insertions(+), 21 deletions(-) diff --cc src/or/rephist.h index 6d35ac67f,837bb8d04..c464b34f7 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -26,10 -26,10 +26,10 @@@ void rep_hist_note_bytes_written(uint64 void rep_hist_make_router_pessimal(const char *id, time_t when); - void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); - void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when); -int rep_hist_bandwidth_assess(void); +MOCK_DECL(int, rep_hist_bandwidth_assess, (void)); char *rep_hist_get_bandwidth_lines(void); void rep_hist_update_state(or_state_t *state); int rep_hist_load_state(or_state_t *state, char **err);

1 0

[tor/maint-0.3.4] Windows: fix uname on recent Windows versions
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit 2fbc58cf07fd7367ddaf81b82868b5f37d7883ae Author: teor <teor(a)torproject.org> Date: Mon Oct 22 14:02:43 2018 +1000 Windows: fix uname on recent Windows versions Correctly identify Windows 8.1, Windows 10, and Windows Server 2008 and later from their NT versions. On recent Windows versions, the GetVersionEx() function may report an earlier Windows version than the running OS. To avoid user confusion, add "[or later]" to Tor's version string on affected versions of Windows. Remove Windows versions that were never supported by the GetVersionEx() function. Stop duplicating the latest Windows version in get_uname(). Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. --- changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --git a/changes/bug28096 b/changes/bug28096 new file mode 100644 index 000000000..6847df979 --- /dev/null +++ b/changes/bug28096 @@ -0,0 +1,13 @@ + o Minor bugfixes (Windows): + - Correctly identify Windows 8.1, Windows 10, and Windows Server 2008 + and later from their NT versions. + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. + - On recent Windows versions, the GetVersionEx() function may report + an earlier Windows version than the running OS. To avoid user + confusion, add "[or later]" to Tor's version string on affected + versions of Windows. + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. + - Remove Windows versions that were never supported by the + GetVersionEx() function. Stop duplicating the latest Windows + version in get_uname(). + Fixes bug 28096; bugfix on 0.2.2.34; reported by Keifer Bly. diff --git a/src/common/compat.c b/src/common/compat.c index 4ac443c13..975875112 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2689,22 +2689,33 @@ MOCK_IMPL(const char *, get_uname, (void)) #ifdef _WIN32 OSVERSIONINFOEX info; int i; + int is_client = 0; + int is_server = 0; const char *plat = NULL; static struct { - unsigned major; unsigned minor; const char *version; + unsigned major; unsigned minor; + const char *client_version; const char *server_version; } win_version_table[] = { - { 6, 2, "Windows 8" }, - { 6, 1, "Windows 7" }, - { 6, 0, "Windows Vista" }, - { 5, 2, "Windows Server 2003" }, - { 5, 1, "Windows XP" }, - { 5, 0, "Windows 2000" }, - /* { 4, 0, "Windows NT 4.0" }, */ - { 4, 90, "Windows Me" }, - { 4, 10, "Windows 98" }, - /* { 4, 0, "Windows 95" } */ - { 3, 51, "Windows NT 3.51" }, - { 0, 0, NULL } + /* This table must be sorted in descending order. + * Sources: + * https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions + * https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ + * ns-winnt-_osversioninfoexa#remarks + */ + /* Windows Server 2019 is indistinguishable from Windows Server 2016 + * using GetVersionEx(). + { 10, 0, NULL, "Windows Server 2019" }, */ + { 10, 0, "Windows 10", "Windows Server 2016" }, + { 6, 3, "Windows 8.1", "Windows Server 2012 R2" }, + { 6, 2, "Windows 8", "Windows Server 2012" }, + { 6, 1, "Windows 7", "Windows Server 2008 R2" }, + { 6, 0, "Windows Vista", "Windows Server 2008" }, + { 5, 2, "Windows XP Professional", "Windows Server 2003" }, + /* Windows XP did not have a server version, but we need something here */ + { 5, 1, "Windows XP", "Windows XP Server" }, + { 5, 0, "Windows 2000 Professional", "Windows 2000 Server" }, + /* Earlier versions are not supported by GetVersionEx(). */ + { 0, 0, NULL, NULL } }; memset(&info, 0, sizeof(info)); info.dwOSVersionInfoSize = sizeof(info); @@ -2714,25 +2725,34 @@ MOCK_IMPL(const char *, get_uname, (void)) uname_result_is_set = 1; return uname_result; } - if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { - if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) - plat = "Windows NT 4.0"; - else - plat = "Windows 95"; +#ifdef VER_NT_SERVER + if (info.wProductType == VER_NT_SERVER || + info.wProductType == VER_NT_DOMAIN_CONTROLLER) { + is_server = 1; } else { - for (i=0; win_version_table[i].major>0; ++i) { - if (win_version_table[i].major == info.dwMajorVersion && - win_version_table[i].minor == info.dwMinorVersion) { - plat = win_version_table[i].version; - break; + is_client = 1; + } +#endif + /* Search the version table for a matching version */ + for (i=0; win_version_table[i].major>0; ++i) { + if (win_version_table[i].major == info.dwMajorVersion && + win_version_table[i].minor == info.dwMinorVersion) { + if (is_server) { + plat = win_version_table[i].server_version; + } else { + /* Use client versions for clients, and when we don't know if it + * is a client or a server. */ + plat = win_version_table[i].client_version; } + break; } } if (plat) { strlcpy(uname_result, plat, sizeof(uname_result)); } else { - if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>2)) + if (info.dwMajorVersion > win_version_table[0].major || + (info.dwMajorVersion == win_version_table[0].major && + info.dwMinorVersion > win_version_table[0].minor)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); @@ -2741,12 +2761,25 @@ MOCK_IMPL(const char *, get_uname, (void)) "Unrecognized version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); } -#ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } -#endif + /* Now append extra information to the name. + * + * Microsoft's API documentation says that on Windows 8.1 and later, + * GetVersionEx returns Windows 8 (6.2) for applications without an + * app compatibility manifest (including tor's default build). + * + * But in our testing, we have seen the actual Windows version on + * Windows Server 2012 R2, even without a manifest. */ + if (info.dwMajorVersion > 6 || + (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { + /* When GetVersionEx() returns Windows 8, the actual OS may be any + * later version. */ + strlcat(uname_result, " [or later]", sizeof(uname_result)); + } + /* When we don't know if the OS is a client or server version, we use + * the client version, and this qualifier. */ + if (!is_server && !is_client) { + strlcat(uname_result, " [client or server]", sizeof(uname_result)); + } #else /* LCOV_EXCL_START -- can't provoke uname failure */ strlcpy(uname_result, "Unknown platform", sizeof(uname_result));

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit 9daae1b302abb8c0e75773738cb4f55d88ff6b1d Merge: 2e74edb53 7a0ff5beb Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:35:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9 changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9
by teor＠torproject.org 14 Mar '19

14 Mar '19

commit 90301247fd35225cc25b6ea2568364356ff00580 Merge: 530304dd7 981bb6057 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:37:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9 changes/bug23681 | 5 +++++ src/or/circuituse.c | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)

1 0