April 2015 - tor-commits - lists.torproject.org

[tor/master] Test: fix HSFETCH control command with latest change
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit dd07c78524615738d9f326c34bea7b11bc1b1b88 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sun Mar 15 10:35:31 2015 -0400 Test: fix HSFETCH control command with latest change The expected message of the command now expects "650+" and "650 OK". Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/test/test_hs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 130411e..4c43ebd … [View More]

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug14847_027_06'
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 54000d7ad9fc92136981da7c270e0646a5288bf3 Merge: 9a81ed1 6f5f38a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 12:24:35 2015 -0400 Merge remote-tracking branch 'dgoulet/bug14847_027_06' src/or/control.c | 210 ++++++++++++++++++++++++++++++++--- src/or/control.h | 24 ++-- src/or/directory.c | 38 ++++++- src/or/or.h | 4 + src/or/rendclient.c | 296 ++++++++++++++++++++++++++++++++++---------------- src/or/rendclient.h | … [View More]

1 0

[tor/master] Add function to validate HS descriptor ID
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 6f5f38a0bc60d3be9b6cf02e29b9065869cf6af8 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Apr 21 14:04:39 2015 -0400 Add function to validate HS descriptor ID Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/control.c | 2 +- src/or/directory.c | 2 +- src/or/rendcommon.c | 18 ++++++++++++++++++ src/or/rendcommon.h | 1 + src/or/routerparse.c | 3 +-- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/or/… [View More]control.c b/src/or/control.c index b4d671b..3135324 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3284,7 +3284,7 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, if (rend_valid_service_id(arg1)) { hsaddress = arg1; } else if (strcmpstart(arg1, v2_str) == 0 && - strlen(arg1 + v2_str_len) == REND_DESC_ID_V2_LEN_BASE32 && + rend_valid_descriptor_id(arg1 + v2_str_len) && base32_decode(digest, sizeof(digest), arg1 + v2_str_len, REND_DESC_ID_V2_LEN_BASE32) == 0) { /* We have a well formed version 2 descriptor ID. Keep the decoded value diff --git a/src/or/directory.c b/src/or/directory.c index 37a46fc..bad1f62 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3094,7 +3094,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, /* Handle v2 rendezvous descriptor fetch request. */ const char *descp; const char *query = url + strlen("/tor/rendezvous2/"); - if (strlen(query) == REND_DESC_ID_V2_LEN_BASE32) { + if (rend_valid_descriptor_id(query)) { log_info(LD_REND, "Got a v2 rendezvous descriptor request for ID '%s'", safe_str(escaped(query))); switch (rend_cache_lookup_v2_desc_as_dir(query, &descp)) { diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 95d16f1..4982745 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -919,6 +919,24 @@ rend_valid_service_id(const char *query) return 1; } +/** Return true iff query is a syntactically valid descriptor ID. + * (as generated by rend_get_descriptor_id_bytes). */ +int +rend_valid_descriptor_id(const char *query) +{ + if (strlen(query) != REND_DESC_ID_V2_LEN_BASE32) { + goto invalid; + } + if (strspn(query, BASE32_CHARS) != REND_DESC_ID_V2_LEN_BASE32) { + goto invalid; + } + + return 1; + +invalid: + return 0; +} + /** Lookup in the client cache the given service ID query for * version. * diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index f4f2051..b86cdb7 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -37,6 +37,7 @@ void rend_cache_clean_v2_descs_as_dir(time_t now, size_t min_to_remove); void rend_cache_purge(void); void rend_cache_free_all(void); int rend_valid_service_id(const char *query); +int rend_valid_descriptor_id(const char *query); int rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **entry_out); int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index fd3971c..14d5f75 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4572,8 +4572,7 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, tok = find_by_keyword(tokens, R_RENDEZVOUS_SERVICE_DESCRIPTOR); tor_assert(tok == smartlist_get(tokens, 0)); tor_assert(tok->n_args == 1); - if (strlen(tok->args[0]) != REND_DESC_ID_V2_LEN_BASE32 || - strspn(tok->args[0], BASE32_CHARS) != REND_DESC_ID_V2_LEN_BASE32) { + if (!rend_valid_descriptor_id(tok->args[0])) { log_warn(LD_REND, "Invalid descriptor ID: '%s'", tok->args[0]); goto err; } [View Less]

1 0

[tor/master] Multiple fixes for the HSFETCH command
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit a4585405d6e103b9a48a1401321477ea08fa2ad1 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Mar 23 13:07:51 2015 -0400 Multiple fixes for the HSFETCH command Ref: https://trac.torproject.org/projects/tor/ticket/14847?replyto=31#comment:31 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/control.c | 50 ++++++++++++++++++++++++++------------------------ src/or/directory.c | 3 ++- src/or/rendclient.c | 18 +++++++-----------… [View More] 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 10475bb..b4d671b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3263,28 +3263,27 @@ static int handle_control_hsfetch(control_connection_t *conn, uint32_t len, const char *body) { + int i; char digest[DIGEST_LEN], *hsaddress = NULL, *arg1 = NULL, *desc_id = NULL; smartlist_t *args = NULL, *hsdirs = NULL; (void) len; /* body is nul-terminated; it's safe to ignore the length */ + static const char *hsfetch_command = "HSFETCH"; static const char *v2_str = "v2-"; const size_t v2_str_len = strlen(v2_str); rend_data_t *rend_query = NULL; /* Make sure we have at least one argument, the HSAddress. */ - args = getargs_helper("HSFETCH", conn, body, 1, -1); + args = getargs_helper(hsfetch_command, conn, body, 1, -1); if (!args) { - goto done; + goto exit; } /* Extract the first argument (either HSAddress or DescID). */ arg1 = smartlist_get(args, 0); - /* Remove it from the argument list so we can safely iterate on all the - * rest to find optional argument(s). */ - smartlist_del(args, 0); /* Test if it's an HS address without the .onion part. */ if (rend_valid_service_id(arg1)) { hsaddress = arg1; - } else if (strstr(arg1, v2_str) && + } else if (strcmpstart(arg1, v2_str) == 0 && strlen(arg1 + v2_str_len) == REND_DESC_ID_V2_LEN_BASE32 && base32_decode(digest, sizeof(digest), arg1 + v2_str_len, REND_DESC_ID_V2_LEN_BASE32) == 0) { @@ -3292,15 +3291,17 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, * of the id. */ desc_id = digest; } else { - connection_printf_to_buf(conn, "552 Unrecognized \"%s\"\r\n", + connection_printf_to_buf(conn, "513 Unrecognized \"%s\"\r\n", arg1); goto done; } - /* Skip first argument because it's the HSAddress. */ - SMARTLIST_FOREACH_BEGIN(args, char *, arg) { + static const char *opt_server = "SERVER="; + + /* Skip first argument because it's the HSAddress or DescID. */ + for (i = 1; i < smartlist_len(args); ++i) { + const char *arg = smartlist_get(args, i); const node_t *node; - static const char *opt_server = "SERVER="; if (!strcasecmpstart(arg, opt_server)) { const char *server; @@ -3319,11 +3320,11 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, /* Valid server, add it to our local list. */ smartlist_add(hsdirs, node->rs); } else { - connection_printf_to_buf(conn, "552 Unexpected argument \"%s\"\r\n", + connection_printf_to_buf(conn, "513 Unexpected argument \"%s\"\r\n", arg); goto done; } - } SMARTLIST_FOREACH_END(arg); + } rend_query = tor_malloc_zero(sizeof(*rend_query)); @@ -3334,7 +3335,8 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, /* Using a descriptor ID, we force the user to provide at least one * hsdir server using the SERVER= option. */ if (!hsdirs || !smartlist_len(hsdirs)) { - connection_printf_to_buf(conn, "552 SERVER= option is required\r\n"); + connection_printf_to_buf(conn, "512 %s option is required\r\n", + opt_server); goto done; } memcpy(rend_query->descriptor_id, desc_id, @@ -3354,15 +3356,12 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, rend_client_fetch_v2_desc(rend_query, hsdirs); done: - if (hsdirs) { - smartlist_free(hsdirs); - } - if (args) { - SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); - smartlist_free(args); - } + SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); + smartlist_free(args); + /* Contains data pointer that we don't own thus no cleanup. */ + smartlist_free(hsdirs); tor_free(rend_query); - tor_free(arg1); +exit: return 0; } @@ -5470,13 +5469,16 @@ control_event_hs_descriptor_content(const char *onion_address, static const char *event_name = "HS_DESC_CONTENT"; char *esc_content = NULL; - if (!onion_address || !desc_id || !hsdir_id_digest || !content) { + if (!onion_address || !desc_id || !hsdir_id_digest) { log_warn(LD_BUG, "Called with onion_address==%p, desc_id==%p, " - "hsdir_id_digest==%p, content==%p", onion_address, desc_id, - hsdir_id_digest, content); + "hsdir_id_digest==%p", onion_address, desc_id, hsdir_id_digest); return; } + if (content == NULL) { + /* Point it to empty content so it can still be escaped. */ + content = ""; + } write_escaped_data(content, strlen(content), &esc_content); send_control_event(EVENT_HS_DESC_CONTENT, ALL_FORMATS, diff --git a/src/or/directory.c b/src/or/directory.c index 0e7b954..37a46fc 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2107,7 +2107,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) control_event_hs_descriptor_content(conn->rend_data->onion_address, \ conn->requested_resource, \ conn->identity_digest, \ - "") ) + NULL) ) tor_assert(conn->rend_data); log_info(LD_REND,"Received rendezvous descriptor (size %d, status %d " "(%s))", @@ -2149,6 +2149,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) body); conn->base_.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2; rend_client_desc_trynow(service_id); + memwipe(service_id, 0, sizeof(service_id)); break; } } diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 7941ba7..d649075 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -496,11 +496,10 @@ get_last_hid_serv_requests(void) REND_SERVICE_ID_LEN_BASE32) /** Look up the last request time to hidden service directory hs_dir - * for descriptor ID desc_id_base32 for the service specified in - * rend_query. If set is non-zero, - * assign the current time now and return that. Otherwise, return - * the most recent request time, or 0 if no such request has been sent - * before. */ + * for descriptor ID desc_id_base32. If set is non-zero, + * assign the current time now and return that. Otherwise, return the + * most recent request time, or 0 if no such request has been sent before. + */ static time_t lookup_last_hid_serv_request(routerstatus_t *hs_dir, const char *desc_id_base32, @@ -612,20 +611,17 @@ rend_client_purge_last_hid_serv_requests(void) * * Return NULL on error else the hsdir node pointer. */ static routerstatus_t * -pick_hsdir(const char *desc_id) +pick_hsdir(const char *desc_id, const char *desc_id_base32) { smartlist_t *responsible_dirs = smartlist_new(); smartlist_t *usable_responsible_dirs = smartlist_new(); const or_options_t *options = get_options(); routerstatus_t *hs_dir; - char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; time_t now = time(NULL); int excluded_some; tor_assert(desc_id); - - base32_encode(desc_id_base32, sizeof(desc_id_base32), - desc_id, DIGEST_LEN); + tor_assert(desc_id_base32); /* Determine responsible dirs. Even if we can't get all we want, work with * the ones we have. If it's empty, we'll notice below. */ @@ -705,7 +701,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query, /* Automatically pick an hs dir if none given. */ if (!rs_hsdir) { - hs_dir = pick_hsdir(desc_id); + hs_dir = pick_hsdir(desc_id, desc_id_base32); if (!hs_dir) { /* No suitable hs dir can be found, stop right now. */ return 0; [View Less]

1 0

[tor/master] Fix some RNG function issues
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 9a81ed1d238e952429a53e7b38a4b6dd4bc5554a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 11:13:51 2015 -0400 Fix some RNG function issues --- src/common/crypto.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index f338114..7857a54 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2330,9 +2330,7 @@ crypto_rand_int_range(unsigned int min, unsigned int max) tor_assert(max … [View More]

1 0

[tor/master] Remove onion address usage in lookup_last_hid_serv_request
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit e9782043c88b92510c71755b73fb712ca96a5cca Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Mar 11 13:43:07 2015 -0400 Remove onion address usage in lookup_last_hid_serv_request Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendclient.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 14f311c..af08494 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -… [View More]

1 0

[torsocks/master] Fix getaddrinfo() to respect AI_NUMERICHOST.
by dgoulet＠torproject.org 23 Apr '15

23 Apr '15

commit 7501e3f1c36404940199ac41b515ec81e1f43fc7 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Mar 29 17:47:03 2015 +0000 Fix getaddrinfo() to respect AI_NUMERICHOST. Signed-off-by: Yawning Angel <yawning(a)schwanenlied.me> --- src/lib/getaddrinfo.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/getaddrinfo.c b/src/lib/getaddrinfo.c index 378f87f..0f7fd4f 100644 --- a/src/lib/getaddrinfo.c +++ b/src/lib/getaddrinfo.c @@ -89,6 +89,… [View More]

1 0

[torsocks/master] Merge remote-tracking branch 'yawning/getaddrinfo' into getaddrinfo
by dgoulet＠torproject.org 23 Apr '15

23 Apr '15

commit bb972f433006efc660a334cc3a1248e7f6211964 Merge: 2845ef5 7501e3f Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Apr 23 11:50:17 2015 -0400 Merge remote-tracking branch 'yawning/getaddrinfo' into getaddrinfo src/lib/getaddrinfo.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'teor/longest-policy-comment'
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 85eadb733f7a58107e9f3b6fd81094cab4c29b6c Merge: c366e1f 9a34caa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 23 11:05:24 2015 -0400 Merge remote-tracking branch 'teor/longest-policy-comment' src/or/routerparse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Correct "longest possible policy" comment in router policy
by nickm＠torproject.org 23 Apr '15

23 Apr '15

commit 9a34caa4e7867c90e8d5280d84fce9cf264c1c38 Author: teor <teor2345(a)gmail.com> Date: Thu Apr 23 23:51:59 2015 +1000 Correct "longest possible policy" comment in router policy The "longest possible policy" comment in router_parse_addr_policy_item_from_string() used an example policy that was actually shorter than the maximum length. This comment was amended, and expanded to count the maximum number of characters. Comment change only. --- … [View More]

1 0