nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

hs-v3: Close all SOCKS request on descriptor failure

Browse Source 
Client side, when a descriptor is finally fetched and stored in the cache, we
then go over all pending SOCKS request for that descriptor. If it turns out
that the intro points are unusable, we close the first SOCKS request but not
the others for the same .onion.

This commit makes it that we'll close all SOCKS requests so we don't let
hanging the other ones.

It also fixes another bug which is having a SOCKS connection in RENDDESC_WAIT
state but with a descriptor in the cache. At some point, tor will expire the
intro failure cache which will make that descriptor usable again. When
retrying all SOCKS connection (retry_all_socks_conn_waiting_for_desc()), we
won't end up in the code path where we have already the descriptor for a
pending request causing a BUG().

Bottom line is that we should never have pending requests (waiting for a
descriptor) with that descriptor in the cache (even if unusable).

Fixees #27410.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-09-19 10:56:15 -04:00
parent d1a6043bfb
commit fa6d5dd268
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket27410 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (hidden service v3):
- Close all SOCKS request (for the same .onion) if the newly fetched
descriptor is unusable. Before that, we would close only the first one
leaving the other hanging and let to time out by themselves. Fixes bug
27410; bugfix on 0.3.2.1-alpha.

2
src/or/hs_client.c
View File

@ -1423,7 +1423,7 @@ hs_client_desc_has_arrived(const hs_ident_dir_conn_t *ident)
/* We are unable to use the descriptor so remove the directory request /* We are unable to use the descriptor so remove the directory request
* from the cache so the next connection can try again. */ * from the cache so the next connection can try again. */
note_connection_attempt_succeeded(edge_conn->hs_ident); note_connection_attempt_succeeded(edge_conn->hs_ident);
goto end; continue;
} }
log_info(LD_REND, "Descriptor has arrived. Launching circuits."); log_info(LD_REND, "Descriptor has arrived. Launching circuits.");