September 2017 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'asn/bug23346'
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 834e1f8085af43c8f7bd07c346cf6f760a519f13 Merge: 109cfebca b9f849bde Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 12:30:51 2017 -0400 Merge remote-tracking branch 'asn/bug23346' src/or/hs_service.c | 36 ++++++------- src/or/hs_service.h | 2 +- src/test/test_hs_common.c | 134 +++++++++++++++++++++++++--------------------- 3 files changed, 90 insertions(+), 82 deletions(-)

1 0

[tor/master] Merge branch 'bug23360_032_01'
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 85688dc33ddc80233fa6c883a589fb4ba9377a5d Merge: e72dec18a 8c4119625 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 12:11:43 2017 -0400 Merge branch 'bug23360_032_01' src/or/hs_service.c | 95 +++-------------------------------------------------- src/or/hs_service.h | 8 ----- src/or/nodelist.c | 2 +- 3 files changed, 6 insertions(+), 99 deletions(-)

1 0

[tor/master] hs: Remove dead code and uneeded feature
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 8c41196254ec115668d31da3cb23fe3c3550b623 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 30 08:34:02 2017 -0400 hs: Remove dead code and uneeded feature When merging #20657, somehow hs_service_dir_info_changed() became unused leading to not use the re-upload to HSDir when we were missing information feature. Turns out that it is not possible to pick an HSDir with a missing descriptor because in order to compute the HSDir index, the descriptor is mandatory to have so we can know its position on the hashring. This commit removes that dead feature and fix the hs_service_dir_info_changed() not being used. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 95 +++-------------------------------------------------- src/or/hs_service.h | 8 ----- src/or/nodelist.c | 2 +- 3 files changed, 6 insertions(+), 99 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 5ff118222..ac4efb875 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -972,8 +972,6 @@ service_descriptor_free(hs_service_descriptor_t *desc) hs_descriptor_free(desc->desc); memwipe(&desc->signing_kp, 0, sizeof(desc->signing_kp)); memwipe(&desc->blinded_kp, 0, sizeof(desc->blinded_kp)); - SMARTLIST_FOREACH(desc->hsdir_missing_info, char *, id, tor_free(id)); - smartlist_free(desc->hsdir_missing_info); /* Cleanup all intro points. */ digest256map_free(desc->intro_points.map, service_intro_point_free_); digestmap_free(desc->intro_points.failed_id, tor_free_); @@ -993,7 +991,6 @@ service_descriptor_new(void) /* Initialize the intro points map. */ sdesc->intro_points.map = digest256map_new(); sdesc->intro_points.failed_id = digestmap_new(); - sdesc->hsdir_missing_info = smartlist_new(); sdesc->previous_hsdirs = smartlist_new(); return sdesc; } @@ -2324,18 +2321,6 @@ upload_descriptor_to_all(const hs_service_t *service, /* Getting responsible hsdir implies that the node_t object exists for the * routerstatus_t found in the consensus else we have a problem. */ tor_assert(hsdir_node); - /* Do not upload to an HSDir we don't have a descriptor for. */ - if (!node_has_descriptor(hsdir_node)) { - log_info(LD_REND, "Missing descriptor for HSDir %s. Not uploading " - "descriptor. We'll try later once we have it.", - safe_str_client(node_describe(hsdir_node))); - /* Once we get new directory information, this HSDir will be retried if - * we ever get the descriptor. */ - smartlist_add(desc->hsdir_missing_info, - tor_memdup(hsdir_rs->identity_digest, DIGEST_LEN)); - continue; - } - /* Upload this descriptor to the chosen directory. */ upload_descriptor_to_hsdir(service, desc, hsdir_node); } SMARTLIST_FOREACH_END(hsdir_rs); @@ -2724,58 +2709,6 @@ service_handle_introduce2(origin_circuit_t *circ, const uint8_t *payload, return -1; } -/* For a given service and a descriptor of that service, consider retrying to - * upload the descriptor to any directories from which we had missing - * information when originally tried to be uploaded. This is called when our - * directory information has changed. */ -static void -consider_hsdir_upload_retry(const hs_service_t *service, - hs_service_descriptor_t *desc) -{ - smartlist_t *responsible_dirs = NULL; - smartlist_t *still_missing_dirs = NULL; - - tor_assert(service); - tor_assert(desc); - - responsible_dirs = smartlist_new(); - still_missing_dirs = smartlist_new(); - - /* We first need to get responsible directories from the latest consensus so - * we can then make sure that the node that we were missing information for - * is still responsible for this descriptor. */ - hs_get_responsible_hsdirs(&desc->blinded_kp.pubkey, desc->time_period_num, - service->desc_next == desc, 0, responsible_dirs); - - SMARTLIST_FOREACH_BEGIN(responsible_dirs, const routerstatus_t *, rs) { - const node_t *node; - const char *id = rs->identity_digest; - if (!smartlist_contains_digest(desc->hsdir_missing_info, id)) { - continue; - } - /* We do need a node_t object and descriptor to perform an upload. If - * found, we remove the id from the missing dir list else we add it to the - * still missing dir list to keep track of id that are still missing. */ - node = node_get_by_id(id); - if (node && node_has_descriptor(node)) { - upload_descriptor_to_hsdir(service, desc, node); - smartlist_remove(desc->hsdir_missing_info, id); - } else { - smartlist_add(still_missing_dirs, tor_memdup(id, DIGEST_LEN)); - } - } SMARTLIST_FOREACH_END(rs); - - /* Switch the still missing dir list with the current missing dir list in - * the descriptor. It is possible that the list ends up empty which is what - * we want if we have no more missing dir. */ - SMARTLIST_FOREACH(desc->hsdir_missing_info, char *, id, tor_free(id)); - smartlist_free(desc->hsdir_missing_info); - desc->hsdir_missing_info = still_missing_dirs; - - /* No ownership of the routerstatus_t object in this list. */ - smartlist_free(responsible_dirs); -} - /* Add to list every filename used by service. This is used by the sandbox * subsystem. */ static void @@ -2802,16 +2735,6 @@ service_add_fnames_to_list(const hs_service_t *service, smartlist_t *list) /* Public API */ /* ========== */ -/* We just received a new batch of descriptors which might affect the shape of - * the HSDir hash ring. Signal that we should reexamine the hash ring and - * re-upload our HS descriptors if needed. */ -void -hs_hsdir_set_changed_consider_reupload(void) -{ - log_info(LD_REND, "New dirinfo arrived: consider reuploading descriptor"); - consider_republishing_hs_descriptors = 1; -} - /* Return the number of service we have configured and usable. */ unsigned int hs_service_get_num_services(void) @@ -2981,22 +2904,14 @@ hs_service_lists_fnames_for_sandbox(smartlist_t *file_list, } /* Called when our internal view of the directory has changed. We might have - * new descriptors for hidden service directories that we didn't have before - * so try them if it's the case. */ + * received a new batch of descriptors which might affect the shape of the + * HSDir hash ring. Signal that we should reexamine the hash ring and + * re-upload our HS descriptors if needed. */ void hs_service_dir_info_changed(void) { - /* For each service we have, check every descriptor and consider retrying to - * upload it to directories that we might have had missing information - * previously that is missing a router descriptor. */ - FOR_EACH_SERVICE_BEGIN(service) { - FOR_EACH_DESCRIPTOR_BEGIN(service, desc) { - /* This cleans up the descriptor missing hsdir information list if a - * successful upload is made or if any of the directory aren't - * responsible anymore for the service descriptor. */ - consider_hsdir_upload_retry(service, desc); - } FOR_EACH_DESCRIPTOR_END; - } FOR_EACH_SERVICE_END; + log_info(LD_REND, "New dirinfo arrived: consider reuploading descriptor"); + consider_republishing_hs_descriptors = 1; } /* Called when we get an INTRODUCE2 cell on the circ. Respond to the cell and diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 57717fc92..cd4874c8e 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -123,13 +123,6 @@ typedef struct hs_service_descriptor_t { * couldn't pick any nodes. */ unsigned int missing_intro_points : 1; - /* List of identity digests for hidden service directories to which we - * couldn't upload this descriptor because we didn't have its router - * descriptor at the time. If this list is non-empty, only the relays in this - * list are re-tried to upload this descriptor when our directory information - * have been updated. */ - smartlist_t *hsdir_missing_info; - /** List of the responsible HSDirs (their b64ed identity digest) last time we * uploaded this descriptor. If the set of responsible HSDirs is different * from this list, this means we received new dirinfo and we need to @@ -266,7 +259,6 @@ void hs_service_lists_fnames_for_sandbox(smartlist_t *file_list, smartlist_t *dir_list); int hs_service_set_conn_addr_port(const origin_circuit_t *circ, edge_connection_t *conn); -void hs_hsdir_set_changed_consider_reupload(void); void hs_service_dir_info_changed(void); void hs_service_run_scheduled_events(time_t now); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 6acc87f96..155a511ca 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1810,7 +1810,7 @@ router_dir_info_changed(void) { need_to_update_have_min_dir_info = 1; rend_hsdir_routers_changed(); - hs_hsdir_set_changed_consider_reupload(); + hs_service_dir_info_changed(); } /** Return a string describing what we're missing before we have enough

1 0

[tor-messenger-build/master] Update start-tor-messenger for Selfrando (f63b9804)
by sukhbir＠torproject.org 04 Sep '17

04 Sep '17

commit b80c865726e6f83fb2e2829b63de979033a7af87 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Sep 4 12:11:45 2017 -0400 Update start-tor-messenger for Selfrando (f63b9804) --- projects/tor-messenger/start-tor-messenger | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger index dce5411..d9fd9ed 100755 --- a/projects/tor-messenger/start-tor-messenger +++ b/projects/tor-messenger/start-tor-messenger @@ -272,6 +272,7 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/:${HOME}/TorBrowser/Data/Browser/profile.default/extensions/ctypes-otr@tormessenger/chrome/content" export LD_LIBRARY_PATH +export SELFRANDO_write_layout_file= function setControlPortPasswd() { local ctrlPasswd=$1

1 0

[tor/master] prop224: Be more careful to not overwrite descriptors in HUP.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 409ecbec521ea4b5eef8605f71f4f7b768087486 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 25 16:13:19 2017 +0300 prop224: Be more careful to not overwrite descriptors in HUP. --- src/or/hs_service.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 12410588b..80078e203 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -964,7 +964,8 @@ service_descriptor_new(void) return sdesc; } -/* Move descriptor(s) from the src service to the dst service. */ +/* Move descriptor(s) from the src service to the dst service. We do this + * during SIGHUP when we re-create our hidden services. */ static void move_descriptors(hs_service_t *src, hs_service_t *dst) { @@ -972,10 +973,19 @@ move_descriptors(hs_service_t *src, hs_service_t *dst) tor_assert(dst); if (src->desc_current) { + /* Nothing should be there, but clean it up just in case */ + if (BUG(dst->desc_current)) { + service_descriptor_free(dst->desc_current); + } dst->desc_current = src->desc_current; src->desc_current = NULL; } + if (src->desc_next) { + /* Nothing should be there, but clean it up just in case */ + if (BUG(dst->desc_next)) { + service_descriptor_free(dst->desc_next); + } dst->desc_next = src->desc_next; src->desc_next = NULL; }

1 0

[tor/master] prop224: Don't move intro points but rather descriptors
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit a9fb97e91aa6232619d9e0b81c47e4eb3037d0f7 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jul 28 11:47:32 2017 -0400 prop224: Don't move intro points but rather descriptors Apart from the fact that a newly allocated service doesn't have descriptors thus the move condition can never be true, the service needs the descriptor signing key to cross-certify the authentication key of each intro point so we need to move the descriptors between services and not only the intro points. Fixes #23056 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 0d0db1cd6..f2e07e78c 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -709,34 +709,20 @@ close_service_circuits(hs_service_t *service) close_service_rp_circuits(service); } -/* Move introduction points from the src descriptor to the dst descriptor. The - * destination service intropoints are wiped out if any before moving. */ +/* Move descriptor(s) from the src service to the dst service. */ static void -move_descriptor_intro_points(hs_service_descriptor_t *src, - hs_service_descriptor_t *dst) +move_descriptors(hs_service_t *src, hs_service_t *dst) { tor_assert(src); tor_assert(dst); - digest256map_free(dst->intro_points.map, service_intro_point_free_); - dst->intro_points.map = src->intro_points.map; - /* Nullify the source. */ - src->intro_points.map = NULL; -} - -/* Move introduction points from the src service to the dst service. The - * destination service intropoints are wiped out if any before moving. */ -static void -move_intro_points(hs_service_t *src, hs_service_t *dst) -{ - tor_assert(src); - tor_assert(dst); - - if (src->desc_current && dst->desc_current) { - move_descriptor_intro_points(src->desc_current, dst->desc_current); + if (src->desc_current) { + dst->desc_current = src->desc_current; + src->desc_current = NULL; } - if (src->desc_next && dst->desc_next) { - move_descriptor_intro_points(src->desc_next, dst->desc_next); + if (src->desc_next) { + dst->desc_next = src->desc_next; + src->desc_next = NULL; } } @@ -812,13 +798,14 @@ register_all_services(void) * transfer the intro points to it. */ s = find_service(hs_service_map, &snew->keys.identity_pk); if (s) { - /* Pass ownership of intro points from s (the current service) to snew - * (the newly configured one). */ - move_intro_points(s, snew); + /* Pass ownership of the descriptors from s (the current service) to + * snew (the newly configured one). */ + move_descriptors(s, snew); /* Remove the service from the global map because after this, we need to * go over the remaining service in that map that aren't surviving the * reload to close their circuits. */ remove_service(hs_service_map, s); + hs_service_free(s); } /* Great, this service is now ready to be added to our new map. */ if (BUG(register_service(new_service_map, snew) < 0)) {

1 0

[tor/master] prop224: Move function move_descriptors() around.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 17fd2c8a51900bd71eaeff397ec64b6949a51730 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 25 16:06:17 2017 +0300 prop224: Move function move_descriptors() around. We want to use some static functions so move it below them. --- src/or/hs_service.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index f2e07e78c..12410588b 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -73,6 +73,7 @@ static const char address_tld[] = "onion"; static smartlist_t *hs_service_staging_list; static void set_descriptor_revision_counter(hs_descriptor_t *hs_desc); +static void move_descriptors(hs_service_t *src, hs_service_t *dst); /* Helper: Function to compare two objects in the service map. Return 1 if the * two service have the same master public identity key. */ @@ -709,23 +710,6 @@ close_service_circuits(hs_service_t *service) close_service_rp_circuits(service); } -/* Move descriptor(s) from the src service to the dst service. */ -static void -move_descriptors(hs_service_t *src, hs_service_t *dst) -{ - tor_assert(src); - tor_assert(dst); - - if (src->desc_current) { - dst->desc_current = src->desc_current; - src->desc_current = NULL; - } - if (src->desc_next) { - dst->desc_next = src->desc_next; - src->desc_next = NULL; - } -} - /* Move every ephemeral services from the src service map to the dst service * map. It is possible that a service can't be register to the dst map which * won't stop the process of moving them all but will trigger a log warn. */ @@ -980,6 +964,23 @@ service_descriptor_new(void) return sdesc; } +/* Move descriptor(s) from the src service to the dst service. */ +static void +move_descriptors(hs_service_t *src, hs_service_t *dst) +{ + tor_assert(src); + tor_assert(dst); + + if (src->desc_current) { + dst->desc_current = src->desc_current; + src->desc_current = NULL; + } + if (src->desc_next) { + dst->desc_next = src->desc_next; + src->desc_next = NULL; + } +} + /* From the given service, remove all expired failing intro points for each * descriptor. */ static void

1 0

[tor/master] prop224: Better missing hsdir index logs.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit 6d48e756855b79becf275c062b4e2fd48ccee23b Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 25 17:16:53 2017 +0300 prop224: Better missing hsdir index logs. Seems like hsdir index bugs are around to haunt us. Let's improve the log messages to make debugging easier. --- src/or/hs_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 03dd07f6c..a5ad26900 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1206,12 +1206,16 @@ node_has_hsdir_index(const node_t *node, int is_for_next_period) if (BUG(node->hsdir_index == NULL) || BUG(tor_mem_is_zero((const char*)node->hsdir_index->current, DIGEST256_LEN))) { + log_warn(LD_BUG, "Zero current index (ri: %p, rs: %p, md: %p)", + node->ri, node->rs, node->md); return 0; } if (is_for_next_period && BUG(tor_mem_is_zero((const char*)node->hsdir_index->next, DIGEST256_LEN))) { + log_warn(LD_BUG, "Zero next index (ri: %p, rs: %p, md: %p)", + node->ri, node->rs, node->md); return 0; }

1 0

[tor/master] prop224: When HUPing, move HS state from old to new service.
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit ea5af8f44202c3272c616d319cdf0fa048eec9da Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Aug 25 17:09:17 2017 +0300 prop224: When HUPing, move HS state from old to new service. We used to not copy the state which means that after HUP we would forget if we are in overlap mode or not. That caused bugs where the service would enter overlap mode twice, and rotate its descs twice, causing all sorts of bugs. --- src/or/hs_service.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 80078e203..4171a8e0a 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -750,6 +750,26 @@ service_escaped_dir(const hs_service_t *s) escaped(s->config.directory_path); } +/** Move the hidden service state from src to dst. We do this + * when we receive a SIGHUP: dst is the post-HUP service */ +static void +move_hs_state(hs_service_t *src_service, hs_service_t *dst_service) +{ + tor_assert(src_service); + tor_assert(dst_service); + + hs_service_state_t *src = &src_service->state; + hs_service_state_t *dst = &dst_service->state; + + /* Let's do a shallow copy */ + dst->intro_circ_retry_started_time = src->intro_circ_retry_started_time; + dst->num_intro_circ_launched = src->num_intro_circ_launched; + dst->in_overlap_period = src->in_overlap_period; + dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie; + + src->replay_cache_rend_cookie = NULL; /* steal pointer reference */ +} + /* Register services that are in the staging list. Once this function returns, * the global service map will be set with the right content and all non * surviving services will be cleaned up. */ @@ -785,6 +805,7 @@ register_all_services(void) /* Pass ownership of the descriptors from s (the current service) to * snew (the newly configured one). */ move_descriptors(s, snew); + move_hs_state(s, snew); /* Remove the service from the global map because after this, we need to * go over the remaining service in that map that aren't surviving the * reload to close their circuits. */

1 0

[tor/master] Merge remote-tracking branch 'asn/ticket23056_v2'
by nickm＠torproject.org 04 Sep '17

04 Sep '17

commit e72dec18a98bef8fc16486bf5bea1d313845ece4 Merge: a229d6c2f 6d48e7568 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 4 12:09:03 2017 -0400 Merge remote-tracking branch 'asn/ticket23056_v2' src/or/hs_common.c | 4 +++ src/or/hs_service.c | 87 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 57 insertions(+), 34 deletions(-) diff --cc src/or/hs_service.c index 5ff118222,4171a8e0a..4eb513629 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@@ -72,12 -72,8 +72,13 @@@ static const char address_tld[] = "onio * loading keys requires that we are an actual running tor process. */ static smartlist_t *hs_service_staging_list; +/** True if the list of available router descriptors might have changed which + * might result in an altered hash ring. Check if the hash ring changed and + * reupload if needed */ +static int consider_republishing_hs_descriptors = 0; + static void set_descriptor_revision_counter(hs_descriptor_t *hs_desc); + static void move_descriptors(hs_service_t *src, hs_service_t *dst); /* Helper: Function to compare two objects in the service map. Return 1 if the * two service have the same master public identity key. */

1 0