nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

prop224: Add helper function to lookup HS objects

Browse Source 
Add this helper function that can lookup and return all the needed object from
a circuit identifier. It is a pattern we do often so make it nicer and avoid
duplicating it everywhere.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2017-03-08 12:08:03 -05:00 committed by Nick Mathewson
parent 79e8d113d5
commit faadbafba3
1 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/or/hs_service.c
View File

@ -407,6 +407,39 @@ service_desc_find_by_intro(const hs_service_t *service,
return descp;
}
/* From a circuit identifier, get all the possible objects associated with the
* ident. If not NULL, service, ip or desc are set if the object can be found.
* They are untouched if they can't be found.
*
* This is an helper function because we do those lookups often so it's more
* convenient to simply call this functions to get all the things at once. */
static void
get_objects_from_ident(const hs_ident_circuit_t *ident,
hs_service_t **service, hs_service_intro_point_t **ip,
hs_service_descriptor_t **desc)
{
hs_service_t *s;
tor_assert(ident);
/* Get service object from the circuit identifier. */
s = find_service(hs_service_map, &ident->identity_pk);
if (s && service) {
*service = s;
}
/* From the service object, get the intro point object of that circuit. The
* following will query both descriptors intro points list. */
if (s && ip) {
*ip = service_intro_point_find(s, &ident->intro_auth_pk);
}
/* Get the descriptor for this introduction point and service. */
if (s && ip && *ip && desc) {
*desc = service_desc_find_by_intro(s, *ip);
}
}
/* From a given intro point, return the first link specifier of type
* encountered in the link specifier list. Return NULL if it can't be found.
*
@ -1703,9 +1736,8 @@ run_upload_descriptor_event(time_t now)
static void
service_intro_circ_has_opened(origin_circuit_t *circ)
{
int close_reason;
hs_service_t *service;
hs_service_intro_point_t *ip;
hs_service_t *service = NULL;
hs_service_intro_point_t *ip = NULL;
hs_service_descriptor_t *desc = NULL;
tor_assert(circ);
@ -1714,25 +1746,24 @@ service_intro_circ_has_opened(origin_circuit_t *circ)
tor_assert(circ->hs_ident);
tor_assert(TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO);
/* Get service object from the circuit identifier. */
service = find_service(hs_service_map, &circ->hs_ident->identity_pk);
/* Get the corresponding service and intro point. */
get_objects_from_ident(circ->hs_ident, &service, &ip, &desc);
if (service == NULL) {
log_warn(LD_REND, "Unknown service identity key %s on the introduction "
"circuit %u. Can't find onion service.",
safe_str_client(ed25519_fmt(&circ->hs_ident->identity_pk)),
TO_CIRCUIT(circ)->n_circ_id);
close_reason = END_CIRC_REASON_NOSUCHSERVICE;
goto err;
}
ip = service_intro_point_find(service, &circ->hs_ident->intro_auth_pk);
if (ip == NULL) {
/* Closing this circuit because we don't recognize the key. */
close_reason = END_CIRC_REASON_NOSUCHSERVICE;
log_warn(LD_REND, "Unknown introduction point auth key on circuit %u "
"for service %s",
TO_CIRCUIT(circ)->n_circ_id,
safe_str_client(service->onion_address));
goto err;
}
/* We can't have an IP object without a descriptor. */
desc = service_desc_find_by_intro(service, ip);
tor_assert(desc);
if (hs_circ_service_intro_has_opened(service, ip, desc, circ)) {
@ -1746,7 +1777,7 @@ service_intro_circ_has_opened(origin_circuit_t *circ)
err:
/* Close circuit, we can't use it. */
circuit_mark_for_close(TO_CIRCUIT(circ), close_reason);
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_NOSUCHSERVICE);
done:
return;
}
@ -1772,8 +1803,10 @@ service_handle_intro_established(origin_circuit_t *circ,
tor_assert(payload);
tor_assert(TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO);
/* We need the service and intro point for this cell. */
get_objects_from_ident(circ->hs_ident, &service, &ip, NULL);
/* Get service object from the circuit identifier. */
service = find_service(hs_service_map, &circ->hs_ident->identity_pk);
if (service == NULL) {
log_warn(LD_REND, "Unknown service identity key %s on the introduction "
"circuit %u. Can't find onion service.",
@ -1781,10 +1814,6 @@ service_handle_intro_established(origin_circuit_t *circ,
TO_CIRCUIT(circ)->n_circ_id);
goto err;
}
/* From the service object, get the intro point object of that circuit. The
* following will query both descriptors intro points list. */
ip = service_intro_point_find(service, &circ->hs_ident->intro_auth_pk);
if (ip == NULL) {
/* We don't recognize the key. */
log_warn(LD_REND, "Introduction circuit established without an intro "