sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hs-v2: Copy needed information between service on prunning 

Turns out that when reloading a tor configured with hidden service(s), we
weren't copying all the needed information between the old service object to
the new one.

For instance, the desc_is_dirty timestamp wasn't which could lead to the
service uploading its desriptor much later than it would need to.

The replaycache wasn't also moved over and some intro point information as
well.

Fixes #23790

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2017-10-25 11:21:28 -04:00
parent 274de0e2bc
commit 9592797cf3
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug23790 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (hidden service v2):
- When reloading tor (HUP) configured with hidden service(s), some
information weren't copy to the new service object. One problem with
this was that tor would wait at least the RendPostPeriod time before
uploading the descriptor if the reload happened before the descriptor
needed to be published. Fixes bug 23790; bugfix on 0.2.1.9-alpha.

28
src/or/rendservice.c
View File

@ -475,6 +475,30 @@ rend_service_port_config_free(rend_service_port_config_t *p)
tor_free(p);
}
/* Copy relevant data from service src to dst while pruning the service lists.
* This should only be called during the pruning process which takes existing
* services and copy their data to the newly configured services. The src
* service replaycache will be set to NULL after this call. */
static void
copy_service_on_prunning(rend_service_t *dst, rend_service_t *src)
{
tor_assert(dst);
tor_assert(src);
/* Keep the timestamps for when the content changed and the next upload
* time so we can properly upload the descriptor if needed for the new
* service object. */
dst->desc_is_dirty = src->desc_is_dirty;
dst->next_upload_time = src->next_upload_time;
/* Move the replaycache to the new object. */
dst->accepted_intro_dh_parts = src->accepted_intro_dh_parts;
src->accepted_intro_dh_parts = NULL;
/* Copy intro point information to destination service. */
dst->intro_period_started = src->intro_period_started;
dst->n_intro_circuits_launched = src->n_intro_circuits_launched;
dst->n_intro_points_wanted = src->n_intro_points_wanted;
}
/* Helper: Actual implementation of the pruning on reload which we've
* decoupled in order to make the unit test workeable without ugly hacks.
* Furthermore, this function does NOT free any memory but will nullify the
@ -548,6 +572,10 @@ rend_service_prune_list_impl_(void)
smartlist_clear(old->intro_nodes);
smartlist_add_all(new->expiring_nodes, old->expiring_nodes);
smartlist_clear(old->expiring_nodes);
/* Copy needed information from old to new. */
copy_service_on_prunning(new, old);
/* This regular service will survive the closing IPs step after. */
smartlist_add(surviving_services, old);
break;