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

[tor/master] Merge remote-tracking branch 'rl1987/bug25477'
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 16dd2f7bb0df8c6d45d62e4d515089a3a566fd8e Merge: 5746e210b eb7a3fae0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 17 20:25:40 2018 -0400 Merge remote-tracking branch 'rl1987/bug25477' changes/bug25477 | 3 +++ src/or/rendcache.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'rl1987/feature8323_squashed2'
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 5746e210b8d0dfc54447ca31d6b2ac55a13271cc Merge: d5e4b6983 25341245a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 17 20:20:15 2018 -0400 Merge remote-tracking branch 'rl1987/feature8323_squashed2' changes/feature8323 | 3 ++ src/or/control.c | 23 ++++++++++++++ src/test/test_controller.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+)

1 0

[tor/master] Implement GETINFO md/all
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 25341245ae53a5800757fbfad37f5623b807befc Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri May 25 13:37:12 2018 +0200 Implement GETINFO md/all --- changes/feature8323 | 3 ++ src/or/control.c | 23 ++++++++++++++ src/test/test_controller.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/changes/feature8323 b/changes/feature8323 new file mode 100644 index 000000000..6fbc972d2 --- /dev/null +++ b/changes/feature8323 @@ -0,0 +1,3 @@ + o Minor features (controller): + - Implement 'GETINFO md/all' controller command to enable + getting all known microdesriptors. Closes ticket 8323. diff --git a/src/or/control.c b/src/or/control.c index 0d637dce7..aba4bed0e 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2207,6 +2207,27 @@ getinfo_helper_dir(control_connection_t *control_conn, return -1; } } + } else if (!strcmp(question, "md/all")) { + const smartlist_t *nodes = nodelist_get_list(); + tor_assert(nodes); + + if (smartlist_len(nodes) == 0) { + *answer = tor_strdup(""); + return 0; + } + + smartlist_t *microdescs = smartlist_new(); + + SMARTLIST_FOREACH_BEGIN(nodes, node_t *, n) { + if (n->md && n->md->body) { + char *copy = tor_strndup(n->md->body, n->md->bodylen); + smartlist_add(microdescs, copy); + } + } SMARTLIST_FOREACH_END(n); + + *answer = smartlist_join_strings(microdescs, "", 0, NULL); + SMARTLIST_FOREACH(microdescs, char *, md, tor_free(md)); + smartlist_free(microdescs); } else if (!strcmpstart(question, "md/id/")) { const node_t *node = node_get_by_hex_id(question+strlen("md/id/"), 0); const microdesc_t *md = NULL; @@ -3241,6 +3262,7 @@ static const getinfo_item_t getinfo_items[] = { ITEM("desc/download-enabled", dir, "Do we try to download router descriptors?"), ITEM("desc/all-recent-extrainfo-hack", dir, NULL), /* Hack. */ + ITEM("md/all", dir, "All known microdescriptors."), PREFIX("md/id/", dir, "Microdescriptors by ID"), PREFIX("md/name/", dir, "Microdescriptors by name"), ITEM("md/download-enabled", dir, @@ -3400,6 +3422,7 @@ handle_control_getinfo(control_connection_t *conn, uint32_t len, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH_BEGIN(questions, const char *, q) { const char *errmsg = NULL; + if (handle_getinfo_helper(conn, q, &ans, &errmsg) < 0) { if (!errmsg) errmsg = "Internal error"; diff --git a/src/test/test_controller.c b/src/test/test_controller.c index 1a350f66c..c9517583c 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -10,6 +10,7 @@ #include "networkstatus.h" #include "rendservice.h" #include "routerlist.h" +#include "nodelist.h" #include "test.h" #include "test_helpers.h" @@ -1525,6 +1526,80 @@ test_current_time(void *arg) return; } +static size_t n_nodelist_get_list = 0; +static smartlist_t *nodes = NULL; + +static smartlist_t * +mock_nodelist_get_list(void) +{ + n_nodelist_get_list++; + tor_assert(nodes); + + return nodes; +} + +static void +test_getinfo_md_all(void *arg) +{ + char *answer = NULL; + const char *errmsg = NULL; + int retval = 0; + + (void)arg; + + node_t *node1 = tor_malloc(sizeof(node_t)); + memset(node1, 0, sizeof(node_t)); + node1->md = tor_malloc(sizeof(microdesc_t)); + memset(node1->md, 0, sizeof(microdesc_t)); + node1->md->body = tor_strdup("md1\n"); + node1->md->bodylen = 4; + + node_t *node2 = tor_malloc(sizeof(node_t)); + memset(node2, 0, sizeof(node_t)); + node2->md = tor_malloc(sizeof(microdesc_t)); + memset(node2->md, 0, sizeof(microdesc_t)); + node2->md->body = tor_strdup("md2\n"); + node2->md->bodylen = 4; + + MOCK(nodelist_get_list, mock_nodelist_get_list); + + nodes = smartlist_new(); + + retval = getinfo_helper_dir(NULL, "md/all", &answer, &errmsg); + + tt_int_op(n_nodelist_get_list, OP_EQ, 1); + tt_int_op(retval, OP_EQ, 0); + tt_assert(answer != NULL); + tt_assert(errmsg == NULL); + tt_str_op(answer, OP_EQ, ""); + + tor_free(answer); + + smartlist_add(nodes, node1); + smartlist_add(nodes, node2); + + retval = getinfo_helper_dir(NULL, "md/all", &answer, &errmsg); + + tt_int_op(n_nodelist_get_list, OP_EQ, 2); + tt_int_op(retval, OP_EQ, 0); + tt_assert(answer != NULL); + tt_assert(errmsg == NULL); + + tt_str_op(answer, OP_EQ, "md1\nmd2\n"); + + done: + UNMOCK(nodelist_get_list); + tor_free(node1->md->body); + tor_free(node1->md); + tor_free(node1); + tor_free(node2->md->body); + tor_free(node2->md); + tor_free(node2); + tor_free(answer); + smartlist_free(nodes); + return; +} + struct testcase_t controller_tests[] = { { "add_onion_helper_keyarg_v2", test_add_onion_helper_keyarg_v2, 0, NULL, NULL }, @@ -1542,6 +1617,7 @@ struct testcase_t controller_tests[] = { { "download_status_desc", test_download_status_desc, 0, NULL, NULL }, { "download_status_bridge", test_download_status_bridge, 0, NULL, NULL }, { "current_time", test_current_time, 0, NULL, NULL }, + { "getinfo_md_all", test_getinfo_md_all, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[torspec/master] Document GETINFO md/all
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit b5396d5eff4a2a152fe7f16d046e9008a399d588 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat May 26 11:02:02 2018 +0200 Document GETINFO md/all --- control-spec.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 72ceb15..e6986b4 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -579,6 +579,10 @@ microdescriptors instead. If microdescriptors are enabled, you'll need to use "md" instead.) + "md/all" -- all known microdescriptors for entire Tor network. + [First implemented in 0.3.5.1-alpha] [XXX: we're not sure about + version yet] + "md/id/<OR identity>" or "md/name/<OR nickname>" -- the latest microdescriptor for a given OR. Empty if we have no microdescriptor for that OR (because we haven't downloaded one, or it isn't in the

1 0

[torspec/master] Merge remote-tracking branch 'rl1987/getinfo_md_all'
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 8cbf2b320251bb888041cf58128202d930141ccc Merge: 4ead6e1 0434d84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 17 19:37:37 2018 -0400 Merge remote-tracking branch 'rl1987/getinfo_md_all' control-spec.txt | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[torspec/master] We now know what version will have md/all.
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit dc4e88d4cabb40425fd63ccd681160e22fb53a7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 17 20:16:33 2018 -0400 We now know what version will have md/all. --- control-spec.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 1c47490..1fae378 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -581,8 +581,6 @@ "md/all" -- all known microdescriptors for entire Tor network. Each microdescriptor is terminated by a newline. - [First implemented in 0.3.5.1-alpha] [XXX: we're not sure about - version yet] "md/id/<OR identity>" or "md/name/<OR nickname>" -- the latest microdescriptor for a given OR. Empty if we have no microdescriptor for @@ -795,7 +793,7 @@ providing an empty string if none exists (this is unimplemented on Windows, returning an empty string). "process/descriptor-limit" -- Upper bound on the file descriptor limit, -1 - if unknown. + if unknown "dir/status-vote/current/consensus" [added in Tor 0.2.1.6-alpha] "dir/status/authority"

1 0

[torspec/master] Add a sentence about newlines at the end of MDs
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 0434d8446caf95f98784dfe647688e91dfce30e8 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jun 8 12:19:07 2018 +0300 Add a sentence about newlines at the end of MDs --- control-spec.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/control-spec.txt b/control-spec.txt index e6986b4..6863470 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -580,6 +580,7 @@ need to use "md" instead.) "md/all" -- all known microdescriptors for entire Tor network. + Each microdescriptor is terminated by a newline. [First implemented in 0.3.5.1-alpha] [XXX: we're not sure about version yet]

1 0

[tor/master] Avoid casting smartlist index implicitly
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit 39bbb8d9cfb0258b1e65dc98177e0773a19e4eb0 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Jun 4 11:56:37 2018 +0300 Avoid casting smartlist index implicitly --- changes/bug26282 | 4 ++++ src/common/util.c | 4 ++-- src/or/control.c | 2 +- src/or/geoip.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug26282 b/changes/bug26282 new file mode 100644 index 000000000..c278f0b60 --- /dev/null +++ b/changes/bug26282 @@ -0,0 +1,4 @@ + o Minor bugfixes (C correctness): + - Avoid casting smartlist index to int implicitly, as it may trigger + a warning (-Wshorten-64-to-32). Fixes bug 26282; bugfix on + 0.2.3.13-alpha, 0.2.7.1-alpha and 0.2.1.1-alpha. diff --git a/src/common/util.c b/src/common/util.c index 53e4507f1..b0eb96306 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4813,7 +4813,7 @@ process_environment_make(struct smartlist_t *env_vars) total_env_length = 1; /* terminating NUL of terminating empty string */ for (i = 0; i < n_env_vars; ++i) { - const char *s = smartlist_get(env_vars, i); + const char *s = smartlist_get(env_vars, (int)i); size_t slen = strlen(s); tor_assert(slen + 1 != 0); @@ -4843,7 +4843,7 @@ process_environment_make(struct smartlist_t *env_vars) const char *prev_env_var = NULL; for (i = 0; i < n_env_vars; ++i) { - const char *s = smartlist_get(env_vars_sorted, i); + const char *s = smartlist_get(env_vars_sorted, (int)i); size_t slen = strlen(s); size_t s_name_len = str_num_before(s, '='); diff --git a/src/or/control.c b/src/or/control.c index 0d637dce7..95b16cf5a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4624,7 +4624,7 @@ handle_control_add_onion(control_connection_t *conn, static const char *max_s_prefix = "MaxStreams="; static const char *auth_prefix = "ClientAuth="; - const char *arg = smartlist_get(args, i); + const char *arg = smartlist_get(args, (int)i); if (!strcasecmpstart(arg, port_prefix)) { /* "Port=VIRTPORT[,TARGET]". */ const char *port_str = arg + strlen(port_prefix); diff --git a/src/or/geoip.c b/src/or/geoip.c index 2c917c564..d59043a7f 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -150,7 +150,7 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, idx = ((uintptr_t)idxplus1_)-1; } { - geoip_country_t *c = smartlist_get(geoip_countries, idx); + geoip_country_t *c = smartlist_get(geoip_countries, (int)idx); tor_assert(!strcasecmp(c->countrycode, country)); }

1 0

[tor/master] Merge remote-tracking branch 'rl1987/bug26282'
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit d5e4b6983f88d6a31303008897e6f75e9a9777ff Merge: 987174cc6 39bbb8d9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jun 17 19:32:08 2018 -0400 Merge remote-tracking branch 'rl1987/bug26282' changes/bug26282 | 4 ++++ src/common/util.c | 4 ++-- src/or/control.c | 2 +- src/or/geoip.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-)

1 0

[torspec/master] Include uptime in bandwidth changes event
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit faacf026eba54ad7e29278cb379c7fd92a212025 Author: juga0 <juga(a)riseup.net> Date: Mon Jun 4 07:24:50 2018 +0000 Include uptime in bandwidth changes event The descriptor would be updated on bandwidth changes only when the uptime is less than 24h. --- dir-spec.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 5f2a713..e44052f 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -352,9 +352,9 @@ - A descriptor field other than bandwidth or uptime has changed. - - Bandwidth has changed by a factor of 2 from the last time a - descriptor was generated, and at least a given interval of time - (20 mins by default) has passed since then. + - Its uptime is less than 24h and bandwidth has changed by a factor of 2 + from the last time a descriptor was generated, and at least a given + interval of time (20 mins by default) has passed since then. - Its uptime has been reset (by restarting). @@ -365,6 +365,9 @@ if none of the above events have occurred and not much time has passed (12 hours by default). + Tor versions older than 0.3.5.1-alpha ignore uptime when checking for + bandwidth changes. + After generating a descriptor, ORs upload them to every directory authority they know, by posting them (in order) to the URL

1 0