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

Merge branch 'maint-0.2.9' into maint-0.3.0

Browse Source 
Conflicts:
        src/or/rendservice.c
This commit is contained in:
Nick Mathewson 2018-01-19 16:29:43 -05:00
commit b39c50cde8
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug24895 Normal file
View File

@ -0,0 +1,8 @@
o Major bugfixes (onion services):
- Fix an "off by 2" error in counting rendezvous failures on the onion
service side. While we thought we would stop the rendezvous attempt
after one failed circuit, we were actually making three circuit attempts
before giving up. Now switch to a default of 2, and allow the consensus
parameter "hs_service_max_rdv_failures" to override. Fixes bug 24895;
bugfix on 0.0.6.

26
src/or/rendservice.c
View File

@ -116,6 +116,22 @@ struct rend_service_port_config_s {
/** How many seconds should we spend trying to connect to a requested /** How many seconds should we spend trying to connect to a requested
* rendezvous point before giving up? */ * rendezvous point before giving up? */
#define MAX_REND_TIMEOUT 30 #define MAX_REND_TIMEOUT 30
/* Default, minimum and maximum values for the maximum rendezvous failures
* consensus parameter. */
#define MAX_REND_FAILURES_DEFAULT 2
#define MAX_REND_FAILURES_MIN 1
#define MAX_REND_FAILURES_MAX 10
/** How many times will a hidden service operator attempt to connect to
* a requested rendezvous point before giving up? */
static int
get_max_rend_failures(void)
{
return networkstatus_get_param(NULL, "hs_service_max_rdv_failures",
MAX_REND_FAILURES_DEFAULT,
MAX_REND_FAILURES_MIN,
MAX_REND_FAILURES_MAX);
}
/* Hidden service directory file names: /* Hidden service directory file names:
* new file names should be added to rend_service_add_filenames_to_list() * new file names should be added to rend_service_add_filenames_to_list()
@ -2092,7 +2108,8 @@ rend_service_receive_introduction(origin_circuit_t *circuit,
/* Launch a circuit to the client's chosen rendezvous point. /* Launch a circuit to the client's chosen rendezvous point.
*/ */
for (i=0;i<MAX_REND_FAILURES;i++) { int max_rend_failures=get_max_rend_failures();
for (i=0;i<max_rend_failures;i++) {
int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL; int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL;
if (circ_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME; if (circ_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME;
/* A Single Onion Service only uses a direct connection if its /* A Single Onion Service only uses a direct connection if its
@ -2993,8 +3010,13 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc)
} }
oldcirc->hs_service_side_rend_circ_has_been_relaunched = 1; oldcirc->hs_service_side_rend_circ_has_been_relaunched = 1;
/* We check failure_count >= get_max_rend_failures()-1 below, and the -1
* is because we increment the failure count for our current failure
* *after* this clause. */
int max_rend_failures = get_max_rend_failures() - 1;
if (!oldcirc->build_state || if (!oldcirc->build_state ||
oldcirc->build_state->failure_count > MAX_REND_FAILURES || oldcirc->build_state->failure_count >= max_rend_failures ||
oldcirc->build_state->expiry_time < time(NULL)) { oldcirc->build_state->expiry_time < time(NULL)) {
log_info(LD_REND, log_info(LD_REND,
"Attempt to build circuit to %s for rendezvous has failed " "Attempt to build circuit to %s for rendezvous has failed "