torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for STATUS messages from Pluggable Transports.

Browse Source 
This patch adds support for the new STATUS message that PT's can emit
from their standard out. The STATUS message uses the `config_line_t` K/V
format that was recently added in Tor.

See: https://bugs.torproject.org/28846
This commit is contained in:
Alexander Færøy
2018-12-20 03:55:02 +01:00
parent 426c52b377
commit 4efe4cc2f9
5 changed files with 92 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_pt.c
+21
View File
@@ -316,6 +316,10 @@ process_read_stdout_replacement(process_t *process, buf_t *buffer)
buf_add_string(buffer, "LOG SEVERITY=notice MESSAGE=\"notice msg\"\n");
buf_add_string(buffer, "LOG SEVERITY=info MESSAGE=\"info msg\"\n");
buf_add_string(buffer, "LOG SEVERITY=debug MESSAGE=\"debug msg\"\n");
} else if (times_called <= 8) {
buf_add_string(buffer, "STATUS TYPE=a K_1=a K_2=b K_3=\"foo bar\"\n");
buf_add_string(buffer, "STATUS TYPE=b K_1=a K_2=b K_3=\"foo bar\"\n");
buf_add_string(buffer, "STATUS TYPE=c K_1=a K_2=b K_3=\"foo bar\"\n");
}
return (int)buf_datalen(buffer);
@@ -440,6 +444,23 @@ test_pt_configure_proxy(void *arg)
"650 PT_LOG PT=<testcase> SEVERITY=debug "
"MESSAGE=\"debug msg\"\r\n");
/* Get the STATUS messages out. */
process_notify_event_stdout(mp->process);
tt_int_op(controlevent_n, OP_EQ, 13);
tt_int_op(controlevent_event, OP_EQ, EVENT_PT_STATUS);
tt_int_op(smartlist_len(controlevent_msgs), OP_EQ, 13);
tt_str_op(smartlist_get(controlevent_msgs, 10), OP_EQ,
"650 PT_STATUS "
"PT=<testcase> TYPE=a K_1=a K_2=b K_3=\"foo bar\"\r\n");
tt_str_op(smartlist_get(controlevent_msgs, 11), OP_EQ,
"650 PT_STATUS "
"PT=<testcase> TYPE=b K_1=a K_2=b K_3=\"foo bar\"\r\n");
tt_str_op(smartlist_get(controlevent_msgs, 12), OP_EQ,
"650 PT_STATUS "
"PT=<testcase> TYPE=c K_1=a K_2=b K_3=\"foo bar\"\r\n");
{ /* check that the transport info were saved properly in the tor state */
config_line_t *transport_in_state = NULL;
smartlist_t *transport_info_sl = smartlist_new();