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

hs: Handled REND_JOINED circuit when getting an INTRODUCE_ACK

Browse Source 
Because we can get a RENDEZVOUS2 cell before the INTRODUCE_ACK, we need to
correctly handle the circuit purpose REND_JOINED that is not change its
purpose when we get an INTRODUCE_ACK and simply close the intro circuit
normally.

Fixes #23455

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2017-09-11 11:06:22 -04:00
parent 67a5d4cb60
commit b71f4ecb8d
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/or/hs_circuitmap.c
View File

@ -407,9 +407,20 @@ hs_circuitmap_get_rend_circ_service_side(const uint8_t *cookie)
} }
/* Public function: Return client-side rendezvous circuit with rendezvous /* Public function: Return client-side rendezvous circuit with rendezvous
* <b>cookie</b>. It will first lookup for the CIRCUIT_PURPOSE_C_REND_READY * <b>cookie</b>. It will look for circuits with the following purposes:
* purpose and then try for CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED and then
* finally tries for CIRCUIT_PURPOSE_C_ESTABLISH_REND. * a) CIRCUIT_PURPOSE_C_REND_READY: Established rend circuit (received
* RENDEZVOUS_ESTABLISHED). Waiting for RENDEZVOUS2 from service, and for
* INTRODUCE_ACK from intro point.
*
* b) CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: Established rend circuit and
* introduce circuit acked. Waiting for RENDEZVOUS2 from service.
*
* c) CIRCUIT_PURPOSE_C_REND_JOINED: Established rend circuit and received
* RENDEZVOUS2 from service.
*
* d) CIRCUIT_PURPOSE_C_ESTABLISH_REND: Rend circuit open but not yet
* established.
* *
* Return NULL if no such circuit is found in the circuitmap. */ * Return NULL if no such circuit is found in the circuitmap. */
origin_circuit_t * origin_circuit_t *
@ -431,6 +442,13 @@ hs_circuitmap_get_rend_circ_client_side(const uint8_t *cookie)
return circ; return circ;
} }
circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE,
REND_TOKEN_LEN, cookie,
CIRCUIT_PURPOSE_C_REND_JOINED);
if (circ) {
return circ;
}
circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE,
REND_TOKEN_LEN, cookie, REND_TOKEN_LEN, cookie,
CIRCUIT_PURPOSE_C_ESTABLISH_REND); CIRCUIT_PURPOSE_C_ESTABLISH_REND);

8
src/or/hs_client.c
View File

@ -746,6 +746,14 @@ handle_introduce_ack_success(origin_circuit_t *intro_circ)
} }
assert_circ_anonymity_ok(rend_circ, get_options()); assert_circ_anonymity_ok(rend_circ, get_options());
/* It is possible to get a RENDEZVOUS2 cell before the INTRODUCE_ACK which
* means that the circuit will be joined and already transmitting data. In
* that case, simply skip the purpose change and close the intro circuit
* like it should be. */
if (TO_CIRCUIT(rend_circ)->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) {
goto end;
}
circuit_change_purpose(TO_CIRCUIT(rend_circ), circuit_change_purpose(TO_CIRCUIT(rend_circ),
CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED); CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED);
/* Set timestamp_dirty, because circuit_expire_building expects it to /* Set timestamp_dirty, because circuit_expire_building expects it to