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

[torspec/master] Documents HS_DESC CREATED event.
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 5be4713efe6bc6515d291a631341d8bd4e19b8bf Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Wed Jul 29 15:42:51 2015 +0200 Documents HS_DESC CREATED event. --- control-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index f96427f..2f7bb64 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2743,7 +2743,7 @@ [SP DescriptorID] [SP "REASON=" Reason] Action = "REQUESTED" / "UPLOAD" / "RECEIVED" / "UPLOADED" / "IGNORE" / - "FAILED" + "FAILED" / "CREATED" HSAddress = 16*Base32Character / "UNKNOWN" AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN" HsDir = LongName / Fingerprint

1 0

[torspec/master] Fix line wrapping
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 69de9ec98cf9e20cbf36ec1f2cd14561e9ba0b30 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Sep 8 14:33:48 2015 +0200 Fix line wrapping --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 9ccaad9..024f5a1 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -849,7 +849,8 @@ "hs/service/desc/id/<ADDR>" Prints the content of the hidden service descriptor corresponding to - the given <ADDR> which is an onion address without the ".onion" part. The service's local descriptor cache is queried to find the descriptor. + the given <ADDR> which is an onion address without the ".onion" part. + The service's local descriptor cache is queried to find the descriptor. The format of the descriptor is described in section 1.3 of the rend-spec.txt document.

1 0

[torspec/master] Add control spec entry for GETINFO hs/service/desc/id/ command
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 99fe437487b528113d15f12adce8255a1098539c Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Jul 21 17:53:19 2015 +0200 Add control spec entry for GETINFO hs/service/desc/id/ command --- control-spec.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 1203972..f96427f 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -847,6 +847,17 @@ [New in Tor 0.2.7.1-alpha] + "hs/service/desc/id/<ADDR>" + Prints the content of the hidden service descriptor corresponding to + the given <ADDR> which is an onion address without the ".onion" part. The service's local descriptor cache is queried to find the descriptor. + The format of the descriptor is described in section 1.3 of the + rend-spec.txt document. + + If <ADDR> is unrecognized or if not found in the cache, a 551 error is + returned. + + [New in Tor 0.2.7.2-alpha] + "onions/current" "onions/detached" A newline-separated list of the Onion ("Hidden") Services created

1 0

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

02 Oct '15

commit 6fa2397ed623389287495d2c75eb1ab445de32d0 Merge: 91e207e 69de9ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 13:49:14 2015 +0200 Merge remote-tracking branch 'donncha/feature14846_2' control-spec.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)

1 0

[tor/master] Store service descriptors in the service descriptor cache
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit e0b82e5968af50e649963f6833ac7fd6e70a7e42 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Wed Jul 29 15:20:51 2015 +0200 Store service descriptors in the service descriptor cache Service descriptors are now generated regardless of the the PublishHidServDescriptors option. The generated descriptors are stored in the service descriptor cache. The PublishHidServDescriptors = 1 option now prevents descriptor publication to the HSDirs rather than descriptor generation. --- src/or/rendcommon.c | 7 +++++++ src/or/rendservice.c | 27 ++++++++++++++++----------- src/test/test.c | 4 ++++ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 22599e9..1e04084 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -11,6 +11,7 @@ #include "or.h" #include "circuitbuild.h" #include "config.h" +#include "control.h" #include "rendclient.h" #include "rendcommon.h" #include "rendmid.h" @@ -461,6 +462,7 @@ rend_encode_v2_descriptors(smartlist_t *descs_out, smartlist_t *client_cookies) { char service_id[DIGEST_LEN]; + char service_id_base32[REND_SERVICE_ID_LEN_BASE32+1]; uint32_t time_period; char *ipos_base64 = NULL, *ipos = NULL, *ipos_encrypted = NULL, *descriptor_cookie = NULL; @@ -655,6 +657,11 @@ rend_encode_v2_descriptors(smartlist_t *descs_out, goto err; } smartlist_add(descs_out, enc); + /* Add the uploaded descriptor to the local service's descriptor cache */ + 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); } log_info(LD_REND, "Successfully encoded a v2 descriptor and " diff --git a/src/or/rendservice.c b/src/or/rendservice.c index dd8713b..75d859d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3215,8 +3215,6 @@ upload_service_descriptor(rend_service_t *service) rendpostperiod = get_options()->RendPostPeriod; - /* 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; @@ -3258,12 +3256,14 @@ 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); + if (get_options()->PublishHidServDescriptors) { + /* Post the current descriptors to the hidden service directories. */ + 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)); @@ -3291,8 +3291,10 @@ upload_service_descriptor(rend_service_t *service) smartlist_free(client_cookies); return; } - directory_post_to_hs_dir(service->desc, descs, NULL, serviceid, - seconds_valid); + if (get_options()->PublishHidServDescriptors) { + 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)); @@ -3302,8 +3304,11 @@ upload_service_descriptor(rend_service_t *service) smartlist_free(descs); smartlist_free(client_cookies); uploaded = 1; - log_info(LD_REND, "Successfully uploaded v2 rend descriptors!"); - } + if (get_options()->PublishHidServDescriptors) { + log_info(LD_REND, "Successfully uploaded v2 rend descriptors!"); + } else { + log_info(LD_REND, "Successfully stored created v2 rend descriptors!"); + } } /* If not uploaded, try again in one minute. */ diff --git a/src/test/test.c b/src/test/test.c index 7ad849f..683a3b4 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -47,6 +47,7 @@ double fabs(double x); #include "connection_edge.h" #include "geoip.h" #include "rendcommon.h" +#include "rendcache.h" #include "test.h" #include "torgzip.h" #include "memarea.h" @@ -494,6 +495,9 @@ test_rend_fns(void *arg) tt_str_op(address6,OP_EQ, "abcdefghijklmnop"); tt_assert(BAD_HOSTNAME == parse_extended_hostname(address7)); + /* Initialize the service cache. */ + rend_cache_init(); + pk1 = pk_generate(0); pk2 = pk_generate(1); generated = tor_malloc_zero(sizeof(rend_service_descriptor_t));

1 0

[tor/master] Create a service-side descriptor cache
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 1a75e6da007ddd3207726dc2b1293e22453c81af Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Wed Jul 29 14:40:29 2015 +0200 Create a service-side descriptor cache Adds a service descriptor cache which is indexed by service ID. This descriptor cache is used to store service descriptors generated by a local rendevous service. The service-side cach can be queried by calling rend_cache_lookup_entry() with the 'service' argument set to 1. --- src/or/connection_edge.c | 2 +- src/or/control.c | 2 +- src/or/rendcache.c | 99 +++++++++++++++++++++++++++++++++++++++++++--- src/or/rendcache.h | 5 ++- src/or/rendclient.c | 12 +++--- 5 files changed, 105 insertions(+), 15 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 729ef8a..defe0ab 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1527,7 +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_lookup_entry(rend_data->onion_address, -1, &entry, 0); 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 220e7e5..d237f8f 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)) { + if (!rend_cache_lookup_entry(question, -1, &e, 0)) { /* Descriptor found in cache */ *answer = tor_strdup(e->desc); } else { diff --git a/src/or/rendcache.c b/src/or/rendcache.c index a914722..1c46641 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -17,6 +17,9 @@ * rend_cache_entry_t. */ 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; + /** Map from descriptor id to rend_cache_entry_t; only for hidden service * directories. */ static digestmap_t *rend_cache_v2_dir = NULL; @@ -58,6 +61,7 @@ rend_cache_init(void) { rend_cache = strmap_new(); rend_cache_v2_dir = digestmap_new(); + rend_cache_service = strmap_new(); rend_cache_failure = strmap_new(); } @@ -465,21 +469,24 @@ rend_cache_clean_v2_descs_as_dir(time_t now, size_t force_remove) } while (bytes_removed < force_remove); } -/** Lookup in the client cache the given service ID query for - * version. +/** 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. * * 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_lookup_entry(const char *query, int version, rend_cache_entry_t **e, + int service) { 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_service); tor_assert(rend_cache); tor_assert(query); @@ -495,15 +502,22 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) case 2: /* Default is version 2. */ default: - tor_snprintf(key, sizeof(key), "%d%s", default_version, query); - entry = strmap_get_lc(rend_cache, key); + if(service){ + entry = strmap_get_lc(rend_cache_service, query); + } else { + tor_snprintf(key, sizeof(key), "%d%s", default_version, query); + entry = strmap_get_lc(rend_cache, key); + } break; } if (!entry) { ret = -ENOENT; goto end; } - tor_assert(entry->parsed && entry->parsed->intro_nodes); + /* Check descriptor is parsed only if lookup is from client cache */ + if(!service){ + tor_assert(entry->parsed && entry->parsed->intro_nodes); + } if (e) { *e = entry; @@ -665,6 +679,79 @@ rend_cache_store_v2_desc_as_dir(const char *desc) return RCS_OKAY; } +/** Parse the v2 service descriptor in desc and store it to the +* local service rend cache. Don't attempt to decrypt the included list of +* introduction points. +* +* If we have a newer descriptor with the same ID, ignore this one. +* If we have an older descriptor with the same ID, replace it. +* +* Return an appropriate rend_cache_store_status_t. +*/ +rend_cache_store_status_t +rend_cache_store_v2_desc_as_service(const char *desc) +{ + rend_service_descriptor_t *parsed = NULL; + char desc_id[DIGEST_LEN]; + char *intro_content = NULL; + size_t intro_size; + size_t encoded_size; + const char *next_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(desc); + + /* Parse the descriptor. */ + if (rend_parse_v2_service_descriptor(&parsed, desc_id, &intro_content, + &intro_size, &encoded_size, + &next_desc, desc, 0) < 0) { + log_warn(LD_REND, "Could not parse descriptor."); + goto err; + } + /* Compute service ID from public key. */ + if (rend_get_service_id(parsed->pk, service_id)<0) { + 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 */ + e = (rend_cache_entry_t*) strmap_get_lc(rend_cache_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)); + goto okay; + } + if (!e) { + e = tor_malloc_zero(sizeof(rend_cache_entry_t)); + strmap_set_lc(rend_cache_service, service_id, e); + } else { + rend_cache_decrement_allocation(rend_cache_entry_allocation(e)); + rend_service_descriptor_free(e->parsed); + tor_free(e->desc); + } + e->parsed = parsed; + e->desc = tor_malloc_zero(encoded_size + 1); + strlcpy(e->desc, desc, encoded_size + 1); + e->len = encoded_size; + rend_cache_increment_allocation(rend_cache_entry_allocation(e)); + log_debug(LD_REND,"Successfully stored rend desc '%s', len %d.", + safe_str_client(service_id), (int)encoded_size); + return RCS_OKAY; + + okay: + retval = RCS_OKAY; + + err: + rend_service_descriptor_free(parsed); + tor_free(intro_content); + return retval; +} + /** Parse the v2 service descriptor in desc, decrypt the included list * of introduction points with descriptor_cookie (which may also be * NULL if decryption is not necessary), and store the descriptor to diff --git a/src/or/rendcache.h b/src/or/rendcache.h index 0512058..02eab4b 100644 --- a/src/or/rendcache.h +++ b/src/or/rendcache.h @@ -55,7 +55,8 @@ 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_entry_t **entry_out, + int service); 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 { @@ -65,6 +66,8 @@ typedef enum { } rend_cache_store_status_t; rend_cache_store_status_t rend_cache_store_v2_desc_as_dir(const char *desc); +rend_cache_store_status_t rend_cache_store_v2_desc_as_service( + const char *desc); rend_cache_store_status_t rend_cache_store_v2_desc_as_client(const char *desc, const char *desc_id_base32, const rend_data_t *rend_query, diff --git a/src/or/rendclient.c b/src/or/rendclient.c index a39e518..01ad614 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); + &entry, 0); /* 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,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) == 0 && + if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e, 0) == 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 +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); + r = rend_cache_lookup_entry(rend_query->onion_address, -1, &ent, 0); if (r < 0) { /* Either invalid onion address or cache entry not found. */ switch (-r) { @@ -1213,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) == 0 && + &entry, 0) == 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 */ @@ -1256,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); + &cache_entry, 0); have_onion = 1; } @@ -1295,7 +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); + ret = rend_cache_lookup_entry(rend_query->onion_address, -1, &entry, 0); 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] Fix typo
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 5eff39c846a62c1dbe4c0b9988f58e93e1229b98 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Jul 21 14:47:13 2015 +0200 Fix typo --- src/or/rendcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index fe9a134..a914722 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -3,7 +3,7 @@ /** * \file rendcache.c - * \brief Hidden service desriptor cache. + * \brief Hidden service descriptor cache. **/ #include "rendcache.h"

1 0

[tor/master] Add a HS_DESC CREATED control event
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit af3be650e3f8417da985efc4d26c676201c7e38b Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Jul 21 17:03:23 2015 +0200 Add a HS_DESC CREATED control event The HS_DESC CREATED event should be emmited when a new service descriptor is generated for a local rendevous service. This event is documented in the control spec. This commit resolves ticket #16291. --- src/or/control.c | 21 +++++++++++++++++++++ src/or/control.h | 2 ++ 2 files changed, 23 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index d237f8f..fb74d7d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6233,6 +6233,27 @@ get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp) return desc_id; } +/** send HS_DESC CREATED event when a local service generates a descriptor. + * + * service_id is the descriptor onion address. + * desc_id_base32 is the descriptor ID. + */ +void +control_event_hs_descriptor_created(const char *service_id, + const char *desc_id_base32) +{ + if (!service_id || !desc_id_base32) { + log_warn(LD_BUG, "Called with service_digest==%p, " + "desc_id_base32==%p", service_id, desc_id_base32); + return; + } + + send_control_event(EVENT_HS_DESC, + "650 HS_DESC CREATED %s UNKNOWN UNKNOWN %s\r\n", + service_id, + desc_id_base32); +} + /** send HS_DESC upload event. * * service_id is the descriptor onion address. diff --git a/src/or/control.h b/src/or/control.h index fdf7903..26f7f50 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -117,6 +117,8 @@ MOCK_DECL(const char *, node_describe_longname_by_id,(const char *id_digest)); 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); void control_event_hs_descriptor_upload(const char *service_id, const char *desc_id_base32, const char *hs_dir);

1 0

[tor/master] Add GETINFO hs/service/desc/id/ control command
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 580673cf9487389a55c9c0efea54b818ec272d9c Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Wed Jul 29 15:11:56 2015 +0200 Add GETINFO hs/service/desc/id/ control command Adds a control command to fetch a local service descriptor from the service descriptor cache. The local service descriptor cache is referenced by the onion address of the service. This control command is documented in the control spec. --- src/or/control.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index fb74d7d..900162e 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1927,6 +1927,22 @@ getinfo_helper_dir(control_connection_t *control_conn, *errmsg = "Not found in cache"; return -1; } + } else if (!strcmpstart(question, "hs/service/desc/id/")) { + rend_cache_entry_t *e = NULL; + + question += strlen("hs/service/desc/id/"); + if (strlen(question) != REND_SERVICE_ID_LEN_BASE32) { + *errmsg = "Invalid address"; + return -1; + } + + if (!rend_cache_lookup_entry(question, -1, &e, 1)) { + /* Descriptor found in cache */ + *answer = tor_strdup(e->desc); + } else { + *errmsg = "Not found in cache"; + return -1; + } } else if (!strcmpstart(question, "md/id/")) { const node_t *node = node_get_by_hex_id(question+strlen("md/id/")); const microdesc_t *md = NULL; @@ -2481,6 +2497,8 @@ static const getinfo_item_t getinfo_items[] = { PREFIX("extra-info/digest/", dir, "Extra-info documents by digest."), PREFIX("hs/client/desc/id", dir, "Hidden Service descriptor in client's cache by onion."), + PREFIX("hs/service/desc/id/", dir, + "Hidden Service descriptor in services's cache by onion."), PREFIX("net/listeners/", listeners, "Bound addresses by type"), ITEM("ns/all", networkstatus, "Brief summary of router status (v2 directory format)"),

1 0

[tor/master] Generate service descriptors when PublishHidServDescriptors = 0
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 1d205163e8584a5e59237b69540b699fde87e7ce Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Fri Jul 24 15:36:31 2015 +0200 Generate service descriptors when PublishHidServDescriptors = 0 Removes a check to PublishHidServDescriptors in rend_consider_services_upload(). This allows descriptors to be generated and stored in the local cache when PublishHidServDescriptor = 0. Keep the PublishHidServDescriptors option check in rend_consider_descriptor_republication(). We will never need to republish a descriptor if we are not publishing descriptors to the HSDirs. --- src/or/rendservice.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 75d859d..4f5ed07 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3652,9 +3652,6 @@ rend_consider_services_upload(time_t now) MIN_REND_INITIAL_POST_DELAY_TESTING : MIN_REND_INITIAL_POST_DELAY); - if (!get_options()->PublishHidServDescriptors) - return; - for (i=0; i < smartlist_len(rend_service_list); ++i) { service = smartlist_get(rend_service_list, i); if (!service->next_upload_time) { /* never been uploaded yet */

1 0