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

[tor/master] Clean up service-side descriptor cache and fix potential double-free.
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 0bd68bf98617607f5ca0f98e4d67bf66c6b5b210 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Mon Aug 3 17:37:09 2015 +0200 Clean up service-side descriptor cache and fix potential double-free. Entries in the service-side descriptor cache are now cleaned when rend_cache_free_all() is called. The call to tor_free(intro_content) in rend_cache_store_v2_desc_as_service() is moved to prevent a potential double-free when a service has a descriptor with a newer timestamp already in it's service-side descriptor cache. --- src/or/rendcache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 0abfeb5..7617e9d 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -222,9 +222,11 @@ rend_cache_free_all(void) { strmap_free(rend_cache, rend_cache_entry_free_); digestmap_free(rend_cache_v2_dir, rend_cache_entry_free_); + strmap_free(rend_cache_service, rend_cache_entry_free_); strmap_free(rend_cache_failure, rend_cache_failure_entry_free_); rend_cache = NULL; rend_cache_v2_dir = NULL; + rend_cache_service = NULL; rend_cache_failure = NULL; rend_cache_total_allocation = 0; } @@ -715,8 +717,6 @@ rend_cache_store_v2_desc_as_service(const char *desc) log_warn(LD_REND, "Couldn't compute service ID."); goto err; } - /* We don't care about the introduction points. */ - tor_free(intro_content); /* Do we already have a newer descriptor? Allow new descriptors with a rounded timestamp equal to or newer than the current descriptor */ @@ -726,6 +726,8 @@ rend_cache_store_v2_desc_as_service(const char *desc) "service ID %s.", safe_str_client(service_id)); goto okay; } + /* We don't care about the introduction points. */ + tor_free(intro_content); if (!e) { e = tor_malloc_zero(sizeof(rend_cache_entry_t)); strmap_set_lc(rend_cache_service, service_id, e);

1 0

[tor/master] Preparatory indentation changes
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 968cb95602b38af626bc85e394fbfb499a59b76c Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Wed Jul 29 14:22:32 2015 +0200 Preparatory indentation changes Deindent a block of code inside the PublishHidServDescriptors option check in upload_service_descriptor(). Stylistic commit to make the subsequent reworking of this code cleaner. --- src/or/rendservice.c | 136 +++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index db6bc4b..dd8713b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3217,37 +3217,70 @@ upload_service_descriptor(rend_service_t *service) /* Upload descriptor? */ if (get_options()->PublishHidServDescriptors) { - networkstatus_t *c = networkstatus_get_latest_consensus(); - if (c && smartlist_len(c->routerstatus_list) > 0) { - int seconds_valid, i, j, num_descs; - smartlist_t *descs = smartlist_new(); - smartlist_t *client_cookies = smartlist_new(); - /* Either upload a single descriptor (including replicas) or one - * descriptor for each authorized client in case of authorization - * type 'stealth'. */ - num_descs = service->auth_type == REND_STEALTH_AUTH ? - smartlist_len(service->clients) : 1; - for (j = 0; j < num_descs; j++) { - crypto_pk_t *client_key = NULL; - rend_authorized_client_t *client = NULL; - smartlist_clear(client_cookies); - switch (service->auth_type) { - case REND_NO_AUTH: - /* Do nothing here. */ - break; - case REND_BASIC_AUTH: - SMARTLIST_FOREACH(service->clients, rend_authorized_client_t *, - cl, smartlist_add(client_cookies, cl->descriptor_cookie)); - break; - case REND_STEALTH_AUTH: - client = smartlist_get(service->clients, j); - client_key = client->client_key; - smartlist_add(client_cookies, client->descriptor_cookie); - break; - } - /* Encode the current descriptor. */ + networkstatus_t *c = networkstatus_get_latest_consensus(); + if (c && smartlist_len(c->routerstatus_list) > 0) { + int seconds_valid, i, j, num_descs; + smartlist_t *descs = smartlist_new(); + smartlist_t *client_cookies = smartlist_new(); + /* Either upload a single descriptor (including replicas) or one + * descriptor for each authorized client in case of authorization + * type 'stealth'. */ + num_descs = service->auth_type == REND_STEALTH_AUTH ? + smartlist_len(service->clients) : 1; + for (j = 0; j < num_descs; j++) { + crypto_pk_t *client_key = NULL; + rend_authorized_client_t *client = NULL; + smartlist_clear(client_cookies); + switch (service->auth_type) { + case REND_NO_AUTH: + /* Do nothing here. */ + break; + case REND_BASIC_AUTH: + SMARTLIST_FOREACH(service->clients, rend_authorized_client_t *, + cl, smartlist_add(client_cookies, cl->descriptor_cookie)); + break; + case REND_STEALTH_AUTH: + client = smartlist_get(service->clients, j); + client_key = client->client_key; + smartlist_add(client_cookies, client->descriptor_cookie); + break; + } + /* Encode the current descriptor. */ + seconds_valid = rend_encode_v2_descriptors(descs, service->desc, + now, 0, + service->auth_type, + client_key, + client_cookies); + if (seconds_valid < 0) { + log_warn(LD_BUG, "Internal error: couldn't encode service " + "descriptor; not uploading."); + smartlist_free(descs); + smartlist_free(client_cookies); + return; + } + /* Post the current descriptors to the hidden service directories. */ + rend_get_service_id(service->desc->pk, serviceid); + log_info(LD_REND, "Launching upload for hidden service %s", + serviceid); + directory_post_to_hs_dir(service->desc, descs, NULL, serviceid, + seconds_valid); + /* Free memory for descriptors. */ + for (i = 0; i < smartlist_len(descs); i++) + rend_encoded_v2_service_descriptor_free(smartlist_get(descs, i)); + smartlist_clear(descs); + /* Update next upload time. */ + if (seconds_valid - REND_TIME_PERIOD_OVERLAPPING_V2_DESCS + > rendpostperiod) + service->next_upload_time = now + rendpostperiod; + else if (seconds_valid < REND_TIME_PERIOD_OVERLAPPING_V2_DESCS) + service->next_upload_time = now + seconds_valid + 1; + else + service->next_upload_time = now + seconds_valid - + REND_TIME_PERIOD_OVERLAPPING_V2_DESCS + 1; + /* Post also the next descriptors, if necessary. */ + if (seconds_valid < REND_TIME_PERIOD_OVERLAPPING_V2_DESCS) { seconds_valid = rend_encode_v2_descriptors(descs, service->desc, - now, 0, + now, 1, service->auth_type, client_key, client_cookies); @@ -3258,52 +3291,19 @@ upload_service_descriptor(rend_service_t *service) smartlist_free(client_cookies); return; } - /* Post the current descriptors to the hidden service directories. */ - rend_get_service_id(service->desc->pk, serviceid); - log_info(LD_REND, "Launching upload for hidden service %s", - serviceid); directory_post_to_hs_dir(service->desc, descs, NULL, serviceid, seconds_valid); /* Free memory for descriptors. */ for (i = 0; i < smartlist_len(descs); i++) rend_encoded_v2_service_descriptor_free(smartlist_get(descs, i)); smartlist_clear(descs); - /* Update next upload time. */ - if (seconds_valid - REND_TIME_PERIOD_OVERLAPPING_V2_DESCS - > rendpostperiod) - service->next_upload_time = now + rendpostperiod; - else if (seconds_valid < REND_TIME_PERIOD_OVERLAPPING_V2_DESCS) - service->next_upload_time = now + seconds_valid + 1; - else - service->next_upload_time = now + seconds_valid - - REND_TIME_PERIOD_OVERLAPPING_V2_DESCS + 1; - /* Post also the next descriptors, if necessary. */ - if (seconds_valid < REND_TIME_PERIOD_OVERLAPPING_V2_DESCS) { - seconds_valid = rend_encode_v2_descriptors(descs, service->desc, - now, 1, - service->auth_type, - client_key, - client_cookies); - if (seconds_valid < 0) { - log_warn(LD_BUG, "Internal error: couldn't encode service " - "descriptor; not uploading."); - smartlist_free(descs); - smartlist_free(client_cookies); - return; - } - directory_post_to_hs_dir(service->desc, descs, NULL, serviceid, - seconds_valid); - /* Free memory for descriptors. */ - for (i = 0; i < smartlist_len(descs); i++) - rend_encoded_v2_service_descriptor_free(smartlist_get(descs, i)); - smartlist_clear(descs); - } } - smartlist_free(descs); - smartlist_free(client_cookies); - uploaded = 1; - log_info(LD_REND, "Successfully uploaded v2 rend descriptors!"); } + smartlist_free(descs); + smartlist_free(client_cookies); + uploaded = 1; + log_info(LD_REND, "Successfully uploaded v2 rend descriptors!"); + } } /* If not uploaded, try again in one minute. */

1 0

[tor/master] Add replica number to HS_DESC CREATED event
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 293410d1384742fe0da2f760707e3a282f4056b2 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Aug 4 14:47:51 2015 +0200 Add replica number to HS_DESC CREATED event Including the replica number in the HS_DESC CREATED event provides more context to a control port client. The replica allows clients to more easily identify each replicated descriptor from the independantly output control events. --- src/or/control.c | 10 +++++++--- src/or/control.h | 3 ++- src/or/rendcommon.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index c2240bf..2408793 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6255,10 +6255,12 @@ get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp) * * service_id is the descriptor onion address. * desc_id_base32 is the descriptor ID. + * replica is the the descriptor replica number. */ void control_event_hs_descriptor_created(const char *service_id, - const char *desc_id_base32) + const char *desc_id_base32, + int replica) { if (!service_id || !desc_id_base32) { log_warn(LD_BUG, "Called with service_digest==%p, " @@ -6267,9 +6269,11 @@ control_event_hs_descriptor_created(const char *service_id, } send_control_event(EVENT_HS_DESC, - "650 HS_DESC CREATED %s UNKNOWN UNKNOWN %s\r\n", + "650 HS_DESC CREATED %s UNKNOWN UNKNOWN %s " + "REPLICA=%d\r\n", service_id, - desc_id_base32); + desc_id_base32, + replica); } /** send HS_DESC upload event. diff --git a/src/or/control.h b/src/or/control.h index 26f7f50..1f8e2bc 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -118,7 +118,8 @@ void control_event_hs_descriptor_requested(const rend_data_t *rend_query, const char *desc_id_base32, const char *hs_dir); void control_event_hs_descriptor_created(const char *service_id, - const char *desc_id_base32); + const char *desc_id_base32, + int replica); void control_event_hs_descriptor_upload(const char *service_id, const char *desc_id_base32, const char *hs_dir); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 1e04084..f9d47d1 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -661,7 +661,7 @@ rend_encode_v2_descriptors(smartlist_t *descs_out, rend_cache_store_v2_desc_as_service(enc->desc_str); base32_encode(service_id_base32, sizeof(service_id_base32), service_id, REND_SERVICE_ID_LEN); - control_event_hs_descriptor_created(service_id_base32, desc_id_base32); + control_event_hs_descriptor_created(service_id_base32, desc_id_base32, k); } log_info(LD_REND, "Successfully encoded a v2 descriptor and "

1 0

[tor/master] Specify descriptor cache type in rend_cache_lookup_entry()
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 5dc2cbafefa9c15fd5c96707b1e5bde0c59b6132 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Mon Aug 3 17:33:28 2015 +0200 Specify descriptor cache type in rend_cache_lookup_entry() Adds an Enum which represents the different types of rendezvous descriptor caches. This argument is passed in each call to rend_cache_lookup_entry() to specify lookup in the client-side or service-side descriptor caches. --- src/or/connection_edge.c | 3 ++- src/or/control.c | 4 ++-- src/or/rendcache.c | 6 +++--- src/or/rendcache.h | 7 ++++++- src/or/rendclient.c | 13 ++++++++----- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index defe0ab..5ea82d8 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1527,7 +1527,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, unsigned int refetch_desc = 0; rend_cache_entry_t *entry = NULL; const int rend_cache_lookup_result = - rend_cache_lookup_entry(rend_data->onion_address, -1, &entry, 0); + rend_cache_lookup_entry(rend_data->onion_address, -1, &entry, + REND_CACHE_TYPE_CLIENT); if (rend_cache_lookup_result < 0) { switch (-rend_cache_lookup_result) { case EINVAL: diff --git a/src/or/control.c b/src/or/control.c index 900162e..c2240bf 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1920,7 +1920,7 @@ getinfo_helper_dir(control_connection_t *control_conn, return -1; } - if (!rend_cache_lookup_entry(question, -1, &e, 0)) { + if (!rend_cache_lookup_entry(question, -1, &e, REND_CACHE_TYPE_CLIENT)) { /* Descriptor found in cache */ *answer = tor_strdup(e->desc); } else { @@ -1936,7 +1936,7 @@ getinfo_helper_dir(control_connection_t *control_conn, return -1; } - if (!rend_cache_lookup_entry(question, -1, &e, 1)) { + if (!rend_cache_lookup_entry(question, -1, &e, REND_CACHE_TYPE_SERVICE)) { /* Descriptor found in cache */ *answer = tor_strdup(e->desc); } else { diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 1c46641..0abfeb5 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -479,7 +479,7 @@ rend_cache_clean_v2_descs_as_dir(time_t now, size_t force_remove) * -ENOENT means that no entry in the cache was found. */ int rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, - int service) + rend_cache_type_t cache) { int ret = 0; char key[REND_SERVICE_ID_LEN_BASE32 + 2]; /* <version><query>\0 */ @@ -502,7 +502,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, case 2: /* Default is version 2. */ default: - if(service){ + if(cache == REND_CACHE_TYPE_SERVICE){ entry = strmap_get_lc(rend_cache_service, query); } else { tor_snprintf(key, sizeof(key), "%d%s", default_version, query); @@ -515,7 +515,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, goto end; } /* Check descriptor is parsed only if lookup is from client cache */ - if(!service){ + if(cache == REND_CACHE_TYPE_CLIENT){ tor_assert(entry->parsed && entry->parsed->intro_nodes); } diff --git a/src/or/rendcache.h b/src/or/rendcache.h index 02eab4b..e13c9b4 100644 --- a/src/or/rendcache.h +++ b/src/or/rendcache.h @@ -48,6 +48,11 @@ typedef struct rend_cache_failure_t { digestmap_t *intro_failures; } rend_cache_failure_t; +typedef enum { + REND_CACHE_TYPE_CLIENT = 1, + REND_CACHE_TYPE_SERVICE = 2, +} rend_cache_type_t; + void rend_cache_init(void); void rend_cache_clean(time_t now); void rend_cache_failure_clean(time_t now); @@ -56,7 +61,7 @@ void rend_cache_purge(void); void rend_cache_free_all(void); int rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **entry_out, - int service); + rend_cache_type_t cache); int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc); /** Return value from rend_cache_store_v2_desc_as_{dir,client}. */ typedef enum { diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 01ad614..af1abe5 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -160,7 +160,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, #endif r = rend_cache_lookup_entry(introcirc->rend_data->onion_address, -1, - &entry, 0); + &entry, REND_CACHE_TYPE_CLIENT); /* An invalid onion address is not possible else we have a big issue. */ tor_assert(r != -EINVAL); if (r < 0 || !rend_client_any_intro_points_usable(entry)) { @@ -906,7 +906,8 @@ rend_client_refetch_v2_renddesc(rend_data_t *rend_query) return; } /* Before fetching, check if we already have a usable descriptor here. */ - if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e, 0) == 0 && + if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e, + REND_CACHE_TYPE_CLIENT) == 0 && rend_client_any_intro_points_usable(e)) { log_info(LD_REND, "We would fetch a v2 rendezvous descriptor, but we " "already have a usable descriptor here. Not fetching."); @@ -987,7 +988,8 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro, rend_cache_entry_t *ent; connection_t *conn; - r = rend_cache_lookup_entry(rend_query->onion_address, -1, &ent, 0); + r = rend_cache_lookup_entry(rend_query->onion_address, -1, &ent, + REND_CACHE_TYPE_CLIENT); if (r < 0) { /* Either invalid onion address or cache entry not found. */ switch (-r) { @@ -1213,7 +1215,7 @@ rend_client_desc_trynow(const char *query) continue; assert_connection_ok(base_conn, now); if (rend_cache_lookup_entry(rend_data->onion_address, -1, - &entry, 0) == 0 && + &entry, REND_CACHE_TYPE_CLIENT) == 0 && rend_client_any_intro_points_usable(entry)) { /* either this fetch worked, or it failed but there was a * valid entry from before which we should reuse */ @@ -1295,7 +1297,8 @@ rend_client_get_random_intro(const rend_data_t *rend_query) extend_info_t *result; rend_cache_entry_t *entry; - ret = rend_cache_lookup_entry(rend_query->onion_address, -1, &entry, 0); + ret = rend_cache_lookup_entry(rend_query->onion_address, -1, &entry, + REND_CACHE_TYPE_CLIENT); if (ret < 0 || !rend_client_any_intro_points_usable(entry)) { log_warn(LD_REND, "Query '%s' didn't have valid rend desc in cache. Failing.",

1 0

[tor/master] Separate lookup function for service rend cache
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit d47a4aec666396acb10a2bfcd9797a9c6402c1fe Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Sep 1 21:19:01 2015 +0200 Separate lookup function for service rend cache Performing lookups in both the client and service side descriptor caches from the same rend_cache_lookup_entry() function increases the risk of accidental API misuse. I'm separating the lookup functions to keep the caches distinct. --- src/or/connection_edge.c | 3 +-- src/or/control.c | 4 ++-- src/or/rendcache.c | 57 +++++++++++++++++++++++++++++++++------------- src/or/rendcache.h | 5 ++-- src/or/rendclient.c | 15 +++++------- 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5ea82d8..729ef8a 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1527,8 +1527,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, unsigned int refetch_desc = 0; rend_cache_entry_t *entry = NULL; const int rend_cache_lookup_result = - rend_cache_lookup_entry(rend_data->onion_address, -1, &entry, - REND_CACHE_TYPE_CLIENT); + rend_cache_lookup_entry(rend_data->onion_address, -1, &entry); if (rend_cache_lookup_result < 0) { switch (-rend_cache_lookup_result) { case EINVAL: diff --git a/src/or/control.c b/src/or/control.c index 2408793..7d72342 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1920,7 +1920,7 @@ getinfo_helper_dir(control_connection_t *control_conn, return -1; } - if (!rend_cache_lookup_entry(question, -1, &e, REND_CACHE_TYPE_CLIENT)) { + if (!rend_cache_lookup_entry(question, -1, &e)) { /* Descriptor found in cache */ *answer = tor_strdup(e->desc); } else { @@ -1936,7 +1936,7 @@ getinfo_helper_dir(control_connection_t *control_conn, return -1; } - if (!rend_cache_lookup_entry(question, -1, &e, REND_CACHE_TYPE_SERVICE)) { + if (!rend_cache_lookup_v2_desc_as_service(question, &e)) { /* Descriptor found in cache */ *answer = tor_strdup(e->desc); } else { diff --git a/src/or/rendcache.c b/src/or/rendcache.c index b8bdf88..0fe5a47 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -480,27 +480,23 @@ rend_cache_clean_v2_descs_as_dir(time_t now, size_t force_remove) } while (bytes_removed < force_remove); } -/** Lookup in the client or service cache the given service ID query for - * version. The service argument determines if the lookup should - * be from the client cache or the service cache. +/** Lookup in the client cache the given service ID query for + * version. * * Return 0 if found and if e is non NULL, set it with the entry * found. Else, a negative value is returned and e is untouched. * -EINVAL means that query is not a valid service id. * -ENOENT means that no entry in the cache was found. */ int -rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, - rend_cache_type_t cache) +rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) { int ret = 0; char key[REND_SERVICE_ID_LEN_BASE32 + 2]; /* <version><query>\0 */ rend_cache_entry_t *entry = NULL; static const int default_version = 2; - tor_assert(rend_cache_local_service); tor_assert(rend_cache); tor_assert(query); - tor_assert(cache); if (!rend_valid_service_id(query)) { ret = -EINVAL; @@ -514,21 +510,50 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, case 2: /* Default is version 2. */ default: - if(cache == REND_CACHE_TYPE_SERVICE){ - entry = strmap_get_lc(rend_cache_local_service, query); - } else if (cache == REND_CACHE_TYPE_CLIENT) { - tor_snprintf(key, sizeof(key), "%d%s", default_version, query); - entry = strmap_get_lc(rend_cache, key); - } + tor_snprintf(key, sizeof(key), "%d%s", default_version, query); + entry = strmap_get_lc(rend_cache, key); break; } if (!entry) { ret = -ENOENT; goto end; } - /* Check descriptor is parsed only if lookup is from client cache */ - if(cache == REND_CACHE_TYPE_CLIENT){ - tor_assert(entry->parsed && entry->parsed->intro_nodes); + tor_assert(entry->parsed && entry->parsed->intro_nodes); + + if (e) { + *e = entry; + } + + end: + return ret; +} + +/* + * Lookup the v2 service descriptor with the service ID query in the + * local service descriptor cache. Return 0 if found and if e is + * non NULL, set it with the entry found. Else, a negative value is returned + * and e is untouched. + * -EINVAL means that query is not a valid service id. + * -ENOENT means that no entry in the cache was found. */ +int +rend_cache_lookup_v2_desc_as_service(const char *query, rend_cache_entry_t **e) +{ + int ret = 0; + rend_cache_entry_t *entry = NULL; + + tor_assert(rend_cache_local_service); + tor_assert(query); + + if (!rend_valid_service_id(query)) { + ret = -EINVAL; + goto end; + } + + /* Lookup descriptor and return. */ + entry = strmap_get_lc(rend_cache_local_service, query); + if (!entry) { + ret = -ENOENT; + goto end; } if (e) { diff --git a/src/or/rendcache.h b/src/or/rendcache.h index f04d087..a5ad2da 100644 --- a/src/or/rendcache.h +++ b/src/or/rendcache.h @@ -60,8 +60,9 @@ 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_cache_lookup_entry(const char *query, int version, - rend_cache_entry_t **entry_out, - rend_cache_type_t cache); + rend_cache_entry_t **entry_out); +int rend_cache_lookup_v2_desc_as_service(const char *query, + rend_cache_entry_t **entry_out); int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc); /** Return value from rend_cache_store_v2_desc_as_{dir,client}. */ typedef enum { diff --git a/src/or/rendclient.c b/src/or/rendclient.c index af1abe5..a39e518 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -160,7 +160,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, #endif r = rend_cache_lookup_entry(introcirc->rend_data->onion_address, -1, - &entry, REND_CACHE_TYPE_CLIENT); + &entry); /* An invalid onion address is not possible else we have a big issue. */ tor_assert(r != -EINVAL); if (r < 0 || !rend_client_any_intro_points_usable(entry)) { @@ -906,8 +906,7 @@ rend_client_refetch_v2_renddesc(rend_data_t *rend_query) return; } /* Before fetching, check if we already have a usable descriptor here. */ - if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e, - REND_CACHE_TYPE_CLIENT) == 0 && + if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e) == 0 && rend_client_any_intro_points_usable(e)) { log_info(LD_REND, "We would fetch a v2 rendezvous descriptor, but we " "already have a usable descriptor here. Not fetching."); @@ -988,8 +987,7 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro, rend_cache_entry_t *ent; connection_t *conn; - r = rend_cache_lookup_entry(rend_query->onion_address, -1, &ent, - REND_CACHE_TYPE_CLIENT); + r = rend_cache_lookup_entry(rend_query->onion_address, -1, &ent); if (r < 0) { /* Either invalid onion address or cache entry not found. */ switch (-r) { @@ -1215,7 +1213,7 @@ rend_client_desc_trynow(const char *query) continue; assert_connection_ok(base_conn, now); if (rend_cache_lookup_entry(rend_data->onion_address, -1, - &entry, REND_CACHE_TYPE_CLIENT) == 0 && + &entry) == 0 && rend_client_any_intro_points_usable(entry)) { /* either this fetch worked, or it failed but there was a * valid entry from before which we should reuse */ @@ -1258,7 +1256,7 @@ rend_client_note_connection_attempt_ended(const rend_data_t *rend_data) if (*rend_data->onion_address != '\0') { /* Ignore return value; we find an entry, or we don't. */ (void) rend_cache_lookup_entry(rend_data->onion_address, -1, - &cache_entry, 0); + &cache_entry); have_onion = 1; } @@ -1297,8 +1295,7 @@ rend_client_get_random_intro(const rend_data_t *rend_query) extend_info_t *result; rend_cache_entry_t *entry; - ret = rend_cache_lookup_entry(rend_query->onion_address, -1, &entry, - REND_CACHE_TYPE_CLIENT); + ret = rend_cache_lookup_entry(rend_query->onion_address, -1, &entry); if (ret < 0 || !rend_client_any_intro_points_usable(entry)) { log_warn(LD_REND, "Query '%s' didn't have valid rend desc in cache. Failing.",

1 0

[tor/master] Clean old descriptors from the service-side rend cache
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 335d0b95d36bada44e720b365f6482ce8f54c1d7 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Aug 25 16:35:35 2015 +0200 Clean old descriptors from the service-side rend cache Parameterize the rend_cache_clean() function to allow it clean old rendezvous descriptors from the service-side cache as well as the client descriptor cache. --- src/or/main.c | 3 ++- src/or/rendcache.c | 19 ++++++++++++++----- src/or/rendcache.h | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 0b0207b..9e79858 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1518,7 +1518,8 @@ run_scheduled_events(time_t now) /* Remove old information from rephist and the rend cache. */ if (time_to.clean_caches < now) { rep_history_clean(now - options->RephistTrackTime); - rend_cache_clean(now); + rend_cache_clean(now, REND_CACHE_TYPE_CLIENT); + rend_cache_clean(now, REND_CACHE_TYPE_SERVICE); rend_cache_clean_v2_descs_as_dir(now, 0); microdesc_cache_rebuild(NULL, 0); #define CLEAN_CACHES_INTERVAL (30*60) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index aae37eb..09f435c 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -260,24 +260,33 @@ rend_cache_failure_clean(time_t now) } STRMAP_FOREACH_END; } -/** Removes all old entries from the service descriptor cache. +/** Removes all old entries from the client or service descriptor cache. */ void -rend_cache_clean(time_t now) +rend_cache_clean(time_t now, rend_cache_type_t cache_type) { strmap_iter_t *iter; const char *key; void *val; rend_cache_entry_t *ent; time_t cutoff = now - REND_CACHE_MAX_AGE - REND_CACHE_MAX_SKEW; - for (iter = strmap_iter_init(rend_cache); !strmap_iter_done(iter); ) { + strmap_t *cache = NULL; + + if (cache_type == REND_CACHE_TYPE_CLIENT) { + cache = rend_cache; + } else if (cache_type == REND_CACHE_TYPE_SERVICE) { + cache = rend_cache_service; + } + tor_assert(cache); + + for (iter = strmap_iter_init(cache); !strmap_iter_done(iter); ) { strmap_iter_get(iter, &key, &val); ent = (rend_cache_entry_t*)val; if (ent->parsed->timestamp < cutoff) { - iter = strmap_iter_next_rmv(rend_cache, iter); + iter = strmap_iter_next_rmv(cache, iter); rend_cache_entry_free(ent); } else { - iter = strmap_iter_next(rend_cache, iter); + iter = strmap_iter_next(cache, iter); } } } diff --git a/src/or/rendcache.h b/src/or/rendcache.h index e13c9b4..f04d087 100644 --- a/src/or/rendcache.h +++ b/src/or/rendcache.h @@ -54,7 +54,7 @@ typedef enum { } rend_cache_type_t; void rend_cache_init(void); -void rend_cache_clean(time_t now); +void rend_cache_clean(time_t now, rend_cache_type_t cache_type); void rend_cache_failure_clean(time_t now); void rend_cache_clean_v2_descs_as_dir(time_t now, size_t min_to_remove); void rend_cache_purge(void);

1 0

[tor/master] Require explict specification of cache type
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit ee1a4ce8b2d927dff5e8feafe8b0363d57a4f32e Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Mon Aug 24 15:17:33 2015 +0200 Require explict specification of cache type --- src/or/rendcache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 7617e9d..aae37eb 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -491,6 +491,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, tor_assert(rend_cache_service); tor_assert(rend_cache); tor_assert(query); + tor_assert(cache); if (!rend_valid_service_id(query)) { ret = -EINVAL; @@ -506,7 +507,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, default: if(cache == REND_CACHE_TYPE_SERVICE){ entry = strmap_get_lc(rend_cache_service, query); - } else { + } else if (cache == REND_CACHE_TYPE_CLIENT) { tor_snprintf(key, sizeof(key), "%d%s", default_version, query); entry = strmap_get_lc(rend_cache, key); }

1 0

[tor/master] Rename rend_cache_service to rend_cache_local_service for clarity
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 61ef356ab3ca1bbc4db725484293ebbc78710637 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Aug 25 17:05:22 2015 +0200 Rename rend_cache_service to rend_cache_local_service for clarity --- src/or/rendcache.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 09f435c..b8bdf88 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -18,7 +18,7 @@ static strmap_t *rend_cache = NULL; /** Map from service id to rend_cache_entry_t; only for hidden services. */ -static strmap_t *rend_cache_service = NULL; +static strmap_t *rend_cache_local_service = NULL; /** Map from descriptor id to rend_cache_entry_t; only for hidden service * directories. */ @@ -61,7 +61,7 @@ rend_cache_init(void) { rend_cache = strmap_new(); rend_cache_v2_dir = digestmap_new(); - rend_cache_service = strmap_new(); + rend_cache_local_service = strmap_new(); rend_cache_failure = strmap_new(); } @@ -222,11 +222,11 @@ rend_cache_free_all(void) { strmap_free(rend_cache, rend_cache_entry_free_); digestmap_free(rend_cache_v2_dir, rend_cache_entry_free_); - strmap_free(rend_cache_service, rend_cache_entry_free_); + strmap_free(rend_cache_local_service, rend_cache_entry_free_); strmap_free(rend_cache_failure, rend_cache_failure_entry_free_); rend_cache = NULL; rend_cache_v2_dir = NULL; - rend_cache_service = NULL; + rend_cache_local_service = NULL; rend_cache_failure = NULL; rend_cache_total_allocation = 0; } @@ -275,7 +275,7 @@ rend_cache_clean(time_t now, rend_cache_type_t cache_type) if (cache_type == REND_CACHE_TYPE_CLIENT) { cache = rend_cache; } else if (cache_type == REND_CACHE_TYPE_SERVICE) { - cache = rend_cache_service; + cache = rend_cache_local_service; } tor_assert(cache); @@ -497,7 +497,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, rend_cache_entry_t *entry = NULL; static const int default_version = 2; - tor_assert(rend_cache_service); + tor_assert(rend_cache_local_service); tor_assert(rend_cache); tor_assert(query); tor_assert(cache); @@ -515,7 +515,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e, /* Default is version 2. */ default: if(cache == REND_CACHE_TYPE_SERVICE){ - entry = strmap_get_lc(rend_cache_service, query); + entry = strmap_get_lc(rend_cache_local_service, query); } else if (cache == REND_CACHE_TYPE_CLIENT) { tor_snprintf(key, sizeof(key), "%d%s", default_version, query); entry = strmap_get_lc(rend_cache, key); @@ -712,7 +712,7 @@ rend_cache_store_v2_desc_as_service(const char *desc) char service_id[REND_SERVICE_ID_LEN_BASE32+1]; rend_cache_entry_t *e; rend_cache_store_status_t retval = RCS_BADDESC; - tor_assert(rend_cache_service); + tor_assert(rend_cache_local_service); tor_assert(desc); /* Parse the descriptor. */ @@ -730,7 +730,8 @@ rend_cache_store_v2_desc_as_service(const char *desc) /* Do we already have a newer descriptor? Allow new descriptors with a rounded timestamp equal to or newer than the current descriptor */ - e = (rend_cache_entry_t*) strmap_get_lc(rend_cache_service, service_id); + e = (rend_cache_entry_t*) strmap_get_lc(rend_cache_local_service, + service_id); if (e && e->parsed->timestamp > parsed->timestamp) { log_info(LD_REND, "We already have a newer service descriptor for " "service ID %s.", safe_str_client(service_id)); @@ -740,7 +741,7 @@ rend_cache_store_v2_desc_as_service(const char *desc) tor_free(intro_content); if (!e) { e = tor_malloc_zero(sizeof(rend_cache_entry_t)); - strmap_set_lc(rend_cache_service, service_id, e); + strmap_set_lc(rend_cache_local_service, service_id, e); } else { rend_cache_decrement_allocation(rend_cache_entry_allocation(e)); rend_service_descriptor_free(e->parsed);

1 0

[tor/master] Add changelog entry for feature #14846
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 08b1738a18e9e323109e7e0f0a23158bbd45a5c1 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Fri Sep 4 11:43:47 2015 +0200 Add changelog entry for feature #14846 --- changes/feature14846 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/feature14846 b/changes/feature14846 new file mode 100644 index 0000000..4668761 --- /dev/null +++ b/changes/feature14846 @@ -0,0 +1,4 @@ + o Major features (controller): + - New "GETINFO hs/service/desc/id/" command to retrieve a hidden service + descriptor from a service's local hidden service descriptor cache. + Closes ticket 14846.

1 0

[tor/master] Merge remote-tracking branch 'donncha/feature14846_4'
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 0b3190d4b73be07dd78c3c0bca8b30651915fc37 Merge: 0e03a04 08b1738 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 13:40:26 2015 +0200 Merge remote-tracking branch 'donncha/feature14846_4' changes/feature14846 | 4 ++ src/or/control.c | 43 +++++++++++++++ src/or/control.h | 3 + src/or/main.c | 3 +- src/or/rendcache.c | 137 +++++++++++++++++++++++++++++++++++++++++++-- src/or/rendcache.h | 11 +++- src/or/rendcommon.c | 7 +++ src/or/rendservice.c | 150 +++++++++++++++++++++++++------------------------- src/test/test.c | 4 ++ 9 files changed, 280 insertions(+), 82 deletions(-)

1 0