mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1
This commit is contained in:
commit
00a42277ea
8
changes/bug24895
Normal file
8
changes/bug24895
Normal 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.
|
||||
|
@ -344,3 +344,20 @@ rend_data_get_pk_digest(const rend_data_t *rend_data, size_t *len_out)
|
||||
}
|
||||
}
|
||||
|
||||
/* 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? */
|
||||
int
|
||||
hs_get_service_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);
|
||||
}
|
||||
|
||||
|
@ -52,6 +52,7 @@
|
||||
int hs_check_service_private_dir(const char *username, const char *path,
|
||||
unsigned int dir_group_readable,
|
||||
unsigned int create);
|
||||
int hs_get_service_max_rend_failures(void);
|
||||
|
||||
void rend_data_free(rend_data_t *data);
|
||||
rend_data_t *rend_data_dup(const rend_data_t *data);
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include "rendservice.h"
|
||||
#include "circuitlist.h"
|
||||
#include "circpathbias.h"
|
||||
#include "networkstatus.h"
|
||||
|
||||
#include "hs_intropoint.h"
|
||||
#include "hs_service.h"
|
||||
|
@ -2159,7 +2159,8 @@ rend_service_receive_introduction(origin_circuit_t *circuit,
|
||||
|
||||
/* Launch a circuit to the client's chosen rendezvous point.
|
||||
*/
|
||||
for (i=0;i<MAX_REND_FAILURES;i++) {
|
||||
int max_rend_failures=hs_get_service_max_rend_failures();
|
||||
for (i=0;i<max_rend_failures;i++) {
|
||||
int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL;
|
||||
if (circ_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME;
|
||||
/* A Single Onion Service only uses a direct connection if its
|
||||
@ -3067,8 +3068,13 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc)
|
||||
}
|
||||
oldcirc->hs_service_side_rend_circ_has_been_relaunched = 1;
|
||||
|
||||
/* We check failure_count >= hs_get_service_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 = hs_get_service_max_rend_failures() - 1;
|
||||
|
||||
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)) {
|
||||
log_info(LD_REND,
|
||||
"Attempt to build circuit to %s for rendezvous has failed "
|
||||
|
Loading…
Reference in New Issue
Block a user