June 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.2] Add tests for control_event_signal.
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit b2c3cb1b26c41969776ed1fd1b20588430346e45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 11:38:36 2020 -0500 Add tests for control_event_signal. --- src/test/test_controller_events.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 910aacace..5b108ab31 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -16,6 +16,7 @@ #include "core/mainloop/connection.h" #include "feature/control/control_events.h" #include "test/test.h" +#include "test/log_test_helpers.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" @@ -393,6 +394,43 @@ test_cntev_dirboot_defer_orconn(void *arg) UNMOCK(queue_control_event_string); } +static void +test_cntev_signal(void *arg) +{ + (void)arg; + int rv; + + MOCK(queue_control_event_string, mock_queue_control_event_string); + + /* Nothing is listening for signals, so no event should be queued. */ + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + + /* Now try with signals included in the event mask. */ + control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL)); + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n"); + + rv = control_event_signal(SIGACTIVE); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n"); + + /* Try a signal that doesn't exist. */ + setup_full_capture_of_logs(LOG_WARN); + tor_free(saved_event_str); + rv = control_event_signal(99999); + tt_int_op(-1, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + expect_single_log_msg_containing("Unrecognized signal 99999"); + + done: + tor_free(saved_event_str); + teardown_capture_of_logs(); + UNMOCK(queue_control_event_string); +} + static void setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan, int proxy_type) @@ -541,6 +579,7 @@ struct testcase_t controller_event_tests[] = { TEST(event_mask, TT_FORK), TEST(dirboot_defer_desc, TT_FORK), TEST(dirboot_defer_orconn, TT_FORK), + TEST(signal, TT_FORK), TEST(orconn_state, TT_FORK), TEST(orconn_state_pt, TT_FORK), TEST(orconn_state_proxy, TT_FORK),

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit b2ce815bd8ddcde2ea49b0020b3feda83d88444f Merge: 9e85515f8 d124cfc05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 +++++++++-------------------- src/test/test_controller_events.c | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 22 deletions(-) diff --cc src/test/test_controller_events.c index 9fb2bc725,5b108ab31..0d276ef8a --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@@ -17,7 -16,7 +17,8 @@@ #include "core/mainloop/connection.h" #include "feature/control/control_events.h" #include "test/test.h" +#include "test/test_helpers.h" + #include "test/log_test_helpers.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" @@@ -395,13 -394,51 +396,50 @@@ test_cntev_dirboot_defer_orconn(void *a UNMOCK(queue_control_event_string); } + static void + test_cntev_signal(void *arg) + { + (void)arg; + int rv; + + MOCK(queue_control_event_string, mock_queue_control_event_string); + + /* Nothing is listening for signals, so no event should be queued. */ + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + + /* Now try with signals included in the event mask. */ + control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL)); + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n"); + + rv = control_event_signal(SIGACTIVE); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n"); + + /* Try a signal that doesn't exist. */ + setup_full_capture_of_logs(LOG_WARN); + tor_free(saved_event_str); + rv = control_event_signal(99999); + tt_int_op(-1, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + expect_single_log_msg_containing("Unrecognized signal 99999"); + + done: + tor_free(saved_event_str); + teardown_capture_of_logs(); + UNMOCK(queue_control_event_string); + } + static void -setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan, +setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan, int proxy_type) { - msg->type = ORCONN_MSGTYPE_STATE; - msg->u.state.gid = gid; - msg->u.state.chan = chan; - msg->u.state.proxy_type = proxy_type; + msg->gid = gid; + msg->chan = chan; + msg->proxy_type = proxy_type; } static void @@@ -548,10 -577,11 +586,11 @@@ struct testcase_t controller_event_test TEST(append_cell_stats, TT_FORK), TEST(format_cell_stats, TT_FORK), TEST(event_mask, TT_FORK), - TEST(dirboot_defer_desc, TT_FORK), - TEST(dirboot_defer_orconn, TT_FORK), - TEST(signal, TT_FORK), - TEST(orconn_state, TT_FORK), - TEST(orconn_state_pt, TT_FORK), - TEST(orconn_state_proxy, TT_FORK), + T_PUBSUB(dirboot_defer_desc, TT_FORK), + T_PUBSUB(dirboot_defer_orconn, TT_FORK), ++ T_PUBSUB(signal, TT_FORK), + T_PUBSUB(orconn_state, TT_FORK), + T_PUBSUB(orconn_state_pt, TT_FORK), + T_PUBSUB(orconn_state_proxy, TT_FORK), END_OF_TESTCASES };

1 0

[tor/release-0.4.2] Rewrite control_event_signal() to use signal_table.
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 7bd671811ec38e8126ffc17cb922f2397c572cda Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 09:29:07 2020 -0500 Rewrite control_event_signal() to use signal_table. When we added the ACTIVE and DORMANT virtual signals, we taught the signal command to handle them, but we didn't teach SIGNAL event to report them. To solve this problem and prevent it from recurring, this patch revises the implementation of control_event_signal() to use the same signal_table that handle_control_signal() uses. This way, the two controller commands can't become out of sync. Fixes bug 33104; bugfix on 0.4.0.1-alpha. --- changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 ++++++++++---------------------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/changes/bug33104 b/changes/bug33104 new file mode 100644 index 000000000..b5478df10 --- /dev/null +++ b/changes/bug33104 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller): + - When receiving "ACTIVE" or "DORMANT" signals on the control port, + report them as SIGNAL events. Fixes bug 33104; bugfix on + 0.4.0.1-alpha. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 436bf423c..71b864751 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -158,6 +158,10 @@ control_ports_write_to_file(void) } const struct signal_name_t signal_table[] = { + /* NOTE: this table is used for handling SIGNAL commands and generating + * SIGNAL events. Order is significant: if there are two entries for the + * same numeric signal, the first one is the canonical name generated + * for the events. */ { SIGHUP, "RELOAD" }, { SIGHUP, "HUP" }, { SIGINT, "SHUTDOWN" }, diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 9e0966ca5..1089b608b 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1552,29 +1552,17 @@ control_event_signal(uintptr_t signal_num) if (!control_event_is_interesting(EVENT_GOT_SIGNAL)) return 0; - switch (signal_num) { - case SIGHUP: - signal_string = "RELOAD"; + for (unsigned i = 0; signal_table[i].signal_name != NULL; ++i) { + if ((int)signal_num == signal_table[i].sig) { + signal_string = signal_table[i].signal_name; break; - case SIGUSR1: - signal_string = "DUMP"; - break; - case SIGUSR2: - signal_string = "DEBUG"; - break; - case SIGNEWNYM: - signal_string = "NEWNYM"; - break; - case SIGCLEARDNSCACHE: - signal_string = "CLEARDNSCACHE"; - break; - case SIGHEARTBEAT: - signal_string = "HEARTBEAT"; - break; - default: - log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal", - (unsigned long)signal_num); - return -1; + } + } + + if (signal_string == NULL) { + log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal", + (unsigned long)signal_num); + return -1; } send_control_event(EVENT_GOT_SIGNAL, "650 SIGNAL %s\r\n",

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 5668287fe74122c61eaa2178a97737d671109655 Merge: 64b8ee3f9 a692b87f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:53:39 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 +++++++++-------------------- src/test/test_controller_events.c | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 22 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 8a721e5208b1e6665e1add8f4e776d0ff749369e Merge: 6a98e5f0d d124cfc05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 +++++++++-------------------- src/test/test_controller_events.c | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 22 deletions(-) diff --cc src/test/test_controller_events.c index 9fb2bc725,5b108ab31..0d276ef8a --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@@ -17,7 -16,7 +17,8 @@@ #include "core/mainloop/connection.h" #include "feature/control/control_events.h" #include "test/test.h" +#include "test/test_helpers.h" + #include "test/log_test_helpers.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" @@@ -395,13 -394,51 +396,50 @@@ test_cntev_dirboot_defer_orconn(void *a UNMOCK(queue_control_event_string); } + static void + test_cntev_signal(void *arg) + { + (void)arg; + int rv; + + MOCK(queue_control_event_string, mock_queue_control_event_string); + + /* Nothing is listening for signals, so no event should be queued. */ + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + + /* Now try with signals included in the event mask. */ + control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL)); + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n"); + + rv = control_event_signal(SIGACTIVE); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n"); + + /* Try a signal that doesn't exist. */ + setup_full_capture_of_logs(LOG_WARN); + tor_free(saved_event_str); + rv = control_event_signal(99999); + tt_int_op(-1, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + expect_single_log_msg_containing("Unrecognized signal 99999"); + + done: + tor_free(saved_event_str); + teardown_capture_of_logs(); + UNMOCK(queue_control_event_string); + } + static void -setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan, +setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan, int proxy_type) { - msg->type = ORCONN_MSGTYPE_STATE; - msg->u.state.gid = gid; - msg->u.state.chan = chan; - msg->u.state.proxy_type = proxy_type; + msg->gid = gid; + msg->chan = chan; + msg->proxy_type = proxy_type; } static void @@@ -548,10 -577,11 +586,11 @@@ struct testcase_t controller_event_test TEST(append_cell_stats, TT_FORK), TEST(format_cell_stats, TT_FORK), TEST(event_mask, TT_FORK), - TEST(dirboot_defer_desc, TT_FORK), - TEST(dirboot_defer_orconn, TT_FORK), - TEST(signal, TT_FORK), - TEST(orconn_state, TT_FORK), - TEST(orconn_state_pt, TT_FORK), - TEST(orconn_state_proxy, TT_FORK), + T_PUBSUB(dirboot_defer_desc, TT_FORK), + T_PUBSUB(dirboot_defer_orconn, TT_FORK), ++ T_PUBSUB(signal, TT_FORK), + T_PUBSUB(orconn_state, TT_FORK), + T_PUBSUB(orconn_state_pt, TT_FORK), + T_PUBSUB(orconn_state_proxy, TT_FORK), END_OF_TESTCASES };

1 0

[tor/release-0.4.4] Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit a692b87f82152c01a9991f11a60f36d3b6f1bddd Merge: 0575a182a b2c3cb1b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:53:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 +++++++++-------------------- src/test/test_controller_events.c | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 22 deletions(-) diff --cc src/test/test_controller_events.c index 9fb2bc725,5b108ab31..0d276ef8a --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@@ -17,7 -16,7 +17,8 @@@ #include "core/mainloop/connection.h" #include "feature/control/control_events.h" #include "test/test.h" +#include "test/test_helpers.h" + #include "test/log_test_helpers.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" @@@ -395,13 -394,51 +396,50 @@@ test_cntev_dirboot_defer_orconn(void *a UNMOCK(queue_control_event_string); } + static void + test_cntev_signal(void *arg) + { + (void)arg; + int rv; + + MOCK(queue_control_event_string, mock_queue_control_event_string); + + /* Nothing is listening for signals, so no event should be queued. */ + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + + /* Now try with signals included in the event mask. */ + control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL)); + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n"); + + rv = control_event_signal(SIGACTIVE); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n"); + + /* Try a signal that doesn't exist. */ + setup_full_capture_of_logs(LOG_WARN); + tor_free(saved_event_str); + rv = control_event_signal(99999); + tt_int_op(-1, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + expect_single_log_msg_containing("Unrecognized signal 99999"); + + done: + tor_free(saved_event_str); + teardown_capture_of_logs(); + UNMOCK(queue_control_event_string); + } + static void -setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan, +setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan, int proxy_type) { - msg->type = ORCONN_MSGTYPE_STATE; - msg->u.state.gid = gid; - msg->u.state.chan = chan; - msg->u.state.proxy_type = proxy_type; + msg->gid = gid; + msg->chan = chan; + msg->proxy_type = proxy_type; } static void @@@ -548,10 -577,11 +586,11 @@@ struct testcase_t controller_event_test TEST(append_cell_stats, TT_FORK), TEST(format_cell_stats, TT_FORK), TEST(event_mask, TT_FORK), - TEST(dirboot_defer_desc, TT_FORK), - TEST(dirboot_defer_orconn, TT_FORK), - TEST(signal, TT_FORK), - TEST(orconn_state, TT_FORK), - TEST(orconn_state_pt, TT_FORK), - TEST(orconn_state_proxy, TT_FORK), + T_PUBSUB(dirboot_defer_desc, TT_FORK), + T_PUBSUB(dirboot_defer_orconn, TT_FORK), ++ T_PUBSUB(signal, TT_FORK), + T_PUBSUB(orconn_state, TT_FORK), + T_PUBSUB(orconn_state_pt, TT_FORK), + T_PUBSUB(orconn_state_proxy, TT_FORK), END_OF_TESTCASES };

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0