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

[tor/master] prop224: Parse INTRODUCE_ACK cell
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit cb336a7062f87c5c306549a4f4a26eab66c5b825 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jul 21 17:06:04 2017 -0400 prop224: Parse INTRODUCE_ACK cell Add a function to parse an INTRODUCE_ACK cell in hs_cell.c. Furthermore, add an enum that lists all possible expected status code. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_cell.c | 23 +++++++++++++++++++++++ src/or/hs_cell.h | 9 +++++++++ 2 files changed, 32 insertions(+) diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index 64e164c06..1f9df825f 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -864,3 +864,26 @@ hs_cell_build_establish_rendezvous(const uint8_t *rendezvous_cookie, return HS_REND_COOKIE_LEN; } +/* Handle an INTRODUCE_ACK cell encoded in payload of length payload_len. + * Return the status code on success else a negative value if the cell as not + * decodable. */ +int +hs_cell_parse_introduce_ack(const uint8_t *payload, size_t payload_len) +{ + int ret = -1; + trn_cell_introduce_ack_t *cell = NULL; + + tor_assert(payload); + + if (trn_cell_introduce_ack_parse(&cell, payload, payload_len) < 0) { + log_info(LD_REND, "Invalid INTRODUCE_ACK cell. Unable to parse it."); + goto end; + } + + ret = trn_cell_introduce_ack_get_status(cell); + + end: + trn_cell_introduce_ack_free(cell); + return ret; +} + diff --git a/src/or/hs_cell.h b/src/or/hs_cell.h index 29e451cf0..606a08dd6 100644 --- a/src/or/hs_cell.h +++ b/src/or/hs_cell.h @@ -16,6 +16,14 @@ * 3.2.2 of the specification). Below this value, the cell must be padded. */ #define HS_CELL_INTRODUCE1_MIN_SIZE 246 +/* Status code of an INTRODUCE_ACK cell. */ +typedef enum { + HS_CELL_INTRO_ACK_SUCCESS = 0x0000, /* Cell relayed to service. */ + HS_CELL_INTRO_ACK_FAILURE = 0x0001, /* Service ID not recognized */ + HS_CELL_INTRO_ACK_BADFMT = 0x0002, /* Bad message format */ + HS_CELL_INTRO_ACK_NORELAY = 0x0003, /* Can't relay cell to service */ +} hs_cell_introd_ack_status_t; + /* Onion key type found in the INTRODUCE1 cell. */ typedef enum { HS_CELL_ONION_KEY_TYPE_NTOR = 1, @@ -102,6 +110,7 @@ ssize_t hs_cell_parse_intro_established(const uint8_t *payload, ssize_t hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data, const origin_circuit_t *circ, const hs_service_t *service); +int hs_cell_parse_introduce_ack(const uint8_t *payload, size_t payload_len); #endif /* TOR_HS_CELL_H */

1 0

[tor/master] prop224: Move and refactor rend_client_reextend_intro_circuit()
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit 88b843608accd10af6d12c53531950566ded5ef9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 27 12:37:52 2017 -0400 prop224: Move and refactor rend_client_reextend_intro_circuit() This moves it to hs_client.c so it can be used by both system (legacy and prop224). For now, only the legacy system uses it. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_client.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_client.h | 2 ++ src/or/rendclient.c | 45 +++------------------------------------------ 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 562955076..68b33b196 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -27,6 +27,7 @@ #include "circpathbias.h" #include "connection.h" #include "hs_ntor.h" +#include "circuitbuild.h" /* Get all connections that are waiting on a circuit and flag them back to * waiting for a hidden service descriptor for the given service key @@ -977,3 +978,46 @@ hs_client_receive_rendezvous2(origin_circuit_t *circ, return ret; } +/* Extend the introduction circuit circ to another valid introduction point + * for the hidden service it is trying to connect to, or mark it and launch a + * new circuit if we can't extend it. Return 0 on success or possible + * success. Return -1 and mark the introduction circuit for close on permanent + * failure. + * + * On failure, the caller is responsible for marking the associated rendezvous + * circuit for close. */ +int +hs_client_reextend_intro_circuit(origin_circuit_t *circ) +{ + int ret = -1; + extend_info_t *ei; + + tor_assert(circ); + + ei = (circ->hs_ident) ? + client_get_random_intro(&circ->hs_ident->identity_pk) : + rend_client_get_random_intro(circ->rend_data); + if (ei == NULL) { + log_warn(LD_REND, "No usable introduction points left. Closing."); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); + goto end; + } + + if (circ->remaining_relay_early_cells) { + log_info(LD_REND, "Re-extending circ %u, this time to %s.", + (unsigned int) TO_CIRCUIT(circ)->n_circ_id, + safe_str_client(extend_info_describe(ei))); + ret = circuit_extend_to_new_exit(circ, ei); + } else { + log_info(LD_REND, "Closing intro circ %u (out of RELAY_EARLY cells).", + (unsigned int) TO_CIRCUIT(circ)->n_circ_id); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); + /* connection_ap_handshake_attach_circuit will launch a new intro circ. */ + ret = 0; + } + + end: + extend_info_free(ei); + return ret; +} + diff --git a/src/or/hs_client.h b/src/or/hs_client.h index 6681505ee..440698788 100644 --- a/src/or/hs_client.h +++ b/src/or/hs_client.h @@ -43,5 +43,7 @@ void hs_client_desc_has_arrived(const hs_ident_dir_conn_t *ident); extend_info_t *hs_client_get_random_intro_from_edge( const edge_connection_t *edge_conn); +int hs_client_reextend_intro_circuit(origin_circuit_t *circ); + #endif /* TOR_HS_CLIENT_H */ diff --git a/src/or/rendclient.c b/src/or/rendclient.c index cb7d99bed..d983dea7e 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -18,6 +18,7 @@ #include "directory.h" #include "hs_common.h" #include "hs_circuit.h" +#include "hs_client.h" #include "main.h" #include "networkstatus.h" #include "nodelist.h" @@ -89,46 +90,6 @@ rend_client_send_establish_rendezvous(origin_circuit_t *circ) return 0; } -/** Extend the introduction circuit circ to another valid - * introduction point for the hidden service it is trying to connect - * to, or mark it and launch a new circuit if we can't extend it. - * Return 0 on success or possible success. Return -1 and mark the - * introduction circuit for close on permanent failure. - * - * On failure, the caller is responsible for marking the associated - * rendezvous circuit for close. */ -static int -rend_client_reextend_intro_circuit(origin_circuit_t *circ) -{ - extend_info_t *extend_info; - int result; - extend_info = rend_client_get_random_intro(circ->rend_data); - if (!extend_info) { - log_warn(LD_REND, - "No usable introduction points left for %s. Closing.", - safe_str_client(rend_data_get_address(circ->rend_data))); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - return -1; - } - // XXX: should we not re-extend if hs_circ_has_timed_out? - if (circ->remaining_relay_early_cells) { - log_info(LD_REND, - "Re-extending circ %u, this time to %s.", - (unsigned)circ->base_.n_circ_id, - safe_str_client(extend_info_describe(extend_info))); - result = circuit_extend_to_new_exit(circ, extend_info); - } else { - log_info(LD_REND, - "Closing intro circ %u (out of RELAY_EARLY cells).", - (unsigned)circ->base_.n_circ_id); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); - /* connection_ap_handshake_attach_circuit will launch a new intro circ. */ - result = 0; - } - extend_info_free(extend_info); - return result; -} - /** Called when we're trying to connect an ap conn; sends an INTRODUCE1 cell * down introcirc if possible. */ @@ -202,7 +163,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, introcirc->build_state->chosen_exit)), smartlist_len(entry->parsed->intro_nodes)); - if (rend_client_reextend_intro_circuit(introcirc)) { + if (hs_client_reextend_intro_circuit(introcirc)) { status = -2; goto perm_err; } else { @@ -437,7 +398,7 @@ rend_client_introduction_acked(origin_circuit_t *circ, INTRO_POINT_FAILURE_GENERIC)>0) { /* There are introduction points left. Re-extend the circuit to * another intro point and try again. */ - int result = rend_client_reextend_intro_circuit(circ); + int result = hs_client_reextend_intro_circuit(circ); /* XXXX If that call failed, should we close the rend circuit, * too? */ return result;

1 0

[tor/master] prop224: Parse RENDEZVOUS2 cell
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit ee15c16742aecb4795ce12847068b7907be9e8a2 Author: David Goulet <dgoulet(a)torproject.org> Date: Sun Jul 23 13:01:00 2017 -0400 prop224: Parse RENDEZVOUS2 cell Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_cell.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index c5ea6e4db..482fa04e9 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -899,3 +899,35 @@ hs_cell_parse_introduce_ack(const uint8_t *payload, size_t payload_len) return ret; } +/* Handle a RENDEZVOUS2 cell encoded in payload of length payload_len. On + * success, handshake_info contains the data in the HANDSHAKE_INFO field, and + * 0 is returned. On error, a negative value is returned. */ +int +hs_cell_parse_rendezvous2(const uint8_t *payload, size_t payload_len, + uint8_t *handshake_info, size_t handshake_info_len) +{ + int ret = -1; + trn_cell_rendezvous2_t *cell = NULL; + + tor_assert(payload); + tor_assert(handshake_info); + + if (trn_cell_rendezvous2_parse(&cell, payload, payload_len) < 0) { + log_info(LD_REND, "Invalid RENDEZVOUS2 cell. Unable to parse it."); + goto end; + } + + /* Static size, we should never have an issue with this else we messed up + * our code flow. */ + tor_assert(trn_cell_rendezvous2_getlen_handshake_info(cell) == + handshake_info_len); + memcpy(handshake_info, + trn_cell_rendezvous2_getconstarray_handshake_info(cell), + handshake_info_len); + ret = 0; + + end: + trn_cell_rendezvous2_free(cell); + return ret; +} +

1 0

[tor/master] prop224: Use the intro point state cache
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit 14b858c4ced594ee5130a685ac4b143bf66da04a Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 27 17:06:42 2017 -0400 prop224: Use the intro point state cache This commit makes the client use the intro point state cache. It notes down when we get a NACK from the intro point and then uses that cache to decide if it should either close the circuits or re-extend to a new intro point. This also introduces a very useful function that checks if an intro point is usable that is query the state cache and checks a series of requirement. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_client.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 117 insertions(+), 5 deletions(-) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 68b33b196..06cbcc409 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -419,6 +419,51 @@ desc_intro_point_to_extend_info(const hs_desc_intro_point_t *ip) return ei; } +/* Return true iff the intro point ip for the service service_pk is usable. + * This function checks if the intro point is in the client intro state cache + * and checks at the failures. It is considered usable if: + * - No error happened (INTRO_POINT_FAILURE_GENERIC) + * - It is not flagged as timed out (INTRO_POINT_FAILURE_TIMEOUT) + * - The unreachable count is lower than + * MAX_INTRO_POINT_REACHABILITY_FAILURES (INTRO_POINT_FAILURE_UNREACHABLE) + */ +static int +intro_point_is_usable(const ed25519_public_key_t *service_pk, + const hs_desc_intro_point_t *ip) +{ + const hs_cache_intro_state_t *state; + + tor_assert(service_pk); + tor_assert(ip); + + state = hs_cache_client_intro_state_find(service_pk, + &ip->auth_key_cert->signed_key); + if (state == NULL) { + /* This means we've never encountered any problem thus usable. */ + goto usable; + } + if (state->error) { + log_info(LD_REND, "Intro point with auth key %s had an error. Not usable", + safe_str_client(ed25519_fmt(&ip->auth_key_cert->signed_key))); + goto not_usable; + } + if (state->timed_out) { + log_info(LD_REND, "Intro point with auth key %s timed out. Not usable", + safe_str_client(ed25519_fmt(&ip->auth_key_cert->signed_key))); + goto not_usable; + } + if (state->unreachable_count >= MAX_INTRO_POINT_REACHABILITY_FAILURES) { + log_info(LD_REND, "Intro point with auth key %s unreachable. Not usable", + safe_str_client(ed25519_fmt(&ip->auth_key_cert->signed_key))); + goto not_usable; + } + + usable: + return 1; + not_usable: + return 0; +} + /* Using a descriptor desc, return a newly allocated extend_info_t object of a * randomly picked introduction point from its list. Return NULL if none are * usable. */ @@ -454,6 +499,12 @@ client_get_random_intro(const ed25519_public_key_t *service_pk) ip = smartlist_get(usable_ips, idx); smartlist_del(usable_ips, idx); + /* We need to make sure we have a usable intro points which is in a good + * state in our cache. */ + if (!intro_point_is_usable(service_pk, ip)) { + continue; + } + /* Generate an extend info object from the intro point object. */ ei = desc_intro_point_to_extend_info(ip); if (ei == NULL) { @@ -470,8 +521,6 @@ client_get_random_intro(const ed25519_public_key_t *service_pk) ei_excluded = ei; continue; } - /* XXX: Intro point can time out or just be unsuable, we need to keep - * track of this and check against such cache. */ /* Good pick! Let's go with this. */ goto end; @@ -493,6 +542,62 @@ client_get_random_intro(const ed25519_public_key_t *service_pk) return ei; } +/* For this introduction circuit, we'll look at if we have any usable + * introduction point left for this service. If so, we'll use the circuit to + * re-extend to a new intro point. Else, we'll close the circuit and its + * corresponding rendezvous circuit. Return 0 if we are re-extending else -1 + * if we are closing the circuits. + * + * This is called when getting an INTRODUCE_ACK cell with a NACK. */ +static int +close_or_reextend_intro_circ(origin_circuit_t *intro_circ) +{ + int ret = -1; + const hs_descriptor_t *desc; + origin_circuit_t *rend_circ; + + tor_assert(intro_circ); + + desc = hs_cache_lookup_as_client(&intro_circ->hs_ident->identity_pk); + if (BUG(desc == NULL)) { + /* We can't continue without a descriptor. */ + goto close; + } + /* We still have the descriptor, great! Let's try to see if we can + * re-extend by looking up if there are any usable intro points. */ + if (!hs_client_any_intro_points_usable(desc)) { + goto close; + } + /* Try to re-extend now. */ + if (hs_client_reextend_intro_circuit(intro_circ) < 0) { + goto close; + } + /* Success on re-extending. Don't return an error. */ + ret = 0; + goto end; + + close: + /* Change the intro circuit purpose before so we don't report an intro point + * failure again triggering an extra descriptor fetch. The circuit can + * already be closed on failure to re-extend. */ + if (!TO_CIRCUIT(intro_circ)->marked_for_close) { + circuit_change_purpose(TO_CIRCUIT(intro_circ), + CIRCUIT_PURPOSE_C_INTRODUCE_ACKED); + circuit_mark_for_close(TO_CIRCUIT(intro_circ), END_CIRC_REASON_FINISHED); + } + /* Close the related rendezvous circuit. */ + rend_circ = hs_circuitmap_get_rend_circ_client_side( + intro_circ->hs_ident->rendezvous_cookie); + /* The rendezvous circuit might have collapsed while the INTRODUCE_ACK was + * inflight so we can't expect one every time. */ + if (rend_circ) { + circuit_mark_for_close(TO_CIRCUIT(rend_circ), END_CIRC_REASON_FINISHED); + } + + end: + return ret; +} + /* Called when we get an INTRODUCE_ACK success status code. Do the appropriate * actions for the rendezvous point and finally close intro_circ. */ static void @@ -545,8 +650,11 @@ handle_introduce_ack_bad(origin_circuit_t *circ, int status) /* It's a NAK. The introduction point didn't relay our request. */ circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_C_INTRODUCING); - /* XXX: Report this failure for the intro point failure cache. Depending on - * how many times we've tried this intro point, close it or reextend. */ + /* Note down this failure in the intro point failure cache. Depending on how + * many times we've tried this intro point, close it or reextend. */ + hs_cache_client_intro_state_note(&circ->hs_ident->identity_pk, + &circ->hs_ident->intro_auth_pk, + INTRO_POINT_FAILURE_GENERIC); } /* Called when we get an INTRODUCE_ACK on the intro circuit circ. The encoded @@ -570,11 +678,14 @@ handle_introduce_ack(origin_circuit_t *circ, const uint8_t *payload, case HS_CELL_INTRO_ACK_SUCCESS: ret = 0; handle_introduce_ack_success(circ); - break; + goto end; case HS_CELL_INTRO_ACK_FAILURE: case HS_CELL_INTRO_ACK_BADFMT: case HS_CELL_INTRO_ACK_NORELAY: handle_introduce_ack_bad(circ, status); + /* We are going to see if we have to close the circuits (IP and RP) or we + * can re-extend to a new intro point. */ + ret = close_or_reextend_intro_circ(circ); break; default: log_info(LD_PROTOCOL, "Unknown INTRODUCE_ACK status code %u from %s", @@ -583,6 +694,7 @@ handle_introduce_ack(origin_circuit_t *circ, const uint8_t *payload, break; } + end: return ret; }

1 0

[tor/master] prop224: Add a client intro point state cache
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit 2671399e67e19c125fbfb6f4b9f1ba71c4e52031 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 27 15:51:32 2017 -0400 prop224: Add a client intro point state cache This cache keeps track of the state of intro points which is needed when we have failures when using them. It is similar to the failure cache of the legacy system. At this commit, it is unused but initialized, cleanup and freed. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_cache.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_cache.h | 35 +++++++++ src/or/main.c | 1 + 3 files changed, 267 insertions(+) diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c index d93e682dc..28cb4d1bd 100644 --- a/src/or/hs_cache.c +++ b/src/or/hs_cache.c @@ -324,6 +324,11 @@ hs_cache_clean_as_dir(time_t now) /* Client-side HS descriptor cache. Map indexed by service identity key. */ static digest256map_t *hs_cache_v3_client; +/* Client-side introduction point state cache. Map indexed by service public + * identity key (onion address). It contains hs_cache_client_intro_state_t + * objects all related to a specific service. */ +static digest256map_t *hs_cache_client_intro_state; + /* Remove a given descriptor from our cache. */ static void remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) @@ -410,6 +415,172 @@ cache_client_desc_free_(void *ptr) cache_client_desc_free(desc); } +/* Return a newly allocated and initialized hs_cache_intro_state_t object. */ +static hs_cache_intro_state_t * +cache_intro_state_new(void) +{ + hs_cache_intro_state_t *state = tor_malloc_zero(sizeof(*state)); + state->created_ts = approx_time(); + return state; +} + +/* Free an hs_cache_intro_state_t object. */ +static void +cache_intro_state_free(hs_cache_intro_state_t *state) +{ + tor_free(state); +} + +/* Helper function: use by the free all function. */ +static void +cache_intro_state_free_(void *state) +{ + cache_intro_state_free(state); +} + +/* Return a newly allocated and initialized hs_cache_client_intro_state_t + * object. */ +static hs_cache_client_intro_state_t * +cache_client_intro_state_new(void) +{ + hs_cache_client_intro_state_t *cache = tor_malloc_zero(sizeof(*cache)); + cache->intro_points = digest256map_new(); + return cache; +} + +/* Free a cache client intro state object. */ +static void +cache_client_intro_state_free(hs_cache_client_intro_state_t *cache) +{ + if (cache == NULL) { + return; + } + digest256map_free(cache->intro_points, cache_intro_state_free_); + tor_free(cache); +} + +/* Helper function: use by the free all function. */ +static void +cache_client_intro_state_free_(void *entry) +{ + cache_client_intro_state_free(entry); +} + +/* For the given service identity key service_pk and an introduction + * authentication key auth_key, lookup the intro state object. Return 1 if + * found and put it in entry if not NULL. Return 0 if not found and entry is + * untouched. */ +static int +cache_client_intro_state_lookup(const ed25519_public_key_t *service_pk, + const ed25519_public_key_t *auth_key, + hs_cache_intro_state_t **entry) +{ + hs_cache_intro_state_t *state; + hs_cache_client_intro_state_t *cache; + + tor_assert(service_pk); + tor_assert(auth_key); + + /* Lookup the intro state cache for this service key. */ + cache = digest256map_get(hs_cache_client_intro_state, service_pk->pubkey); + if (cache == NULL) { + goto not_found; + } + + /* From the cache we just found for the service, lookup in the introduction + * points map for the given authentication key. */ + state = digest256map_get(cache->intro_points, auth_key->pubkey); + if (state == NULL) { + goto not_found; + } + if (entry) { + *entry = state; + } + return 1; + not_found: + return 0; +} + +/* Note the given failure in state. */ +static void +cache_client_intro_state_note(hs_cache_intro_state_t *state, + rend_intro_point_failure_t failure) +{ + tor_assert(state); + switch (failure) { + case INTRO_POINT_FAILURE_GENERIC: + state->error = 1; + break; + case INTRO_POINT_FAILURE_TIMEOUT: + state->timed_out = 1; + break; + case INTRO_POINT_FAILURE_UNREACHABLE: + state->unreachable_count++; + break; + default: + tor_assert_nonfatal_unreached(); + return; + } +} + +/* For the given service identity key service_pk and an introduction + * authentication key auth_key, add an entry in the client intro state cache + * If no entry exists for the service, it will create one. If state is non + * NULL, it will point to the new intro state entry. */ +static void +cache_client_intro_state_add(const ed25519_public_key_t *service_pk, + const ed25519_public_key_t *auth_key, + hs_cache_intro_state_t **state) +{ + hs_cache_intro_state_t *entry, *old_entry; + hs_cache_client_intro_state_t *cache; + + tor_assert(service_pk); + tor_assert(auth_key); + + /* Lookup the state cache for this service key. */ + cache = digest256map_get(hs_cache_client_intro_state, service_pk->pubkey); + if (cache == NULL) { + cache = cache_client_intro_state_new(); + digest256map_set(hs_cache_client_intro_state, service_pk->pubkey, cache); + } + + entry = cache_intro_state_new(); + old_entry = digest256map_set(cache->intro_points, auth_key->pubkey, entry); + /* This should never happened because the code flow is to lookup the entry + * before adding it. But, just in case, non fatal assert and free it. */ + tor_assert_nonfatal(old_entry == NULL); + tor_free(old_entry); + + if (state) { + *state = entry; + } +} + +/* Remove every intro point state entry from cache that has been created + * before or at the cutoff. */ +static void +cache_client_intro_state_clean(time_t cutoff, + hs_cache_client_intro_state_t *cache) +{ + tor_assert(cache); + + DIGEST256MAP_FOREACH_MODIFY(cache->intro_points, key, + hs_cache_intro_state_t *, entry) { + if (entry->created_ts <= cutoff) { + cache_intro_state_free(entry); + MAP_DEL_CURRENT(key); + } + } DIGEST256MAP_FOREACH_END; +} + +/* Return true iff no intro points are in this cache. */ +static int +cache_client_intro_state_is_empty(const hs_cache_client_intro_state_t *cache) +{ + return digest256map_isempty(cache->intro_points); +} + /** Check whether client_desc is useful for us, and store it in the * client-side HS cache if so. The client_desc is freed if we already have a * fresher (higher revision counter count) in the cache. */ @@ -554,6 +725,59 @@ hs_cache_clean_as_client(time_t now) cache_clean_v3_as_client(now); } +/* For a given service identity public key and an introduction authentication + * key, note the given failure in the client intro state cache. */ +void +hs_cache_client_intro_state_note(const ed25519_public_key_t *service_pk, + const ed25519_public_key_t *auth_key, + rend_intro_point_failure_t failure) +{ + int found; + hs_cache_intro_state_t *entry; + + tor_assert(service_pk); + tor_assert(auth_key); + + found = cache_client_intro_state_lookup(service_pk, auth_key, &entry); + if (!found) { + /* Create a new entry and add it to the cache. */ + cache_client_intro_state_add(service_pk, auth_key, &entry); + } + /* Note down the entry. */ + cache_client_intro_state_note(entry, failure); +} + +/* For a given service identity public key and an introduction authentication + * key, return true iff it is present in the failure cache. */ +const hs_cache_intro_state_t * +hs_cache_client_intro_state_find(const ed25519_public_key_t *service_pk, + const ed25519_public_key_t *auth_key) +{ + hs_cache_intro_state_t *state = NULL; + cache_client_intro_state_lookup(service_pk, auth_key, &state); + return state; +} + +/* Cleanup the client introduction state cache. */ +void +hs_cache_client_intro_state_clean(time_t now) +{ + time_t cutoff = now - HS_CACHE_CLIENT_INTRO_STATE_MAX_AGE; + + DIGEST256MAP_FOREACH_MODIFY(hs_cache_client_intro_state, key, + hs_cache_client_intro_state_t *, cache) { + /* Cleanup intro points failure. */ + cache_client_intro_state_clean(cutoff, cache); + + /* Is this cache empty for this service key? If yes, remove it from the + * cache. Else keep it. */ + if (cache_client_intro_state_is_empty(cache)) { + cache_client_intro_state_free(cache); + MAP_DEL_CURRENT(key); + } + } DIGEST256MAP_FOREACH_END; +} + /**************** Generics *********************************/ /* Do a round of OOM cleanup on all directory caches. Return the amount of @@ -629,6 +853,9 @@ hs_cache_init(void) tor_assert(!hs_cache_v3_client); hs_cache_v3_client = digest256map_new(); + + tor_assert(!hs_cache_client_intro_state); + hs_cache_client_intro_state = digest256map_new(); } /* Cleanup the hidden service cache subsystem. */ @@ -640,5 +867,9 @@ hs_cache_free_all(void) digest256map_free(hs_cache_v3_client, cache_client_desc_free_); hs_cache_v3_client = NULL; + + digest256map_free(hs_cache_client_intro_state, + cache_client_intro_state_free_); + hs_cache_client_intro_state = NULL; } diff --git a/src/or/hs_cache.h b/src/or/hs_cache.h index 79456f69c..2a4d2dbb2 100644 --- a/src/or/hs_cache.h +++ b/src/or/hs_cache.h @@ -15,8 +15,34 @@ #include "crypto_ed25519.h" #include "hs_common.h" #include "hs_descriptor.h" +#include "rendcommon.h" #include "torcert.h" +/* This is the maximum time an introduction point state object can stay in the + * client cache in seconds (2 mins or 120 seconds). */ +#define HS_CACHE_CLIENT_INTRO_STATE_MAX_AGE (2 * 60) + +/* Introduction point state. */ +typedef struct hs_cache_intro_state_t { + /* When this entry was created and put in the cache. */ + time_t created_ts; + + /* Did it suffered a generic error? */ + unsigned int error : 1; + + /* Did it timed out? */ + unsigned int timed_out : 1; + + /* How many times we tried to reached it and it was unreachable. */ + uint32_t unreachable_count; +} hs_cache_intro_state_t; + +typedef struct hs_cache_client_intro_state_t { + /* Contains hs_cache_intro_state_t object indexed by introduction point + * authentication key. */ + digest256map_t *intro_points; +} hs_cache_client_intro_state_t; + /* Descriptor representation on the directory side which is a subset of * information that the HSDir can decode and serve it. */ typedef struct hs_cache_dir_descriptor_t { @@ -59,6 +85,15 @@ int hs_cache_store_as_client(const char *desc_str, const ed25519_public_key_t *identity_pk); void hs_cache_clean_as_client(time_t now); +/* Client failure cache. */ +void hs_cache_client_intro_state_note(const ed25519_public_key_t *service_pk, + const ed25519_public_key_t *auth_key, + rend_intro_point_failure_t failure); +const hs_cache_intro_state_t *hs_cache_client_intro_state_find( + const ed25519_public_key_t *service_pk, + const ed25519_public_key_t *auth_key); +void hs_cache_client_intro_state_clean(time_t now); + #ifdef HS_CACHE_PRIVATE /** Represents a locally cached HS descriptor on a hidden service client. */ diff --git a/src/or/main.c b/src/or/main.c index 3db0b5e90..20fec5009 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1847,6 +1847,7 @@ rend_cache_failure_clean_callback(time_t now, const or_options_t *options) * clean it as soon as we can since we want to make sure the client waits * as little as possible for reachability reasons. */ rend_cache_failure_clean(now); + hs_cache_client_intro_state_clean(now); return 30; }

1 0

[tor/master] prop224: Implement hs_client_any_intro_points_usable()
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit a64ef7d6c5f609229c4e6a25f1b18494a3ba6eea Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 27 17:15:19 2017 -0400 prop224: Implement hs_client_any_intro_points_usable() Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/connection_edge.c | 4 +++- src/or/hs_client.c | 34 ++++++++++++++++++++++++---------- src/or/hs_client.h | 3 ++- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3dd08b6d2..6409c5be8 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1501,7 +1501,9 @@ connection_ap_handle_onion(entry_connection_t *conn, cached_desc = hs_cache_lookup_as_client(&hs_conn_ident->identity_pk); if (cached_desc) { rend_cache_lookup_result = 0; - descriptor_is_usable = hs_client_any_intro_points_usable(cached_desc); + descriptor_is_usable = + hs_client_any_intro_points_usable(&hs_conn_ident->identity_pk, + cached_desc); log_info(LD_GENERAL, "Found %s descriptor in cache for %s. %s.", (descriptor_is_usable) ? "usable" : "unusable", safe_str_client(onion_address), diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 06cbcc409..e7e3eb72a 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -242,7 +242,8 @@ send_introduce1(origin_circuit_t *intro_circ, /* 1) Get descriptor from our cache. */ const hs_descriptor_t *desc = hs_cache_lookup_as_client(service_identity_pk); - if (desc == NULL || !hs_client_any_intro_points_usable(desc)) { + if (desc == NULL || !hs_client_any_intro_points_usable(service_identity_pk, + desc)) { log_info(LD_REND, "Request to %s %s. Trying to fetch a new descriptor.", safe_str_client(onion_address), (desc) ? "didn't have usable intro points" : @@ -479,7 +480,8 @@ client_get_random_intro(const ed25519_public_key_t *service_pk) tor_assert(service_pk); desc = hs_cache_lookup_as_client(service_pk); - if (desc == NULL || !hs_client_any_intro_points_usable(desc)) { + if (desc == NULL || !hs_client_any_intro_points_usable(service_pk, + desc)) { log_info(LD_REND, "Unable to randomly select an introduction point " "because descriptor %s.", (desc) ? "doesn't have usable intro point" : "is missing"); @@ -565,7 +567,8 @@ close_or_reextend_intro_circ(origin_circuit_t *intro_circ) } /* We still have the descriptor, great! Let's try to see if we can * re-extend by looking up if there are any usable intro points. */ - if (!hs_client_any_intro_points_usable(desc)) { + if (!hs_client_any_intro_points_usable(&intro_circ->hs_ident->identity_pk, + desc)) { goto close; } /* Try to re-extend now. */ @@ -824,14 +827,24 @@ hs_client_decode_descriptor(const char *desc_str, return -1; } -/** Return true if there are any usable intro points in the v3 HS descriptor - * desc. */ +/* Return true iff there are at least one usable intro point in the service + * descriptor desc. */ int -hs_client_any_intro_points_usable(const hs_descriptor_t *desc) +hs_client_any_intro_points_usable(const ed25519_public_key_t *service_pk, + const hs_descriptor_t *desc) { - /* XXX stub waiting for more client-side work: - equivalent to v2 rend_client_any_intro_points_usable() */ + tor_assert(service_pk); tor_assert(desc); + + SMARTLIST_FOREACH_BEGIN(desc->encrypted_data.intro_points, + const hs_desc_intro_point_t *, ip) { + if (intro_point_is_usable(service_pk, ip)) { + goto usable; + } + } SMARTLIST_FOREACH_END(ip); + + return 0; + usable: return 1; } @@ -856,7 +869,8 @@ hs_client_refetch_hsdesc(const ed25519_public_key_t *identity_pk) { const hs_descriptor_t *cached_desc = NULL; cached_desc = hs_cache_lookup_as_client(identity_pk); - if (cached_desc && hs_client_any_intro_points_usable(cached_desc)) { + if (cached_desc && hs_client_any_intro_points_usable(identity_pk, + cached_desc)) { log_warn(LD_GENERAL, "We would fetch a v3 hidden service descriptor " "but we already have a useable descriprot."); return 0; @@ -989,7 +1003,7 @@ hs_client_desc_has_arrived(const hs_ident_dir_conn_t *ident) goto end; } - if (!hs_client_any_intro_points_usable(desc)) { + if (!hs_client_any_intro_points_usable(&ident->identity_pk, desc)) { log_info(LD_REND, "Hidden service descriptor is unusable. " "Closing streams."); connection_mark_unattached_ap(entry_conn, diff --git a/src/or/hs_client.h b/src/or/hs_client.h index 440698788..8ed0501c9 100644 --- a/src/or/hs_client.h +++ b/src/or/hs_client.h @@ -20,7 +20,8 @@ int hs_client_decode_descriptor( const char *desc_str, const ed25519_public_key_t *service_identity_pk, hs_descriptor_t **desc); -int hs_client_any_intro_points_usable(const hs_descriptor_t *desc); +int hs_client_any_intro_points_usable(const ed25519_public_key_t *service_pk, + const hs_descriptor_t *desc); int hs_client_refetch_hsdesc(const ed25519_public_key_t *identity_pk); int hs_client_send_introduce1(origin_circuit_t *intro_circ,

1 0

[tor/master] test: Fix broken HS upload descriptor test
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit 520fcdf2f377909e980dfcc8baea4733476f096c Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Aug 11 15:41:23 2017 -0400 test: Fix broken HS upload descriptor test We can't trigger a valid upload because it would require us to MOCK a long list of functions ultimately not really testing the upload because we aren't on a running network. Signed-off-by: David Goulet <dgoulet(a)torproject.org> Conflicts: src/test/test_hs_service.c --- src/test/test_hs_service.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 7263e0457..c93197ac2 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1177,19 +1177,12 @@ test_build_update_descriptors(void *arg) UNMOCK(hs_overlap_mode_is_active); } -static int -mock_router_have_minimum_dir_info(void) -{ - return 1; -} - static void test_upload_descriptors(void *arg) { int ret; time_t now = time(NULL); hs_service_t *service; - hs_service_intro_point_t *ip; (void) arg; @@ -1227,29 +1220,10 @@ test_upload_descriptors(void *arg) /* If no upload happened, this should be untouched. */ tt_u64_op(service->desc_current->next_upload_time, OP_EQ, now + 1000); - /* Set our upload time in the past so we trigger an upload. */ - service->desc_current->next_upload_time = now - 1000; - service->desc_next->next_upload_time = now - 1000; - ip = helper_create_service_ip(); - ip->circuit_established = 1; - service_intro_point_add(service->desc_current->intro_points.map, ip); - - MOCK(networkstatus_get_live_consensus, - mock_networkstatus_get_live_consensus); - MOCK(router_have_minimum_dir_info, - mock_router_have_minimum_dir_info); - - setup_full_capture_of_logs(LOG_WARN); - run_upload_descriptor_event(now); - teardown_capture_of_logs(); - tt_u64_op(service->desc_current->next_upload_time, OP_GE, - now + HS_SERVICE_NEXT_UPLOAD_TIME_MIN); - tt_u64_op(service->desc_current->next_upload_time, OP_LE, - now + HS_SERVICE_NEXT_UPLOAD_TIME_MAX); - done: hs_free_all(); UNMOCK(hs_overlap_mode_is_active); + UNMOCK(get_or_state); } /** Test the functions that save and load HS revision counters to state. */

1 0

[tor/master] prop224: Update OOM counters when freeing a client descriptor cache object
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit 68887fdc5d4ff94cb8e88480e160349007d8a6a5 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 22 11:27:47 2017 -0400 prop224: Update OOM counters when freeing a client descriptor cache object When we free a client descriptor cache object, tell the OOM handler. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_cache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c index 28cb4d1bd..e0d89a70e 100644 --- a/src/or/hs_cache.c +++ b/src/or/hs_cache.c @@ -335,6 +335,8 @@ remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) { tor_assert(desc); digest256map_remove(hs_cache_v3_client, desc->key.pubkey); + /* Update cache size with this entry for the OOM handler. */ + rend_cache_decrement_allocation(cache_get_client_entry_size(desc)); } /* Store a given descriptor in our cache. */ @@ -608,7 +610,6 @@ cache_store_as_client(hs_cache_client_descriptor_t *client_desc) } /* Remove old entry. Make space for the new one! */ remove_v3_desc_as_client(cache_entry); - rend_cache_decrement_allocation(cache_get_client_entry_size(cache_entry)); cache_client_desc_free(cache_entry); } @@ -649,7 +650,8 @@ cache_clean_v3_as_client(time_t now) bytes_removed += entry_size; /* Entry is not in the cache anymore, destroy it. */ cache_client_desc_free(entry); - /* Update our cache entry allocation size for the OOM. */ + /* Update our OOM. We didn't use the remove() function because we are in + * a loop so we have to explicitely decrement. */ rend_cache_decrement_allocation(entry_size); /* Logging. */ {

1 0

[tor/master] prop224: Add directory_request_fetch_set_hs_ident()
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit 31da3898e72cc2b9e8c25f6b4e89d34bbb17737e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 9 11:45:29 2017 -0400 prop224: Add directory_request_fetch_set_hs_ident() Needed by the client when fetching a descriptor. This function checks the directory purpose and hard assert if it is not for fetching. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/directory.c | 14 ++++++++++++++ src/or/directory.h | 2 ++ src/or/hs_client.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index f3e76be62..57dfdd9ca 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1292,6 +1292,20 @@ directory_request_upload_set_hs_ident(directory_request_t *req, } req->hs_ident = ident; } +/** + * Set an object containing HS connection identifier to be associated with + * this fetch request. Note that only an alias to ident is stored, so + * the ident object must outlive the request. + */ +void +directory_request_fetch_set_hs_ident(directory_request_t *req, + const hs_ident_dir_conn_t *ident) +{ + if (ident) { + tor_assert(req->dir_purpose == DIR_PURPOSE_FETCH_HSDESC); + } + req->hs_ident = ident; +} /** Set a static circuit_guard_state_t object to affliate with the request in * req. This object will receive notification when the attempt to * connect to the guard either succeeds or fails. */ diff --git a/src/or/directory.h b/src/or/directory.h index 1acdff346..fc71bf800 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -75,6 +75,8 @@ void directory_request_set_rend_query(directory_request_t *req, const rend_data_t *query); void directory_request_upload_set_hs_ident(directory_request_t *req, const hs_ident_dir_conn_t *ident); +void directory_request_fetch_set_hs_ident(directory_request_t *req, + const hs_ident_dir_conn_t *ident); void directory_request_set_routerstatus(directory_request_t *req, const routerstatus_t *rs); diff --git a/src/or/hs_client.c b/src/or/hs_client.c index e7e3eb72a..77348f23e 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -102,7 +102,7 @@ directory_launch_v3_desc_fetch(const ed25519_public_key_t *onion_identity_pk, directory_request_set_routerstatus(req, hsdir); directory_request_set_indirection(req, DIRIND_ANONYMOUS); directory_request_set_resource(req, base64_blinded_pubkey); - directory_request_upload_set_hs_ident(req, &hs_conn_dir_ident); + directory_request_fetch_set_hs_ident(req, &hs_conn_dir_ident); directory_initiate_request(req); directory_request_free(req);

1 0

[tor/master] prop224: Update OOM counters when storing a client descriptor cache object
by nickm＠torproject.org 24 Aug '17

24 Aug '17

commit e046e6fb4816e118f1bb32bd709b5dce5b729994 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 22 11:30:11 2017 -0400 prop224: Update OOM counters when storing a client descriptor cache object Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_cache.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/or/hs_cache.c b/src/or/hs_cache.c index e0d89a70e..6962c5ce4 100644 --- a/src/or/hs_cache.c +++ b/src/or/hs_cache.c @@ -329,6 +329,14 @@ static digest256map_t *hs_cache_v3_client; * objects all related to a specific service. */ static digest256map_t *hs_cache_client_intro_state; +/* Return the size of a client cache entry in bytes. */ +static size_t +cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) +{ + return sizeof(*entry) + + strlen(entry->encoded_desc) + hs_desc_obj_size(entry->desc); +} + /* Remove a given descriptor from our cache. */ static void remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) @@ -345,6 +353,8 @@ store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { tor_assert(desc); digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); + /* Update cache size with this entry for the OOM handler. */ + rend_cache_increment_allocation(cache_get_client_entry_size(desc)); } /* Query our cache and return the entry or NULL if not found. */ @@ -355,14 +365,6 @@ lookup_v3_desc_as_client(const uint8_t *key) return digest256map_get(hs_cache_v3_client, key); } -/* Return the size of a client cache entry in bytes. */ -static size_t -cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) -{ - return sizeof(*entry) + - strlen(entry->encoded_desc) + hs_desc_obj_size(entry->desc); -} - /* Parse the encoded descriptor in desc_str using * service_identity_pk to decrypt it first. * @@ -616,9 +618,6 @@ cache_store_as_client(hs_cache_client_descriptor_t *client_desc) /* Store descriptor in cache */ store_v3_desc_as_client(client_desc); - /* Update cache size with this entry for the OOM handler. */ - rend_cache_increment_allocation(cache_get_client_entry_size(client_desc)); - done: return 0; }

1 0