nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jryans/service_is_ephemeral'

Browse Source
This commit is contained in:
Nick Mathewson 2016-12-05 08:57:00 -05:00
commit 5923418eff
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/20853 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfix (hidden services):
- Change ephemeral service checks in `rendservice.c` to use the new
`rend_service_is_ephemeral` helper function. Fixes bug 20853; bugfix on
bug 20526; not in any released version of Tor.

44
src/or/rendservice.c
View File

@ -824,7 +824,7 @@ rend_config_services(const or_options_t *options, int validate_only)
* will NOT have their intro point closed.
*/
SMARTLIST_FOREACH(old_service_list, rend_service_t *, old, {
if (!old->directory) {
if (rend_service_is_ephemeral(old)) {
SMARTLIST_DEL_CURRENT(old_service_list, old);
smartlist_add(surviving_services, old);
smartlist_add(rend_service_list, old);
@ -836,15 +836,20 @@ rend_config_services(const or_options_t *options, int validate_only)
* probably ok? */
SMARTLIST_FOREACH_BEGIN(rend_service_list, rend_service_t *, new) {
SMARTLIST_FOREACH_BEGIN(old_service_list, rend_service_t *, old) {
if (new->directory && old->directory &&
!strcmp(old->directory, new->directory)) {
smartlist_add_all(new->intro_nodes, old->intro_nodes);
smartlist_clear(old->intro_nodes);
smartlist_add_all(new->expiring_nodes, old->expiring_nodes);
smartlist_clear(old->expiring_nodes);
smartlist_add(surviving_services, old);
break;
if (BUG(rend_service_is_ephemeral(new)) ||
BUG(rend_service_is_ephemeral(old))) {
continue;
}
if (BUG(!new->directory) || BUG(!old->directory) ||
strcmp(old->directory, new->directory)) {
continue;
}
smartlist_add_all(new->intro_nodes, old->intro_nodes);
smartlist_clear(old->intro_nodes);
smartlist_add_all(new->expiring_nodes, old->expiring_nodes);
smartlist_clear(old->expiring_nodes);
smartlist_add(surviving_services, old);
break;
} SMARTLIST_FOREACH_END(old);
} SMARTLIST_FOREACH_END(new);
@ -1163,8 +1168,13 @@ rend_service_verify_single_onion_poison(const rend_service_t* s,
}
/* Ephemeral services are checked at ADD_ONION time */
if (!s->directory) {
return 0;
if (BUG(rend_service_is_ephemeral(s))) {
return -1;
}
/* Service is expected to have a directory */
if (BUG(!s->directory)) {
return -1;
}
/* Services without keys are always ok - their keys will only ever be used
@ -1257,7 +1267,7 @@ poison_new_single_onion_hidden_service_dir_impl(const rend_service_t *service,
return retval;
}
/** We just got launched in Single Onion Mode. That's a non-anoymous mode for
/** We just got launched in Single Onion Mode. That's a non-anonymous mode for
* hidden services. If s is new, we should mark its hidden service
* directory appropriately so that it is never launched as a location-private
* hidden service. (New directories don't have private key files.)
@ -1274,6 +1284,16 @@ rend_service_poison_new_single_onion_dir(const rend_service_t *s,
/* We must only poison directories if we're in Single Onion mode */
tor_assert(rend_service_non_anonymous_mode_enabled(options));
/* Ephemeral services aren't allowed in non-anonymous mode */
if (BUG(rend_service_is_ephemeral(s))) {
return -1;
}
/* Service is expected to have a directory */
if (BUG(!s->directory)) {
return -1;
}
if (!rend_service_private_key_exists(s)) {
if (poison_new_single_onion_hidden_service_dir_impl(s, options)
< 0) {