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

[tor/master] hs-v3: Implement HS_DESC CREATED event
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit b71a9b60cc0c29899637acc0610cb87c56869c1e Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 14:34:41 2017 -0500 hs-v3: Implement HS_DESC CREATED event This makes the REPLICA= field optional for the control port event. A v2 service will always pass it and v3 is ignored. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 16 ++++++++++++---- src/or/hs_control.c | 23 +++++++++++++++++++++++ src/or/hs_control.h | 4 ++++ src/or/hs_service.c | 4 ++++ 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index a1515da05..15edc1f24 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7252,21 +7252,29 @@ get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp) * * onion_address is service address. * desc_id is the descriptor ID. - * replica is the the descriptor replica number. + * replica is the the descriptor replica number. If it is negative, it + * is ignored. */ void control_event_hs_descriptor_created(const char *onion_address, const char *desc_id, int replica) { + char *replica_field = NULL; + if (BUG(!onion_address || !desc_id)) { return; } + if (replica >= 0) { + tor_asprintf(&replica_field, " REPLICA=%d", replica); + } + send_control_event(EVENT_HS_DESC, - "650 HS_DESC CREATED %s UNKNOWN UNKNOWN %s " - "REPLICA=%d\r\n", - onion_address, desc_id, replica); + "650 HS_DESC CREATED %s UNKNOWN UNKNOWN %s%s\r\n", + onion_address, desc_id, + replica_field ? replica_field : ""); + tor_free(replica_field); } /** send HS_DESC upload event. diff --git a/src/or/hs_control.c b/src/or/hs_control.c index add62d583..ea010605b 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -102,3 +102,26 @@ hs_control_desc_event_received(const hs_ident_dir_conn_t *ident, hsdir_id_digest); } +/* Send on the control port the "HS_DESC CREATED [...]" event. + * + * Using the onion address of the descriptor's service and the blinded public + * key of the descriptor as a descriptor ID. None can be NULL. */ +void +hs_control_desc_event_created(const char *onion_address, + const ed25519_public_key_t *blinded_pk) +{ + char base64_blinded_pk[ED25519_BASE64_LEN + 1]; + + tor_assert(onion_address); + tor_assert(blinded_pk); + + /* Build base64 encoded blinded key. */ + IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, blinded_pk) < 0) { + return; + } + + /* Version 3 doesn't use the replica number in its descriptor ID computation + * so we pass negative value so the control port subsystem can ignore it. */ + control_event_hs_descriptor_created(onion_address, base64_blinded_pk, -1); +} + diff --git a/src/or/hs_control.h b/src/or/hs_control.h index 33a96cec0..3b117f19c 100644 --- a/src/or/hs_control.h +++ b/src/or/hs_control.h @@ -25,5 +25,9 @@ void hs_control_desc_event_failed(const hs_ident_dir_conn_t *ident, void hs_control_desc_event_received(const hs_ident_dir_conn_t *ident, const char *hsdir_id_digest); +/* Event "HS_DESC CREATED [...]" */ +void hs_control_desc_event_created(const char *onion_address, + const ed25519_public_key_t *blinded_pk); + #endif /* !defined(TOR_HS_CONTROL_H) */ diff --git a/src/or/hs_service.c b/src/or/hs_service.c index a659a126f..65df5b269 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -30,6 +30,7 @@ #include "hs_circuit.h" #include "hs_common.h" #include "hs_config.h" +#include "hs_control.h" #include "hs_circuit.h" #include "hs_descriptor.h" #include "hs_ident.h" @@ -1431,6 +1432,9 @@ build_service_descriptor(hs_service_t *service, time_t now, /* Assign newly built descriptor to the next slot. */ *desc_out = desc; + /* Fire a CREATED control port event. */ + hs_control_desc_event_created(service->onion_address, + &desc->blinded_kp.pubkey); return; err:

1 0

[tor/master] hs-v3: Implement HS_DESC UPLOADED event
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 427b247c8d67baf2382755a3855f8ea380068107 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 15:00:18 2017 -0500 hs-v3: Implement HS_DESC UPLOADED event Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/directory.c | 2 +- src/or/hs_control.c | 18 ++++++++++++++++++ src/or/hs_control.h | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index a1d9c8c08..cbd7af075 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3306,7 +3306,7 @@ handle_response_upload_hsdesc(dir_connection_t *conn, case 200: log_info(LD_REND, "Uploading hidden service descriptor: " "finished with status 200 (%s)", escaped(reason)); - /* XXX: Trigger control event. */ + hs_control_desc_event_uploaded(conn->hs_ident, conn->identity_digest); break; case 400: log_fn(LOG_PROTOCOL_WARN, LD_REND, diff --git a/src/or/hs_control.c b/src/or/hs_control.c index 09dbbeba4..fce6466ef 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -154,3 +154,21 @@ hs_control_desc_event_upload(const char *onion_address, DIGEST256_LEN)); } +/* Send on the control port the "HS_DESC UPLOADED [...]" event. + * + * Using the directory connection identifier and the HSDir identity digest. + * None can be NULL. */ +void +hs_control_desc_event_uploaded(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest) +{ + char onion_address[HS_SERVICE_ADDR_LEN_BASE32 + 1]; + + tor_assert(ident); + tor_assert(hsdir_id_digest); + + hs_build_address(&ident->identity_pk, HS_VERSION_THREE, onion_address); + + control_event_hs_descriptor_uploaded(hsdir_id_digest, onion_address); +} + diff --git a/src/or/hs_control.h b/src/or/hs_control.h index e10a300d7..de23dc73d 100644 --- a/src/or/hs_control.h +++ b/src/or/hs_control.h @@ -35,5 +35,9 @@ void hs_control_desc_event_upload(const char *onion_address, const ed25519_public_key_t *blinded_pk, const uint8_t *hsdir_index); +/* Event "HS_DESC UPLOADED [...]" */ +void hs_control_desc_event_uploaded(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest); + #endif /* !defined(TOR_HS_CONTROL_H) */

1 0

[tor/master] hs-v3: Downgrade warning log when an intro circuit has closed
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 4633a93ca841c36e9c36ae31bc6745c47f85767e Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Nov 9 14:30:20 2017 -0500 hs-v3: Downgrade warning log when an intro circuit has closed When an intro circuit has closed, do not warn anymore when we can't find the service. It is possible to hit that condition if the service is removed before the circuits were fully closed. This happens in the case of deleting an ephemeral service. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 944400a0e..a659a126f 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -3079,7 +3079,9 @@ hs_service_intro_circ_has_closed(origin_circuit_t *circ) get_objects_from_ident(circ->hs_ident, &service, &ip, &desc); if (service == NULL) { - log_warn(LD_REND, "Unable to find any hidden service associated " + /* This is possible if the circuits are closed and the service is + * immediately deleted. */ + log_info(LD_REND, "Unable to find any hidden service associated " "identity key %s on intro circuit %u.", ed25519_fmt(&circ->hs_ident->identity_pk), TO_CIRCUIT(circ)->n_circ_id);

1 0

[tor/master] control: Refactor HS_DESC events functions to not be v2 specific
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 242ddc85c874cafdc3513725f9357028b72eb9f8 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 09:08:05 2017 -0500 control: Refactor HS_DESC events functions to not be v2 specific This is a naming refactor mostly _except_ for a the events' function that take a rend_data_t which will require much more refactoring. No behavior change at this commit, cleanup and renaming stuff to not be only v2 specific. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 63 +++++++++++++++++++---------------------------------- src/or/control.h | 15 +++++++------ src/or/rendclient.c | 3 ++- src/test/test_hs.c | 3 ++- 4 files changed, 35 insertions(+), 49 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index d9102894e..9a8d1f302 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7177,25 +7177,21 @@ rend_hsaddress_str_or_unknown(const char *onion_address) * desc_id_base32 is the ID of requested hs descriptor. */ void -control_event_hs_descriptor_requested(const rend_data_t *rend_query, +control_event_hs_descriptor_requested(const char *onion_address, + rend_auth_type_t auth_type, const char *id_digest, - const char *desc_id_base32) + const char *desc_id) { - if (!id_digest || !rend_query || !desc_id_base32) { - log_warn(LD_BUG, "Called with rend_query==%p, " - "id_digest==%p, desc_id_base32==%p", - rend_query, id_digest, desc_id_base32); + if (BUG(!id_digest || !desc_id)) { return; } send_control_event(EVENT_HS_DESC, "650 HS_DESC REQUESTED %s %s %s %s\r\n", - rend_hsaddress_str_or_unknown( - rend_data_get_address(rend_query)), - rend_auth_type_to_string( - TO_REND_DATA_V2(rend_query)->auth_type), + rend_hsaddress_str_or_unknown(onion_address), + rend_auth_type_to_string(auth_type), node_describe_longname_by_id(id_digest), - desc_id_base32); + desc_id); } /** For an HS descriptor query rend_data, using the @@ -7244,52 +7240,45 @@ get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp) /** send HS_DESC CREATED event when a local service generates a descriptor. * - * service_id is the descriptor onion address. - * desc_id_base32 is the descriptor ID. + * onion_address is service address. + * desc_id is the descriptor ID. * replica is the the descriptor replica number. */ void -control_event_hs_descriptor_created(const char *service_id, - const char *desc_id_base32, +control_event_hs_descriptor_created(const char *onion_address, + const char *desc_id, int replica) { - if (!service_id || !desc_id_base32) { - log_warn(LD_BUG, "Called with service_digest==%p, " - "desc_id_base32==%p", service_id, desc_id_base32); + if (BUG(!onion_address || !desc_id)) { return; } send_control_event(EVENT_HS_DESC, "650 HS_DESC CREATED %s UNKNOWN UNKNOWN %s " "REPLICA=%d\r\n", - service_id, - desc_id_base32, - replica); + onion_address, desc_id, replica); } /** send HS_DESC upload event. * - * service_id is the descriptor onion address. + * onion_address is service address. * hs_dir is the description of contacting hs directory. - * desc_id_base32 is the ID of requested hs descriptor. + * desc_id is the ID of requested hs descriptor. */ void -control_event_hs_descriptor_upload(const char *service_id, +control_event_hs_descriptor_upload(const char *onion_address, const char *id_digest, - const char *desc_id_base32) + const char *desc_id) { - if (!service_id || !id_digest || !desc_id_base32) { - log_warn(LD_BUG, "Called with service_digest==%p, " - "desc_id_base32==%p, id_digest==%p", service_id, - desc_id_base32, id_digest); + if (BUG(!onion_address || !id_digest || !desc_id)) { return; } send_control_event(EVENT_HS_DESC, "650 HS_DESC UPLOAD %s UNKNOWN %s %s\r\n", - service_id, + onion_address, node_describe_longname_by_id(id_digest), - desc_id_base32); + desc_id); } /** send HS_DESC event after got response from hs directory. @@ -7362,9 +7351,7 @@ control_event_hs_descriptor_upload_end(const char *action, { char *reason_field = NULL; - if (!action || !id_digest) { - log_warn(LD_BUG, "Called with action==%p, id_digest==%p", action, - id_digest); + if (BUG(!action || !id_digest)) { return; } @@ -7408,9 +7395,7 @@ void control_event_hs_descriptor_uploaded(const char *id_digest, const char *onion_address) { - if (!id_digest) { - log_warn(LD_BUG, "Called with id_digest==%p", - id_digest); + if (BUG(!id_digest)) { return; } @@ -7484,9 +7469,7 @@ control_event_hs_descriptor_upload_failed(const char *id_digest, const char *onion_address, const char *reason) { - if (!id_digest) { - log_warn(LD_BUG, "Called with id_digest==%p", - id_digest); + if (BUG(!id_digest)) { return; } control_event_hs_descriptor_upload_end("FAILED", onion_address, diff --git a/src/or/control.h b/src/or/control.h index 74601b978..45fc4a9bc 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -115,14 +115,15 @@ void control_event_transport_launched(const char *mode, tor_addr_t *addr, uint16_t port); const char *rend_auth_type_to_string(rend_auth_type_t auth_type); MOCK_DECL(const char *, node_describe_longname_by_id,(const char *id_digest)); -void control_event_hs_descriptor_requested(const rend_data_t *rend_query, - const char *desc_id_base32, - const char *hs_dir); -void control_event_hs_descriptor_created(const char *service_id, - const char *desc_id_base32, +void control_event_hs_descriptor_requested(const char *onion_address, + rend_auth_type_t auth_type, + const char *id_digest, + const char *desc_id); +void control_event_hs_descriptor_created(const char *onion_address, + const char *desc_id, int replica); -void control_event_hs_descriptor_upload(const char *service_id, - const char *desc_id_base32, +void control_event_hs_descriptor_upload(const char *onion_address, + const char *desc_id, const char *hs_dir); void control_event_hs_descriptor_receive_end(const char *action, const char *onion_address, diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 327481924..32a285457 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -515,7 +515,8 @@ directory_get_from_hs_dir(const char *desc_id, (rend_data->auth_type == REND_NO_AUTH ? "[none]" : escaped_safe_str_client(descriptor_cookie_base64)), routerstatus_describe(hs_dir)); - control_event_hs_descriptor_requested(rend_query, + control_event_hs_descriptor_requested(rend_data->onion_address, + rend_data->auth_type, hs_dir->identity_digest, desc_id_base32); return 1; diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 7737499f5..7f9eab911 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -258,7 +258,8 @@ test_hs_desc_event(void *arg) sizeof(desc_id_base32)); /* test request event */ - control_event_hs_descriptor_requested(&rend_query.base_, HSDIR_EXIST_ID, + control_event_hs_descriptor_requested(rend_query.onion_address, + rend_query.auth_type, HSDIR_EXIST_ID, STR_DESC_ID_BASE32); expected_msg = "650 HS_DESC REQUESTED "STR_HS_ADDR" NO_AUTH "\ STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32 "\r\n";

1 0

[tor/master] hs-v3: Add an handler for the HSPOST command
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 683fccba8fb4543867435bd83851da821cd7f10e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 15 14:34:53 2017 -0500 hs-v3: Add an handler for the HSPOST command It is not used yet at this commit. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_control.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_control.h | 4 ++++ 2 files changed, 59 insertions(+) diff --git a/src/or/hs_control.c b/src/or/hs_control.c index 9a05d936b..1b1fe7857 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -10,6 +10,8 @@ #include "control.h" #include "hs_common.h" #include "hs_control.h" +#include "hs_descriptor.h" +#include "hs_service.h" #include "nodelist.h" /* Send on the control port the "HS_DESC REQUESTED [...]" event. @@ -199,3 +201,56 @@ hs_control_desc_event_content(const hs_ident_dir_conn_t *ident, hsdir_id_digest, body); } +/* Handle the "HSPOST [...]" command. The body is an encoded descriptor for + * the given onion_address. The descriptor will be uploaded to each directory + * in hsdirs_rs. If NULL, the responsible directories for the current time + * period will be selected. + * + * Return -1 on if the descriptor plaintext section is not decodable. Else, 0 + * on success. */ +int +hs_control_hspost_command(const char *body, const char *onion_address, + const smartlist_t *hsdirs_rs) +{ + int ret = -1; + ed25519_public_key_t identity_pk; + hs_desc_plaintext_data_t plaintext; + smartlist_t *hsdirs = NULL; + + tor_assert(body); + tor_assert(onion_address); + + /* This can't fail because we require the caller to pass us a valid onion + * address that has passed hs_address_is_valid(). */ + hs_parse_address(onion_address, &identity_pk, NULL, NULL); + + /* Only decode the plaintext part which is what the directory will do to + * validate before caching. */ + if (hs_desc_decode_plaintext(body, &plaintext) < 0) { + goto done; + } + + /* No HSDir(s) given, we'll compute what the current ones should be. */ + if (hsdirs_rs == NULL) { + hsdirs = smartlist_new(); + hs_get_responsible_hsdirs(&plaintext.blinded_pubkey, + hs_get_time_period_num(0), + 0, /* Always the current descriptor which uses + * the first hsdir index. */ + 0, /* It is for storing on a directory. */ + hsdirs); + hsdirs_rs = hsdirs; + } + + SMARTLIST_FOREACH_BEGIN(hsdirs_rs, const routerstatus_t *, rs) { + hs_service_upload_desc_to_dir(body, plaintext.version, &identity_pk, + &plaintext.blinded_pubkey, rs); + } SMARTLIST_FOREACH_END(rs); + ret = 0; + + done: + /* We don't have ownership of the objects in this list. */ + smartlist_free(hsdirs); + return ret; +} + diff --git a/src/or/hs_control.h b/src/or/hs_control.h index 35062d4b8..95c46e655 100644 --- a/src/or/hs_control.h +++ b/src/or/hs_control.h @@ -44,5 +44,9 @@ void hs_control_desc_event_content(const hs_ident_dir_conn_t *ident, const char *hsdir_id_digest, const char *body); +/* Command "HSPOST [...]" */ +int hs_control_hspost_command(const char *body, const char *onion_address, + const smartlist_t *hsdirs_rs); + #endif /* !defined(TOR_HS_CONTROL_H) */

1 0

[tor/master] hs-v3: Implement HS_DESC FAILED event
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 8365de1da3de53fc02d463d78187625d16a5180b Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 14:01:33 2017 -0500 hs-v3: Implement HS_DESC FAILED event A new v3 specific function has been added named control_event_hsv3_descriptor_failed(). The HS v3 subsystem now uses it. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 27 +++++++++++++++++++++++++++ src/or/control.h | 5 +++++ src/or/directory.c | 14 +++++++++++++- src/or/hs_control.c | 27 +++++++++++++++++++++++++++ src/or/hs_control.h | 7 +++++++ 5 files changed, 79 insertions(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c index cd1be5bf4..3ba3a4b3a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7296,6 +7296,7 @@ control_event_hs_descriptor_upload(const char *onion_address, * NOTE: this is an internal function used by following functions: * control_event_hsv2_descriptor_received * control_event_hsv2_descriptor_failed + * control_event_hsv3_descriptor_failed * * So do not call this function directly. */ @@ -7447,6 +7448,32 @@ control_event_hsv2_descriptor_failed(const rend_data_t *rend_data, tor_free(desc_id_field); } +/** Send HS_DESC event to inform controller that the query to + * onion_address failed to retrieve hidden service descriptor + * desc_id from directory identified by hsdir_id_digest. If + * NULL, "UNKNOWN" is used. If reason is not NULL, add it to REASON= + * field. */ +void +control_event_hsv3_descriptor_failed(const char *onion_address, + const char *desc_id, + const char *hsdir_id_digest, + const char *reason) +{ + char *desc_id_field = NULL; + + if (BUG(!onion_address || !desc_id || !reason)) { + return; + } + + /* Because DescriptorID is an optional positional value, we need to add a + * whitespace before in order to not be next to the HsDir value. */ + tor_asprintf(&desc_id_field, " %s", desc_id); + + event_hs_descriptor_receive_end("FAILED", onion_address, desc_id_field, + REND_NO_AUTH, hsdir_id_digest, reason); + tor_free(desc_id_field); +} + /** Send HS_DESC_CONTENT event after completion of a successful fetch from hs * directory. If hsdir_id_digest is NULL, it is replaced by "UNKNOWN". * If content is NULL, it is replaced by an empty string. The diff --git a/src/or/control.h b/src/or/control.h index 5a7a87c06..4c9adb681 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -139,6 +139,11 @@ void control_event_hsv2_descriptor_failed(const rend_data_t *rend_data, void control_event_hsv2_descriptor_received(const char *onion_address, const rend_data_t *rend_data, const char *id_digest); +/* Hidden service v3 HS_DESC specific. */ +void control_event_hsv3_descriptor_failed(const char *onion_address, + const char *desc_id, + const char *hsdir_id_digest, + const char *reason); void control_event_hs_descriptor_upload_failed(const char *hs_dir, const char *onion_address, const char *reason); diff --git a/src/or/directory.c b/src/or/directory.c index 884ec2555..1b6f7500b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -25,6 +25,7 @@ #include "geoip.h" #include "hs_cache.h" #include "hs_common.h" +#include "hs_control.h" #include "hs_client.h" #include "main.h" #include "microdesc.h" @@ -3090,6 +3091,9 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, /* We got something: Try storing it in the cache. */ if (hs_cache_store_as_client(body, &conn->hs_ident->identity_pk) < 0) { log_warn(LD_REND, "Failed to store hidden service descriptor"); + /* Fire control port FAILED event. */ + hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, + "BAD_DESC"); } else { log_info(LD_REND, "Stored hidden service descriptor successfully."); TO_CONN(conn)->purpose = DIR_PURPOSE_HAS_FETCHED_HSDESC; @@ -3101,13 +3105,18 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, * tries to clean this conn up. */ log_info(LD_REND, "Fetching hidden service v3 descriptor not found: " "Retrying at another directory."); - /* TODO: Inform the control port */ + /* Fire control port FAILED event. */ + hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, + "NOT_FOUND"); break; case 400: log_warn(LD_REND, "Fetching v3 hidden service descriptor failed: " "http status 400 (%s). Dirserver didn't like our " "query? Retrying at another directory.", escaped(reason)); + /* Fire control port FAILED event. */ + hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, + "QUERY_REJECTED"); break; default: log_warn(LD_REND, "Fetching v3 hidden service descriptor failed: " @@ -3115,6 +3124,9 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, "'%s:%d'. Retrying at another directory.", status_code, escaped(reason), TO_CONN(conn)->address, TO_CONN(conn)->port); + /* Fire control port FAILED event. */ + hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, + "UNEXPECTED"); break; } diff --git a/src/or/hs_control.c b/src/or/hs_control.c index 0bcb41dcc..ed77c8e1d 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -50,3 +50,30 @@ hs_control_desc_event_requested(const ed25519_public_key_t *onion_pk, memwipe(onion_address, 0, sizeof(onion_address)); } +/* Send on the control port the "HS_DESC FAILED [...]" event. + * + * Using a directory connection identifier, the HSDir identity digest and a + * reason for the failure. None can be NULL. */ +void +hs_control_desc_event_failed(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest, + const char *reason) +{ + char onion_address[HS_SERVICE_ADDR_LEN_BASE32 + 1]; + char base64_blinded_pk[ED25519_BASE64_LEN + 1]; + + tor_assert(ident); + tor_assert(hsdir_id_digest); + tor_assert(reason); + + /* Build onion address and encoded blinded key. */ + IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, + &ident->blinded_pk) < 0) { + return; + } + hs_build_address(&ident->identity_pk, HS_VERSION_THREE, onion_address); + + control_event_hsv3_descriptor_failed(onion_address, base64_blinded_pk, + hsdir_id_digest, reason); +} + diff --git a/src/or/hs_control.h b/src/or/hs_control.h index 2878ba5bc..fb8f3859f 100644 --- a/src/or/hs_control.h +++ b/src/or/hs_control.h @@ -9,10 +9,17 @@ #ifndef TOR_HS_CONTROL_H #define TOR_HS_CONTROL_H +#include "hs_ident.h" + /* Event "HS_DESC REQUESTED [...]" */ void hs_control_desc_event_requested(const ed25519_public_key_t *onion_pk, const char *base64_blinded_pk, const routerstatus_t *hsdir_rs); +/* Event "HS_DESC FAILED [...]" */ +void hs_control_desc_event_failed(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest, + const char *reason); + #endif /* !defined(TOR_HS_CONTROL_H) */

1 0

[tor/master] control: Rename two HS v2 specific functions
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit e7d606900e635719ed0cb5b76343a69ef4a1e43b Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 11:25:16 2017 -0500 control: Rename two HS v2 specific functions Make control_event_hs_descriptor_received() and control_event_hs_descriptor_failed() v2 specific because they take a rend_data_t object and v3 will need to pass a different object. No behavior change. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 16 ++++++++-------- src/or/control.h | 13 +++++++------ src/or/directory.c | 12 ++++++------ src/or/rendclient.c | 5 +++-- src/test/test_hs.c | 10 +++++----- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 99acbcdcb..e7ec23817 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7284,8 +7284,8 @@ control_event_hs_descriptor_upload(const char *onion_address, /** send HS_DESC event after got response from hs directory. * * NOTE: this is an internal function used by following functions: - * control_event_hs_descriptor_received - * control_event_hs_descriptor_failed + * control_event_hsv2_descriptor_received + * control_event_hsv2_descriptor_failed * * So do not call this function directly. */ @@ -7360,9 +7360,9 @@ control_event_hs_descriptor_upload_end(const char *action, * called when we successfully received a hidden service descriptor. */ void -control_event_hs_descriptor_received(const char *onion_address, - const rend_data_t *rend_data, - const char *hsdir_id_digest) +control_event_hsv2_descriptor_received(const char *onion_address, + const rend_data_t *rend_data, + const char *hsdir_id_digest) { char *desc_id_field = NULL; const char *desc_id; @@ -7409,9 +7409,9 @@ control_event_hs_descriptor_uploaded(const char *id_digest, * add it to REASON= field. */ void -control_event_hs_descriptor_failed(const rend_data_t *rend_data, - const char *hsdir_id_digest, - const char *reason) +control_event_hsv2_descriptor_failed(const rend_data_t *rend_data, + const char *hsdir_id_digest, + const char *reason) { char *desc_id_field = NULL; const char *desc_id; diff --git a/src/or/control.h b/src/or/control.h index a5f2599d2..1744baba2 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -129,14 +129,15 @@ void control_event_hs_descriptor_upload_end(const char *action, const char *onion_address, const char *hs_dir, const char *reason); -void control_event_hs_descriptor_received(const char *onion_address, - const rend_data_t *rend_data, - const char *id_digest); void control_event_hs_descriptor_uploaded(const char *hs_dir, const char *onion_address); -void control_event_hs_descriptor_failed(const rend_data_t *rend_data, - const char *id_digest, - const char *reason); +/* Hidden service v2 HS_DESC specific. */ +void control_event_hsv2_descriptor_failed(const rend_data_t *rend_data, + const char *id_digest, + const char *reason); +void control_event_hsv2_descriptor_received(const char *onion_address, + const rend_data_t *rend_data, + const char *id_digest); void control_event_hs_descriptor_upload_failed(const char *hs_dir, const char *onion_address, const char *reason); diff --git a/src/or/directory.c b/src/or/directory.c index 0c40b2018..884ec2555 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3136,9 +3136,9 @@ handle_response_fetch_renddesc_v2(dir_connection_t *conn, const size_t body_len = args->body_len; #define SEND_HS_DESC_FAILED_EVENT(reason) \ - (control_event_hs_descriptor_failed(conn->rend_data, \ - conn->identity_digest, \ - reason)) + (control_event_hsv2_descriptor_failed(conn->rend_data, \ + conn->identity_digest, \ + reason)) #define SEND_HS_DESC_FAILED_CONTENT() \ (control_event_hs_descriptor_content( \ rend_data_get_address(conn->rend_data), \ @@ -3173,9 +3173,9 @@ handle_response_fetch_renddesc_v2(dir_connection_t *conn, /* success. notify pending connections about this. */ log_info(LD_REND, "Successfully fetched v2 rendezvous " "descriptor."); - control_event_hs_descriptor_received(service_id, - conn->rend_data, - conn->identity_digest); + control_event_hsv2_descriptor_received(service_id, + conn->rend_data, + conn->identity_digest); control_event_hs_descriptor_content(service_id, conn->requested_resource, conn->identity_digest, diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 32a285457..eb097a50f 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -459,7 +459,8 @@ directory_get_from_hs_dir(const char *desc_id, hs_dir = hs_pick_hsdir(responsible_dirs, desc_id_base32); if (!hs_dir) { /* No suitable hs dir can be found, stop right now. */ - control_event_hs_descriptor_failed(rend_query, NULL, "QUERY_NO_HSDIR"); + control_event_hsv2_descriptor_failed(rend_query, NULL, + "QUERY_NO_HSDIR"); control_event_hs_descriptor_content(rend_data_get_address(rend_query), desc_id_base32, NULL, NULL); return 0; @@ -482,7 +483,7 @@ directory_get_from_hs_dir(const char *desc_id, REND_DESC_COOKIE_LEN, 0)<0) { log_warn(LD_BUG, "Could not base64-encode descriptor cookie."); - control_event_hs_descriptor_failed(rend_query, hsdir_fp, "BAD_DESC"); + control_event_hsv2_descriptor_failed(rend_query, hsdir_fp, "BAD_DESC"); control_event_hs_descriptor_content(rend_data_get_address(rend_query), desc_id_base32, hsdir_fp, NULL); return 0; diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 7f9eab911..14799c993 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -269,8 +269,8 @@ test_hs_desc_event(void *arg) /* test received event */ rend_query.auth_type = REND_BASIC_AUTH; - control_event_hs_descriptor_received(rend_query.onion_address, - &rend_query.base_, HSDIR_EXIST_ID); + control_event_hsv2_descriptor_received(rend_query.onion_address, + &rend_query.base_, HSDIR_EXIST_ID); expected_msg = "650 HS_DESC RECEIVED "STR_HS_ADDR" BASIC_AUTH "\ STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32"\r\n"; tt_assert(received_msg); @@ -279,7 +279,7 @@ test_hs_desc_event(void *arg) /* test failed event */ rend_query.auth_type = REND_STEALTH_AUTH; - control_event_hs_descriptor_failed(&rend_query.base_, + control_event_hsv2_descriptor_failed(&rend_query.base_, HSDIR_NONE_EXIST_ID, "QUERY_REJECTED"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" STEALTH_AUTH "\ @@ -290,7 +290,7 @@ test_hs_desc_event(void *arg) /* test invalid auth type */ rend_query.auth_type = 999; - control_event_hs_descriptor_failed(&rend_query.base_, + control_event_hsv2_descriptor_failed(&rend_query.base_, HSDIR_EXIST_ID, "QUERY_REJECTED"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "\ @@ -302,7 +302,7 @@ test_hs_desc_event(void *arg) /* test no HSDir fingerprint type */ rend_query.auth_type = REND_NO_AUTH; - control_event_hs_descriptor_failed(&rend_query.base_, NULL, + control_event_hsv2_descriptor_failed(&rend_query.base_, NULL, "QUERY_NO_HSDIR"); expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" NO_AUTH " \ "UNKNOWN REASON=QUERY_NO_HSDIR\r\n";

1 0

[tor/master] hs-v3: Add a public function to upload a descriptor to an HSDir
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit e71c6199ddd9514f6f04c13f4393bfc28961b272 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 15 14:01:16 2017 -0500 hs-v3: Add a public function to upload a descriptor to an HSDir This is groundwork for the HSPOST control port command that needs a way in the HS subsystem to upload a service descriptor to a specific HSDir. To do so, we add a public function that takes a series of parameters including a fully encoded descriptor and initiate a directory request to a specific routerstatut_t object. It is for now not used but should be, in future commit, by the HSPOST command. This commit has no behavior change, only refactoring. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 81 +++++++++++++++++++++++++++++++++++------------------ src/or/hs_service.h | 7 +++++ 2 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 4f0465da4..f65b59ae1 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -2203,16 +2203,12 @@ static void upload_descriptor_to_hsdir(const hs_service_t *service, hs_service_descriptor_t *desc, const node_t *hsdir) { - char version_str[4] = {0}, *encoded_desc = NULL; - directory_request_t *dir_req; - hs_ident_dir_conn_t ident; + char *encoded_desc = NULL; tor_assert(service); tor_assert(desc); tor_assert(hsdir); - memset(&ident, 0, sizeof(ident)); - /* Let's avoid doing that if tor is configured to not publish. */ if (!get_options()->PublishHidServDescriptors) { log_info(LD_REND, "Service %s not publishing descriptor. " @@ -2228,29 +2224,10 @@ upload_descriptor_to_hsdir(const hs_service_t *service, goto end; } - /* Setup the connection identifier. */ - hs_ident_dir_conn_init(&service->keys.identity_pk, &desc->blinded_kp.pubkey, - &ident); - - /* This is our resource when uploading which is used to construct the URL - * with the version number: "/tor/hs/<version>/publish". */ - tor_snprintf(version_str, sizeof(version_str), "%u", - service->config.version); - - /* Build the directory request for this HSDir. */ - dir_req = directory_request_new(DIR_PURPOSE_UPLOAD_HSDESC); - directory_request_set_routerstatus(dir_req, hsdir->rs); - directory_request_set_indirection(dir_req, DIRIND_ANONYMOUS); - directory_request_set_resource(dir_req, version_str); - directory_request_set_payload(dir_req, encoded_desc, - strlen(encoded_desc)); - /* The ident object is copied over the directory connection object once - * the directory request is initiated. */ - directory_request_upload_set_hs_ident(dir_req, &ident); - - /* Initiate the directory request to the hsdir.*/ - directory_initiate_request(dir_req); - directory_request_free(dir_req); + /* Time to upload the descriptor to the directory. */ + hs_service_upload_desc_to_dir(encoded_desc, service->config.version, + &service->keys.identity_pk, + &desc->blinded_kp.pubkey, hsdir->rs); /* Add this node to previous_hsdirs list */ service_desc_note_upload(desc, hsdir); @@ -2907,6 +2884,54 @@ service_add_fnames_to_list(const hs_service_t *service, smartlist_t *list) /* Public API */ /* ========== */ +/* Upload an encoded descriptor in encoded_desc of the given version. This + * descriptor is for the service identity_pk and blinded_pk used to setup the + * directory connection identifier. It is uploaded to the directory hsdir_rs + * routerstatus_t object. + * + * NOTE: This function does NOT check for PublishHidServDescriptors because it + * is only used by the control port command HSPOST outside of this subsystem. + * Inside this code, upload_descriptor_to_hsdir() should be used. */ +void +hs_service_upload_desc_to_dir(const char *encoded_desc, + const uint8_t version, + const ed25519_public_key_t *identity_pk, + const ed25519_public_key_t *blinded_pk, + const routerstatus_t *hsdir_rs) +{ + char version_str[4] = {0}; + directory_request_t *dir_req; + hs_ident_dir_conn_t ident; + + tor_assert(encoded_desc); + tor_assert(identity_pk); + tor_assert(blinded_pk); + tor_assert(hsdir_rs); + + /* Setup the connection identifier. */ + memset(&ident, 0, sizeof(ident)); + hs_ident_dir_conn_init(identity_pk, blinded_pk, &ident); + + /* This is our resource when uploading which is used to construct the URL + * with the version number: "/tor/hs/<version>/publish". */ + tor_snprintf(version_str, sizeof(version_str), "%u", version); + + /* Build the directory request for this HSDir. */ + dir_req = directory_request_new(DIR_PURPOSE_UPLOAD_HSDESC); + directory_request_set_routerstatus(dir_req, hsdir_rs); + directory_request_set_indirection(dir_req, DIRIND_ANONYMOUS); + directory_request_set_resource(dir_req, version_str); + directory_request_set_payload(dir_req, encoded_desc, + strlen(encoded_desc)); + /* The ident object is copied over the directory connection object once + * the directory request is initiated. */ + directory_request_upload_set_hs_ident(dir_req, &ident); + + /* Initiate the directory request to the hsdir.*/ + directory_initiate_request(dir_req); + directory_request_free(dir_req); +} + /* Add the ephemeral service using the secret key sk and ports. Both max * streams parameter will be set in the newly created service. * diff --git a/src/or/hs_service.h b/src/or/hs_service.h index de04987c8..678f24b0a 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -279,6 +279,13 @@ hs_service_add_ephemeral(ed25519_secret_key_t *sk, smartlist_t *ports, int max_streams_close_circuit, char **address_out); int hs_service_del_ephemeral(const char *address); +/* Used outside of the HS subsystem by the control port command HSPOST. */ +void hs_service_upload_desc_to_dir(const char *encoded_desc, + const uint8_t version, + const ed25519_public_key_t *identity_pk, + const ed25519_public_key_t *blinded_pk, + const routerstatus_t *hsdir_rs); + #ifdef HS_SERVICE_PRIVATE #ifdef TOR_UNIT_TESTS

1 0

[tor/master] hs-v3: Implement HS_DESC RECEIVED event
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 3b436d495fc6ad59ff5d9406d7ef17494286c299 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Nov 10 14:12:34 2017 -0500 hs-v3: Implement HS_DESC RECEIVED event Adds a v3 specific function to handle a received event. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 23 +++++++++++++++++++++++ src/or/control.h | 3 +++ src/or/directory.c | 2 ++ src/or/hs_control.c | 25 +++++++++++++++++++++++++ src/or/hs_control.h | 4 ++++ 5 files changed, 57 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index 3ba3a4b3a..a1515da05 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7398,6 +7398,29 @@ control_event_hsv2_descriptor_received(const char *onion_address, tor_free(desc_id_field); } +/* Send HS_DESC RECEIVED event + * + * Called when we successfully received a hidden service descriptor. */ +void +control_event_hsv3_descriptor_received(const char *onion_address, + const char *desc_id, + const char *hsdir_id_digest) +{ + char *desc_id_field = NULL; + + if (BUG(!onion_address || !desc_id || !hsdir_id_digest)) { + return; + } + + /* Because DescriptorID is an optional positional value, we need to add a + * whitespace before in order to not be next to the HsDir value. */ + tor_asprintf(&desc_id_field, " %s", desc_id); + + event_hs_descriptor_receive_end("RECEIVED", onion_address, desc_id_field, + REND_NO_AUTH, hsdir_id_digest, NULL); + tor_free(desc_id_field); +} + /** send HS_DESC UPLOADED event * * called when we successfully uploaded a hidden service descriptor. diff --git a/src/or/control.h b/src/or/control.h index 4c9adb681..c11f6a07b 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -144,6 +144,9 @@ void control_event_hsv3_descriptor_failed(const char *onion_address, const char *desc_id, const char *hsdir_id_digest, const char *reason); +void control_event_hsv3_descriptor_received(const char *onion_address, + const char *desc_id, + const char *hsdir_id_digest); void control_event_hs_descriptor_upload_failed(const char *hs_dir, const char *onion_address, const char *reason); diff --git a/src/or/directory.c b/src/or/directory.c index 1b6f7500b..a1d9c8c08 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3098,6 +3098,8 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, log_info(LD_REND, "Stored hidden service descriptor successfully."); TO_CONN(conn)->purpose = DIR_PURPOSE_HAS_FETCHED_HSDESC; hs_client_desc_has_arrived(conn->hs_ident); + /* Fire control port RECEIVED event. */ + hs_control_desc_event_received(conn->hs_ident, conn->identity_digest); } break; case 404: diff --git a/src/or/hs_control.c b/src/or/hs_control.c index ed77c8e1d..add62d583 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -77,3 +77,28 @@ hs_control_desc_event_failed(const hs_ident_dir_conn_t *ident, hsdir_id_digest, reason); } +/* Send on the control port the "HS_DESC RECEIVED [...]" event. + * + * Using a directory connection identifier and the HSDir identity digest. + * None can be NULL. */ +void +hs_control_desc_event_received(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest) +{ + char onion_address[HS_SERVICE_ADDR_LEN_BASE32 + 1]; + char base64_blinded_pk[ED25519_BASE64_LEN + 1]; + + tor_assert(ident); + tor_assert(hsdir_id_digest); + + /* Build onion address and encoded blinded key. */ + IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, + &ident->blinded_pk) < 0) { + return; + } + hs_build_address(&ident->identity_pk, HS_VERSION_THREE, onion_address); + + control_event_hsv3_descriptor_received(onion_address, base64_blinded_pk, + hsdir_id_digest); +} + diff --git a/src/or/hs_control.h b/src/or/hs_control.h index fb8f3859f..33a96cec0 100644 --- a/src/or/hs_control.h +++ b/src/or/hs_control.h @@ -21,5 +21,9 @@ void hs_control_desc_event_failed(const hs_ident_dir_conn_t *ident, const char *hsdir_id_digest, const char *reason); +/* Event "HS_DESC RECEIVED [...]" */ +void hs_control_desc_event_received(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest); + #endif /* !defined(TOR_HS_CONTROL_H) */

1 0

[tor/master] hs-v3: Implement HS_DESC_CONTENT event
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 2c8e97db587df4c3145ab98dd9251290be7a3379 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 14 11:06:35 2017 -0500 hs-v3: Implement HS_DESC_CONTENT event Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/directory.c | 10 ++++++++++ src/or/hs_control.c | 27 +++++++++++++++++++++++++++ src/or/hs_control.h | 5 +++++ 3 files changed, 42 insertions(+) diff --git a/src/or/directory.c b/src/or/directory.c index ae8bf6eb0..1a7c016c3 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3094,12 +3094,16 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, /* Fire control port FAILED event. */ hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, "BAD_DESC"); + hs_control_desc_event_content(conn->hs_ident, conn->identity_digest, + NULL); } else { log_info(LD_REND, "Stored hidden service descriptor successfully."); TO_CONN(conn)->purpose = DIR_PURPOSE_HAS_FETCHED_HSDESC; hs_client_desc_has_arrived(conn->hs_ident); /* Fire control port RECEIVED event. */ hs_control_desc_event_received(conn->hs_ident, conn->identity_digest); + hs_control_desc_event_content(conn->hs_ident, conn->identity_digest, + body); } break; case 404: @@ -3110,6 +3114,8 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, /* Fire control port FAILED event. */ hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, "NOT_FOUND"); + hs_control_desc_event_content(conn->hs_ident, conn->identity_digest, + NULL); break; case 400: log_warn(LD_REND, "Fetching v3 hidden service descriptor failed: " @@ -3119,6 +3125,8 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, /* Fire control port FAILED event. */ hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, "QUERY_REJECTED"); + hs_control_desc_event_content(conn->hs_ident, conn->identity_digest, + NULL); break; default: log_warn(LD_REND, "Fetching v3 hidden service descriptor failed: " @@ -3129,6 +3137,8 @@ handle_response_fetch_hsdesc_v3(dir_connection_t *conn, /* Fire control port FAILED event. */ hs_control_desc_event_failed(conn->hs_ident, conn->identity_digest, "UNEXPECTED"); + hs_control_desc_event_content(conn->hs_ident, conn->identity_digest, + NULL); break; } diff --git a/src/or/hs_control.c b/src/or/hs_control.c index fce6466ef..9a05d936b 100644 --- a/src/or/hs_control.c +++ b/src/or/hs_control.c @@ -172,3 +172,30 @@ hs_control_desc_event_uploaded(const hs_ident_dir_conn_t *ident, control_event_hs_descriptor_uploaded(hsdir_id_digest, onion_address); } +/* Send on the control port the "HS_DESC_CONTENT [...]" event. + * + * Using the directory connection identifier, the HSDir identity digest and + * the body of the descriptor (as it was received from the directory). None + * can be NULL. */ +void +hs_control_desc_event_content(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest, + const char *body) +{ + char onion_address[HS_SERVICE_ADDR_LEN_BASE32 + 1]; + char base64_blinded_pk[ED25519_BASE64_LEN + 1]; + + tor_assert(ident); + tor_assert(hsdir_id_digest); + + /* Build onion address and encoded blinded key. */ + IF_BUG_ONCE(ed25519_public_to_base64(base64_blinded_pk, + &ident->blinded_pk) < 0) { + return; + } + hs_build_address(&ident->identity_pk, HS_VERSION_THREE, onion_address); + + control_event_hs_descriptor_content(onion_address, base64_blinded_pk, + hsdir_id_digest, body); +} + diff --git a/src/or/hs_control.h b/src/or/hs_control.h index de23dc73d..35062d4b8 100644 --- a/src/or/hs_control.h +++ b/src/or/hs_control.h @@ -39,5 +39,10 @@ void hs_control_desc_event_upload(const char *onion_address, void hs_control_desc_event_uploaded(const hs_ident_dir_conn_t *ident, const char *hsdir_id_digest); +/* Event "HS_DESC_CONTENT [...]" */ +void hs_control_desc_event_content(const hs_ident_dir_conn_t *ident, + const char *hsdir_id_digest, + const char *body); + #endif /* !defined(TOR_HS_CONTROL_H) */

1 0