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

[tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit d4ca18573ccd0164f4d867e41a8f453119ce421f Merge: 779e4b9dc 1a55a5ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:37:53 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2 changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.2] test: Add a KIST test for a non opened channel
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 1a55a5ff06f9022a115943248b0eeb9d3c67c6c8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 6 11:33:01 2017 -0500 test: Add a KIST test for a non opened channel This makes sure that a non opened channel is never put back in the channel pending list and that its state is consistent with what we expect that is IDLE. Test the fixes in #24502. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index d679d7cfe..63add2f38 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -807,6 +807,7 @@ test_scheduler_loop_kist(void *arg) #endif channel_t *ch1 = new_fake_channel(), *ch2 = new_fake_channel(); + channel_t *ch3 = new_fake_channel(); /* setup options so we're sure about what sched we are running */ MOCK(get_options, mock_get_options); @@ -857,14 +858,35 @@ test_scheduler_loop_kist(void *arg) the_scheduler->run(); channel_flush_some_cells_mock_free_all(); - tt_int_op(1,==,1); + + /* We'll try to run this closed channel threw the scheduler loop and make + * sure it ends up in the right state. */ + tt_assert(ch3); + ch3->magic = TLS_CHAN_MAGIC; + ch3->state = CHANNEL_STATE_OPEN; + ch3->cmux = circuitmux_alloc(); + channel_register(ch3); + tt_assert(ch3->registered); + + ch3->scheduler_state = SCHED_CHAN_WAITING_FOR_CELLS; + scheduler_channel_has_waiting_cells(ch3); + /* Should be in the pending list now waiting to be handled. */ + tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_PENDING); + tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 1); + /* By running the scheduler on a closed channel, it should end up in the + * IDLE state and not in the pending channel list. */ + ch3->state = CHANNEL_STATE_CLOSED; + the_scheduler->run(); + tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_IDLE); + tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 0); done: /* Prep the channel so the free() function doesn't explode. */ - ch1->state = ch2->state = CHANNEL_STATE_CLOSED; - ch1->registered = ch2->registered = 0; + ch1->state = ch2->state = ch3->state = CHANNEL_STATE_CLOSED; + ch1->registered = ch2->registered = ch3->registered = 0; channel_free(ch1); channel_free(ch2); + channel_free(ch3); UNMOCK(update_socket_info_impl); UNMOCK(channel_should_write_to_kernel); UNMOCK(channel_write_to_kernel);

1 0

[tor/master] Sprinkle some consts in networkstatus_getinfo_by_purpose()
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 9acfd70f26ce8ad10c0b4a68de24121abf503c69 Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 14:37:32 2017 -0400 Sprinkle some consts in networkstatus_getinfo_by_purpose() And note where we change the running flag, but probably shouldn't. Implements ticket 24489. --- changes/bug24489 | 3 +++ src/or/networkstatus.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug24489 b/changes/bug24489 new file mode 100644 index 000000000..6864ba6f5 --- /dev/null +++ b/changes/bug24489 @@ -0,0 +1,3 @@ + o Code simplification and refactoring (controller): + - Make most of the variables in networkstatus_getinfo_by_purpose() const. + Implements ticket 24489. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 10d9b7542..eeb72831c 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2222,13 +2222,13 @@ networkstatus_getinfo_helper_single(const routerstatus_t *rs) char * networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now) { - time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH; + const time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH; char *answer; routerlist_t *rl = router_get_routerlist(); smartlist_t *statuses; - uint8_t purpose = router_purpose_from_string(purpose_string); + const uint8_t purpose = router_purpose_from_string(purpose_string); routerstatus_t rs; - int bridge_auth = authdir_mode_bridge(get_options()); + const int bridge_auth = authdir_mode_bridge(get_options()); if (purpose == ROUTER_PURPOSE_UNKNOWN) { log_info(LD_DIR, "Unrecognized purpose '%s' when listing router statuses.", @@ -2245,6 +2245,7 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now) continue; if (ri->purpose != purpose) continue; + /* TODO: modifying the running flag in a getinfo is a bad idea */ if (bridge_auth && ri->purpose == ROUTER_PURPOSE_BRIDGE) dirserv_set_router_is_running(ri, now); /* then generate and write out status lines for each of them */

1 0

[tor/master] Merge remote-tracking branch 'teor/bug24489'
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 91f72bbb6c2ef97836393144f9cd095a71c5f008 Merge: aa6212a85 9acfd70f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:37:15 2017 -0500 Merge remote-tracking branch 'teor/bug24489' changes/bug24489 | 3 +++ src/or/networkstatus.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] sched: Set channel scheduler state to IDLE when not opened
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 97702c69b03b19a8a6f867e56f716ce984550fa0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 4 14:48:15 2017 -0500 sched: Set channel scheduler state to IDLE when not opened In the KIST main loop, if the channel happens to be not opened, set its state to IDLE so we can release it properly later on. Prior to this fix, the channel was in PENDING state, removed from the channel pending list and then kept in that state because it is not opened. This bug was introduced in commit dcabf801e52a83e2c3cc23ccc1fa906582a927d6 for which we made the scheduler loop not consider unopened channel. This has no consequences on tor except for an annoying but harmless BUG() warning. Fixes #24502 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24502 b/changes/bug24502 new file mode 100644 index 000000000..3fa6fb58d --- /dev/null +++ b/changes/bug24502 @@ -0,0 +1,4 @@ + o Minor bugfixes (scheduler): + - Properly set the scheduler state of an unopened channel in the KIST + scheduler main loop. This prevents a harmless but annoying log warning. + Fixes bug 24502; bugfix on 0.3.2.4-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index fea92705d..3d8f553ac 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -606,9 +606,12 @@ kist_scheduler_run(void) * fails leading to the channel to be closed which triggers a release * and free its entry in the socket table. And because of a engineering * design issue, the error is not propagated back so we don't get an - * error at this poin. So before we continue, make sure the channel is + * error at this point. So before we continue, make sure the channel is * open and if not just ignore it. See #23751. */ if (!CHANNEL_IS_OPEN(chan)) { + /* Channel isn't open so we put it back in IDLE mode. It is either + * renegotiating its TLS session or about to be released. */ + chan->scheduler_state = SCHED_CHAN_IDLE; continue; } /* flush_result has the # cells flushed */

1 0

[tor/master] test: Add a KIST test for a non opened channel
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 1a55a5ff06f9022a115943248b0eeb9d3c67c6c8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 6 11:33:01 2017 -0500 test: Add a KIST test for a non opened channel This makes sure that a non opened channel is never put back in the channel pending list and that its state is consistent with what we expect that is IDLE. Test the fixes in #24502. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index d679d7cfe..63add2f38 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -807,6 +807,7 @@ test_scheduler_loop_kist(void *arg) #endif channel_t *ch1 = new_fake_channel(), *ch2 = new_fake_channel(); + channel_t *ch3 = new_fake_channel(); /* setup options so we're sure about what sched we are running */ MOCK(get_options, mock_get_options); @@ -857,14 +858,35 @@ test_scheduler_loop_kist(void *arg) the_scheduler->run(); channel_flush_some_cells_mock_free_all(); - tt_int_op(1,==,1); + + /* We'll try to run this closed channel threw the scheduler loop and make + * sure it ends up in the right state. */ + tt_assert(ch3); + ch3->magic = TLS_CHAN_MAGIC; + ch3->state = CHANNEL_STATE_OPEN; + ch3->cmux = circuitmux_alloc(); + channel_register(ch3); + tt_assert(ch3->registered); + + ch3->scheduler_state = SCHED_CHAN_WAITING_FOR_CELLS; + scheduler_channel_has_waiting_cells(ch3); + /* Should be in the pending list now waiting to be handled. */ + tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_PENDING); + tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 1); + /* By running the scheduler on a closed channel, it should end up in the + * IDLE state and not in the pending channel list. */ + ch3->state = CHANNEL_STATE_CLOSED; + the_scheduler->run(); + tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_IDLE); + tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 0); done: /* Prep the channel so the free() function doesn't explode. */ - ch1->state = ch2->state = CHANNEL_STATE_CLOSED; - ch1->registered = ch2->registered = 0; + ch1->state = ch2->state = ch3->state = CHANNEL_STATE_CLOSED; + ch1->registered = ch2->registered = ch3->registered = 0; channel_free(ch1); channel_free(ch2); + channel_free(ch3); UNMOCK(update_socket_info_impl); UNMOCK(channel_should_write_to_kernel); UNMOCK(channel_write_to_kernel);

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24502_032_01'
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit aa6212a85810937b2aa43fa1021e0118a5fb3f2a Merge: 9fa38bd99 1a55a5ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 6 14:31:33 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24502_032_01' changes/bug24502 | 4 ++++ src/or/scheduler_kist.c | 5 ++++- src/test/test_scheduler.c | 28 +++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-)

1 0

[tor/master] Check the return value of hs_parse_address().
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 9fa38bd996e345990b81bce0995a25be2ee4c98f Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 6 14:52:02 2017 +0100 Check the return value of hs_parse_address(). This patch adds a check for the return value of `hs_parse_address()` in `hs_control_hspost_command()`. Since it should not be possible for `hs_parse_address()` to fail in this context we wrap the error check with the `BUG()` macro. See: https://bugs.torproject.org/24543 --- src/or/hs_control.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/hs_control.c b/src/or/hs_control.c index 1b1fe7857..87b4e3fca 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -222,7 +222,9 @@ hs_control_hspost_command(const char *body, const char *onion_address, /* This can't fail because we require the caller to pass us a valid onion * address that has passed hs_address_is_valid(). */ - hs_parse_address(onion_address, &identity_pk, NULL, NULL); + if (BUG(hs_parse_address(onion_address, &identity_pk, NULL, NULL) < 0)) { + goto done; // LCOV_EXCL_LINE + } /* Only decode the plaintext part which is what the directory will do to * validate before caching. */

1 0

[translation/tor-messenger-uiproperties_completed] Update translations for tor-messenger-uiproperties_completed
by translation＠torproject.org 06 Dec '17

06 Dec '17

commit 6a20c25c05f1618031b8998836358c9db2c6b86b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 6 16:50:33 2017 +0000 Update translations for tor-messenger-uiproperties_completed --- ms_MY/ui.properties | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/ms_MY/ui.properties b/ms_MY/ui.properties new file mode 100644 index 000000000..5a11c9763 --- /dev/null +++ b/ms_MY/ui.properties @@ -0,0 +1,27 @@ +start.label=Mulakan perbualan persendirian +end.label=Tamatkan perbualan persendirian +refresh.label=Segar semula perbualan persendirian +auth.label=Sahkan identiti kenalan anda +auth.cancel=Batal +auth.cancelAccessKey=C +auth.error=Satu ralat berlaku ketika mengesahkan identiti kenalan anda. +auth.success=Pengesahan identiti kenalan anda telah selesai. +auth.successThem=Kenalan anda berjaya mengesahkan identiti anda. Anda boleh patut mengesahkan identitinya dengan menanya soalan anda juga. +auth.fail=Gagal mengesahkan identiti kenalan anda. +auth.waiting=Menunggu kenalan ... +reauth.label=Sahkan semula identiti kenalan anda +prefs.label=Keutamaan OTR +alert.start=Cuba memulakan perbualan persendirian dengan %S. +alert.refresh=Cuba menyegar semula perbualan persendirian dengan %S. +alert.gone_insecure=Perbualan persendirian dengan %S telah tamat. +finger.seen=%S telah menghubungi anda menerusi komputer yang tidak dikenalpasti. Anda patut mengesahkan identiti kenalan ini. +finger.unseen=Identiti %S belum disahkan lagi. Anda sepatutnya mengesahkan identiti kenalan ini. +finger.verify=Sahkan +verify.accessKey=V +state.not_private=Perbualan semasa tidak sulit. +state.unverified=Perbualan semasa adalah sulit tetapi identiti %S belum disahkan lagi. +state.private=Perbualan semasa adalah sulit tetapi identiti %S telah disahkan. +state.finished=%S telah menamatkan perbualan persendirian mereka dengan anda; anda patut lakukan perkara yang sama. +afterauth.private=Anda telah mengesahkan identiti %S. +afterauth.unverified=Identiti %S belum disahkan lagi. +buddycontextmenu.label=Tambah Cap Jari Kenalan

1 0

[translation/tor-messenger-uiproperties] Update translations for tor-messenger-uiproperties
by translation＠torproject.org 06 Dec '17

06 Dec '17

commit c3d2c848e62a3b6ae5887cd9e57760da4b572d60 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 6 16:50:27 2017 +0000 Update translations for tor-messenger-uiproperties --- ms_MY/ui.properties | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ms_MY/ui.properties b/ms_MY/ui.properties index 3e3fcbf38..5a11c9763 100644 --- a/ms_MY/ui.properties +++ b/ms_MY/ui.properties @@ -1,27 +1,27 @@ -start.label=Start private conversation -end.label=End private conversation -refresh.label=Refresh private conversation -auth.label=Verify your contact's identity +start.label=Mulakan perbualan persendirian +end.label=Tamatkan perbualan persendirian +refresh.label=Segar semula perbualan persendirian +auth.label=Sahkan identiti kenalan anda auth.cancel=Batal auth.cancelAccessKey=C auth.error=Satu ralat berlaku ketika mengesahkan identiti kenalan anda. -auth.success=Verifying your contact's identity completed successfully. -auth.successThem=Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question. -auth.fail=Failed to verify your contact's identity. +auth.success=Pengesahan identiti kenalan anda telah selesai. +auth.successThem=Kenalan anda berjaya mengesahkan identiti anda. Anda boleh patut mengesahkan identitinya dengan menanya soalan anda juga. +auth.fail=Gagal mengesahkan identiti kenalan anda. auth.waiting=Menunggu kenalan ... -reauth.label=Reverify your contact's identity +reauth.label=Sahkan semula identiti kenalan anda prefs.label=Keutamaan OTR -alert.start=Attempting to start a private conversation with %S. -alert.refresh=Attempting to refresh the private conversation with %S. -alert.gone_insecure=Private conversation with %S ended. -finger.seen=%S is contacting you from an unrecognized computer. You should verify this contact's identity. -finger.unseen=%S's identity has not been verified yet. You should verify this contact's identity. +alert.start=Cuba memulakan perbualan persendirian dengan %S. +alert.refresh=Cuba menyegar semula perbualan persendirian dengan %S. +alert.gone_insecure=Perbualan persendirian dengan %S telah tamat. +finger.seen=%S telah menghubungi anda menerusi komputer yang tidak dikenalpasti. Anda patut mengesahkan identiti kenalan ini. +finger.unseen=Identiti %S belum disahkan lagi. Anda sepatutnya mengesahkan identiti kenalan ini. finger.verify=Sahkan verify.accessKey=V -state.not_private=The current conversation is not private. -state.unverified=The current conversation is private but %S's identity has not been verified. -state.private=The current conversation is private and %S's identity has been verified. -state.finished=%S has ended their private conversation with you; you should do the same. -afterauth.private=You have verified %S's identity. -afterauth.unverified=%S's identity has not been verified. +state.not_private=Perbualan semasa tidak sulit. +state.unverified=Perbualan semasa adalah sulit tetapi identiti %S belum disahkan lagi. +state.private=Perbualan semasa adalah sulit tetapi identiti %S telah disahkan. +state.finished=%S telah menamatkan perbualan persendirian mereka dengan anda; anda patut lakukan perkara yang sama. +afterauth.private=Anda telah mengesahkan identiti %S. +afterauth.unverified=Identiti %S belum disahkan lagi. buddycontextmenu.label=Tambah Cap Jari Kenalan

1 0