tor-commits November 2019

tor-commits@lists.torproject.org

20 participants
2923 discussions

[torspec/master] Note which version #19859 fields were added in.
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit d0acd35d8f8f6bc55450e73feb34479928c69700 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 25 08:44:41 2019 -0500 Note which version #19859 fields were added in. --- control-spec.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 11f62ba..b564438 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2152,20 +2152,22 @@ that were used by a SOCKS client to connect to Tor's SOCKS port … [View More]

1 0

[tor/master] Bug 19859: Add HTTPCONNECT client protocol
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit 56ee42e1c9d5dbdf4e038701dabf43d02d8ea712 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sun Oct 27 04:16:07 2019 +0000 Bug 19859: Add HTTPCONNECT client protocol --- src/feature/control/control_fmt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/feature/control/control_fmt.c b/src/feature/control/control_fmt.c index a48c89e6c..9e7fc42c3 100644 --- a/src/feature/control/control_fmt.c +++ b/src/feature/control/control_fmt.c @@ -204,6 +204,8 @@ … [View More]

1 0

[tor/master] Bug 19859: Add unit test for formatting
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit b69e85cc3d1676df2875114be8af2442ec9564b9 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sun Oct 27 04:34:57 2019 +0000 Bug 19859: Add unit test for formatting --- src/test/test_controller_events.c | 133 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 9fb2bc725..148127cce 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c … [View More]@@ -16,11 +16,14 @@ #include "core/or/orconn_event.h" #include "core/mainloop/connection.h" #include "feature/control/control_events.h" +#include "feature/control/control_fmt.h" #include "test/test.h" #include "test/test_helpers.h" +#include "core/or/entry_connection_st.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" +#include "core/or/socks_request_st.h" static void add_testing_cell_stats_entry(circuit_t *circ, uint8_t command, @@ -537,6 +540,135 @@ test_cntev_orconn_state_proxy(void *arg) UNMOCK(queue_control_event_string); } +static void +test_cntev_format_stream(void *arg) +{ + entry_connection_t *ec = NULL; + char *conndesc = NULL; + (void)arg; + + ec = entry_connection_new(CONN_TYPE_AP, AF_INET); + + char *username = tor_strdup("jeremy"); + char *password = tor_strdup("letmein"); + ec->socks_request->username = username; // steal reference + ec->socks_request->usernamelen = strlen(username); + ec->socks_request->password = password; // steal reference + ec->socks_request->passwordlen = strlen(password); + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "SOCKS_USERNAME=\"jeremy\"")); + tt_assert(strstr(conndesc, "SOCKS_PASSWORD=\"letmein\"")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_AP_LISTENER; + ec->socks_request->socks_version = 4; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=SOCKS4")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_AP_LISTENER; + ec->socks_request->socks_version = 5; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=SOCKS5")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_AP_LISTENER; + ec->socks_request->socks_version = 6; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=UNKNOWN")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_AP_TRANS_LISTENER; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=TRANS")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_AP_NATD_LISTENER; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=NATD")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_AP_DNS_LISTENER; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=DNS")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_AP_HTTP_CONNECT_LISTENER; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=HTTPCONNECT")); + tor_free(conndesc); + + ec->socks_request->listener_type = CONN_TYPE_OR; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "CLIENT_PROTOCOL=UNKNOWN")); + tor_free(conndesc); + + ec->nym_epoch = 1337; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "NYM_EPOCH=1337")); + tor_free(conndesc); + + ec->entry_cfg.session_group = 4321; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "SESSION_GROUP=4321")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_DESTPORT; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "ISO_FIELDS=DESTPORT")); + tt_assert(!strstr(conndesc, "ISO_FIELDS=DESTPORT,")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_DESTADDR; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "ISO_FIELDS=DESTADDR")); + tt_assert(!strstr(conndesc, "ISO_FIELDS=DESTADDR,")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_SOCKSAUTH; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "ISO_FIELDS=SOCKS_USERNAME,SOCKS_PASSWORD")); + tt_assert(!strstr(conndesc, "ISO_FIELDS=SOCKS_USERNAME,SOCKS_PASSWORD,")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_CLIENTPROTO; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "ISO_FIELDS=CLIENT_PROTOCOL")); + tt_assert(!strstr(conndesc, "ISO_FIELDS=CLIENT_PROTOCOL,")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_CLIENTADDR; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "ISO_FIELDS=CLIENTADDR")); + tt_assert(!strstr(conndesc, "ISO_FIELDS=CLIENTADDR,")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_SESSIONGRP; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "ISO_FIELDS=SESSION_GROUP")); + tt_assert(!strstr(conndesc, "ISO_FIELDS=SESSION_GROUP,")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_NYM_EPOCH; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, "ISO_FIELDS=NYM_EPOCH")); + tt_assert(!strstr(conndesc, "ISO_FIELDS=NYM_EPOCH,")); + tor_free(conndesc); + + ec->entry_cfg.isolation_flags = ISO_DESTPORT | ISO_SOCKSAUTH | ISO_NYM_EPOCH; + conndesc = entry_connection_describe_status_for_controller(ec); + tt_assert(strstr(conndesc, + "ISO_FIELDS=DESTPORT,SOCKS_USERNAME,SOCKS_PASSWORD,NYM_EPOCH")); + tt_assert(!strstr(conndesc, + "ISO_FIELDS=DESTPORT,SOCKS_USERNAME,SOCKS_PASSWORD,NYM_EPOCH,")); + + done: + tor_free(username); + tor_free(password); + tor_free(conndesc); + connection_free_minimal(ENTRY_TO_CONN(ec)); +} + #define TEST(name, flags) \ { #name, test_cntev_ ## name, flags, 0, NULL } @@ -548,6 +680,7 @@ struct testcase_t controller_event_tests[] = { TEST(append_cell_stats, TT_FORK), TEST(format_cell_stats, TT_FORK), TEST(event_mask, TT_FORK), + TEST(format_stream, TT_FORK), T_PUBSUB(dirboot_defer_desc, TT_FORK), T_PUBSUB(dirboot_defer_orconn, TT_FORK), T_PUBSUB(orconn_state, TT_FORK), [View Less]

1 0

[tor/master] Bug 19859: Add stream isolation data to STREAM event
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit 2734968e40adc63b49652dd41d0bac20a1e28fa3 Author: JeremyRand <biolizard89(a)gmail.com> Date: Fri Sep 20 12:18:37 2019 +0000 Bug 19859: Add stream isolation data to STREAM event --- changes/bug19859 | 2 + src/feature/control/control_events.c | 12 ++++-- src/feature/control/control_fmt.c | 78 ++++++++++++++++++++++++++++++++++++ src/feature/control/control_fmt.h | 2 + 4 files changed, 91 insertions(+), 3 deletions(-) diff --git a/changes/… [View More]bug19859 b/changes/bug19859 new file mode 100644 index 000000000..36908854d --- /dev/null +++ b/changes/bug19859 @@ -0,0 +1,2 @@ + o Minor features (controller): + - Add stream isolation data to STREAM event. Closes ticket 19859. diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 12b73641b..427edbdf3 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -833,13 +833,19 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp, circ = circuit_get_by_edge_conn(ENTRY_TO_EDGE_CONN(conn)); if (circ && CIRCUIT_IS_ORIGIN(circ)) origin_circ = TO_ORIGIN_CIRCUIT(circ); - send_control_event(EVENT_STREAM_STATUS, - "650 STREAM %"PRIu64" %s %lu %s%s%s%s\r\n", + + { + char *conndesc = entry_connection_describe_status_for_controller(conn); + const char *sp = strlen(conndesc) ? " " : ""; + send_control_event(EVENT_STREAM_STATUS, + "650 STREAM %"PRIu64" %s %lu %s%s%s%s%s%s\r\n", (ENTRY_TO_CONN(conn)->global_identifier), status, origin_circ? (unsigned long)origin_circ->global_identifier : 0ul, - buf, reason_buf, addrport_buf, purpose); + buf, reason_buf, addrport_buf, purpose, sp, conndesc); + tor_free(conndesc); + } /* XXX need to specify its intended exit, etc? */ diff --git a/src/feature/control/control_fmt.c b/src/feature/control/control_fmt.c index e0e77eb2d..9bae95b59 100644 --- a/src/feature/control/control_fmt.c +++ b/src/feature/control/control_fmt.c @@ -165,6 +165,84 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) return rv; } +/** Allocate and return a description of conn's current status. */ +char * +entry_connection_describe_status_for_controller(entry_connection_t *conn) +{ + char *rv; + smartlist_t *descparts = smartlist_new(); + + if (conn->socks_request != NULL) { + // Show username and/or password if available; used by IsolateSOCKSAuth. + if (conn->socks_request->usernamelen > 0) { + char* username_escaped = esc_for_log_len(conn->socks_request->username, + (size_t) conn->socks_request->usernamelen); + smartlist_add_asprintf(descparts, "SOCKS_USERNAME=%s", + username_escaped); + tor_free(username_escaped); + } + if (conn->socks_request->passwordlen > 0) { + char* password_escaped = esc_for_log_len(conn->socks_request->password, + (size_t) conn->socks_request->passwordlen); + smartlist_add_asprintf(descparts, "SOCKS_PASSWORD=%s", + password_escaped); + tor_free(password_escaped); + } + + const char *client_protocol; + // Show the client protocol; used by IsolateClientProtocol. + switch (conn->socks_request->listener_type) + { + case CONN_TYPE_AP_LISTENER: + switch (conn->socks_request->socks_version) + { + case 4: client_protocol = "SOCKS4"; break; + case 5: client_protocol = "SOCKS5"; break; + default: client_protocol = "UNKNOWN"; + } + break; + case CONN_TYPE_AP_TRANS_LISTENER: client_protocol = "TRANS"; break; + case CONN_TYPE_AP_NATD_LISTENER: client_protocol = "NATD"; break; + case CONN_TYPE_AP_DNS_LISTENER: client_protocol = "DNS"; break; + default: client_protocol = "UNKNOWN"; + } + smartlist_add_asprintf(descparts, "CLIENT_PROTOCOL=%s", + client_protocol); + } + + // Show newnym epoch; used for stream isolation when NEWNYM is used. + smartlist_add_asprintf(descparts, "NYM_EPOCH=%u", + conn->nym_epoch); + + // Show session group; used for stream isolation of multiple listener ports. + smartlist_add_asprintf(descparts, "SESSION_GROUP=%d", + conn->entry_cfg.session_group); + + // Show isolation flags. + smartlist_add_asprintf(descparts, "ISO_DESTPORT=%d", + (conn->entry_cfg.isolation_flags & + ISO_DESTPORT) ? 1 : 0); + smartlist_add_asprintf(descparts, "ISO_DESTADDR=%d", + (conn->entry_cfg.isolation_flags & + ISO_DESTADDR) ? 1 : 0); + smartlist_add_asprintf(descparts, "ISO_SOCKSAUTH=%d", + (conn->entry_cfg.isolation_flags & + ISO_SOCKSAUTH) ? 1 : 0); + smartlist_add_asprintf(descparts, "ISO_CLIENTPROTO=%d", + (conn->entry_cfg.isolation_flags & + ISO_CLIENTPROTO) ? 1 : 0); + smartlist_add_asprintf(descparts, "ISO_CLIENTADDR=%d", + (conn->entry_cfg.isolation_flags & + ISO_CLIENTADDR) ? 1 : 0); + + rv = smartlist_join_strings(descparts, " ", 0, NULL); + + SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp)); + smartlist_free(descparts); + + return rv; +} + /** Return a longname the node whose identity is id_digest. If * node_get_by_id() returns NULL, base 16 encoding of id_digest is * returned instead. diff --git a/src/feature/control/control_fmt.h b/src/feature/control/control_fmt.h index 6446e3707..84ccbab94 100644 --- a/src/feature/control/control_fmt.h +++ b/src/feature/control/control_fmt.h @@ -17,6 +17,8 @@ int write_stream_target_to_buf(entry_connection_t *conn, char *buf, void orconn_target_get_name(char *buf, size_t len, or_connection_t *conn); char *circuit_describe_status_for_controller(origin_circuit_t *circ); +char *entry_connection_describe_status_for_controller( + entry_connection_t *conn); MOCK_DECL(const char *, node_describe_longname_by_id,(const char *id_digest)); [View Less]

1 0

[tor/master] Bug 19859: Consolidate flag fields into ISO_FIELDS
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit 0c4e3b6b5064e699ff5879ee99a09e0d27e50442 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sun Oct 27 01:54:11 2019 +0000 Bug 19859: Consolidate flag fields into ISO_FIELDS --- src/feature/control/control_fmt.c | 43 +++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/feature/control/control_fmt.c b/src/feature/control/control_fmt.c index 9bae95b59..6071d82ee 100644 --- a/src/feature/control/control_fmt.c +++ b/src/… [View More]feature/control/control_fmt.c @@ -219,21 +219,34 @@ entry_connection_describe_status_for_controller(entry_connection_t *conn) conn->entry_cfg.session_group); // Show isolation flags. - smartlist_add_asprintf(descparts, "ISO_DESTPORT=%d", - (conn->entry_cfg.isolation_flags & - ISO_DESTPORT) ? 1 : 0); - smartlist_add_asprintf(descparts, "ISO_DESTADDR=%d", - (conn->entry_cfg.isolation_flags & - ISO_DESTADDR) ? 1 : 0); - smartlist_add_asprintf(descparts, "ISO_SOCKSAUTH=%d", - (conn->entry_cfg.isolation_flags & - ISO_SOCKSAUTH) ? 1 : 0); - smartlist_add_asprintf(descparts, "ISO_CLIENTPROTO=%d", - (conn->entry_cfg.isolation_flags & - ISO_CLIENTPROTO) ? 1 : 0); - smartlist_add_asprintf(descparts, "ISO_CLIENTADDR=%d", - (conn->entry_cfg.isolation_flags & - ISO_CLIENTADDR) ? 1 : 0); + smartlist_t *isoflaglist = smartlist_new(); + char *isoflaglist_joined; + if (conn->entry_cfg.isolation_flags & ISO_DESTPORT) { + smartlist_add(isoflaglist, (void *)"DESTPORT"); + } + if (conn->entry_cfg.isolation_flags & ISO_DESTADDR) { + smartlist_add(isoflaglist, (void *)"DESTADDR"); + } + if (conn->entry_cfg.isolation_flags & ISO_SOCKSAUTH) { + smartlist_add(isoflaglist, (void *)"SOCKS_USERNAME"); + smartlist_add(isoflaglist, (void *)"SOCKS_PASSWORD"); + } + if (conn->entry_cfg.isolation_flags & ISO_CLIENTPROTO) { + smartlist_add(isoflaglist, (void *)"CLIENT_PROTOCOL"); + } + if (conn->entry_cfg.isolation_flags & ISO_CLIENTADDR) { + smartlist_add(isoflaglist, (void *)"CLIENTADDR"); + } + if (conn->entry_cfg.isolation_flags & ISO_SESSIONGRP) { + smartlist_add(isoflaglist, (void *)"SESSION_GROUP"); + } + if (conn->entry_cfg.isolation_flags & ISO_NYM_EPOCH) { + smartlist_add(isoflaglist, (void *)"NYM_EPOCH"); + } + isoflaglist_joined = smartlist_join_strings(isoflaglist, ",", 0, NULL); + smartlist_add_asprintf(descparts, "ISO_FIELDS=%s", isoflaglist_joined); + tor_free(isoflaglist_joined); + smartlist_free(isoflaglist); rv = smartlist_join_strings(descparts, " ", 0, NULL); [View Less]

1 0

[tor/master] Bug 19859: Set arg to const
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit 23819d3a662635f0c7a28c33c145cf65839e056c Author: JeremyRand <biolizard89(a)gmail.com> Date: Sun Oct 27 03:06:19 2019 +0000 Bug 19859: Set arg to const --- src/feature/control/control_fmt.c | 2 +- src/feature/control/control_fmt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/control/control_fmt.c b/src/feature/control/control_fmt.c index 6071d82ee..a48c89e6c 100644 --- a/src/feature/control/control_fmt.c +++ b/src/feature/control/… [View More]

1 0

[tor/master] Bug 19859: Fix double-free in unit test
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit f487da518a9828b194c8f1c8cf6da14955c6bdc4 Author: JeremyRand <biolizard89(a)gmail.com> Date: Tue Nov 12 17:13:04 2019 +0000 Bug 19859: Fix double-free in unit test --- src/test/test_controller_events.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 148127cce..9267aa0e4 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -663,8 +663,6 @@ … [View More]

1 0

[tor/master] Bug #19859: Increase function-size exception to 124
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit 736322ce6198f97957a83b89dcf57aab91ca9a97 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sun Nov 3 07:11:08 2019 +0000 Bug #19859: Increase function-size exception to 124 --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index f7bd8287e..63dde53f2 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/… [View More]

1 0

[tor/master] Merge branch 'stream-socks-auth' into bug19859_merged
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit 31f8b4fa65b446a3ae4ce67051a7f0aabcd22a97 Merge: 68b6d8524 f487da518 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 25 07:58:02 2019 -0500 Merge branch 'stream-socks-auth' into bug19859_merged changes/bug19859 | 2 + scripts/maint/practracker/exceptions.txt | 2 +- src/feature/control/control_events.c | 12 ++- src/feature/control/control_fmt.c | 93 ++++++++++++++++++++++ src/feature/control/control_fmt.h | 2 … [View More]

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 25 Nov '19

25 Nov '19

commit 4e1da73d9ea1b9da8db656d91a17759f6281174b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 13:20:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 641c70cce..45ce05f3a 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -1009,6 +1009,9 @@ msgid "" "In 'Bridges' section, check … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2019