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

hs-v3: Report introduction failure SOCKS ExtendedErrors

Browse Source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2019-12-11 09:50:43 -05:00
parent 1720a2191d
commit fdd6352506
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/feature/hs/hs_client.c
View File

@ -961,6 +961,20 @@ client_get_random_intro(const ed25519_public_key_t *service_pk)
return ei;
}
/** Called when introduction has failed meaning there is no more usable
* introduction points to be used (either NACKed or failed) for the given
* entry connection.
*
* This function only reports back the SOCKS5_HS_INTRO_FAILED (0xF2) code. The
* caller has to make sure to close the entry connections. */
static void
socks_report_introduction_failed(entry_connection_t *conn)
{
tor_assert(conn);
tor_assert(conn->socks_request);
conn->socks_request->socks_extended_error_code = SOCKS5_HS_INTRO_FAILED;
}
/** 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
@ -1313,6 +1327,10 @@ client_desc_has_arrived(const smartlist_t *entry_conns)
if (!hs_client_any_intro_points_usable(identity_pk, desc)) {
log_info(LD_REND, "Hidden service descriptor is unusable. "
"Closing streams.");
/* Report the extended socks error code that we were unable to introduce
* to the service. */
socks_report_introduction_failed(entry_conn);
connection_mark_unattached_ap(entry_conn,
END_STREAM_REASON_RESOLVEFAILED);
/* We are unable to use the descriptor so remove the directory request