nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

control: Implement GETINFO hs/service/desc/id/<ADDR> for HSv3

Browse Source 
Part of #20699

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2017-11-07 16:02:00 -05:00
parent 0a3b295448
commit 660de600a0
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/or/control.c
View File

@ -2057,20 +2057,47 @@ getinfo_helper_dir(control_connection_t *control_conn,
} }
} }
} else if (!strcmpstart(question, "hs/service/desc/id/")) { } else if (!strcmpstart(question, "hs/service/desc/id/")) {
rend_cache_entry_t *e = NULL; hostname_type_t addr_type;
question += strlen("hs/service/desc/id/"); question += strlen("hs/service/desc/id/");
if (strlen(question) != REND_SERVICE_ID_LEN_BASE32) { if (rend_valid_v2_service_id(question)) {
addr_type = ONION_V2_HOSTNAME;
} else if (hs_address_is_valid(question)) {
addr_type = ONION_V3_HOSTNAME;
} else {
*errmsg = "Invalid address"; *errmsg = "Invalid address";
return -1; return -1;
} }
rend_cache_entry_t *e = NULL;
if (!rend_cache_lookup_v2_desc_as_service(question, &e)) { if (addr_type == ONION_V2_HOSTNAME) {
/* Descriptor found in cache */ if (!rend_cache_lookup_v2_desc_as_service(question, &e)) {
*answer = tor_strdup(e->desc); /* Descriptor found in cache */
*answer = tor_strdup(e->desc);
} else {
*errmsg = "Not found in cache";
return -1;
}
} else { } else {
*errmsg = "Not found in cache"; ed25519_public_key_t service_pk;
return -1; char *desc;
/* The check before this if/else makes sure of this. */
tor_assert(addr_type == ONION_V3_HOSTNAME);
if (hs_parse_address(question, &service_pk, NULL, NULL) < 0) {
*errmsg = "Invalid v3 address";
return -1;
}
desc = hs_service_lookup_current_desc(&service_pk);
if (desc) {
/* Newly allocated string, we have ownership. */
*answer = desc;
} else {
*errmsg = "Not found in cache";
return -1;
}
} }
} else if (!strcmpstart(question, "md/id/")) { } else if (!strcmpstart(question, "md/id/")) {
const node_t *node = node_get_by_hex_id(question+strlen("md/id/"), 0); const node_t *node = node_get_by_hex_id(question+strlen("md/id/"), 0);