sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-08-29 11:11:12 -04:00
parent ff2c31093a 6307a759ed
commit 7ed8037495
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug22159 Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes (hidden service):
- A service is allowed to open a maximum number of circuits for a specific
period of time. That value was lower than it should be (8 vs 12) in the
normal case of 3 introduction points. Fixes bug 22159.; bugfix on
tor-0.3.0.5-rc.
- Rate limit the log if we ever go above the maximum number of allowed
intro circuits. Fixes bug 22159.; bugfix on tor-0.3.1.1-alpha.

34
src/or/rendservice.c
View File

@ -1077,16 +1077,23 @@ rend_log_intro_limit(const rend_service_t *service, int min_severity)
}
time_t intro_period_elapsed = time(NULL) - service->intro_period_started;
tor_assert_nonfatal(intro_period_elapsed >= 0);
log_fn(severity, LD_REND, "Hidden service %s %s %d intro points in the last "
"%d seconds. Intro circuit launches are limited to %d per %d "
"seconds.",
service->service_id,
exceeded_limit ? "exceeded launch limit with" : "launched",
service->n_intro_circuits_launched,
(int)intro_period_elapsed,
rend_max_intro_circs_per_period(service->n_intro_points_wanted),
INTRO_CIRC_RETRY_PERIOD);
rend_service_dump_stats(severity);
{
char *msg;
static ratelim_t rlimit = RATELIM_INIT(INTRO_CIRC_RETRY_PERIOD);
if ((msg = rate_limit_log(&rlimit, approx_time()))) {
log_fn(severity, LD_REND,
"Hidden service %s %s %d intro points in the last %d seconds. "
"Intro circuit launches are limited to %d per %d seconds.%s",
service->service_id,
exceeded_limit ? "exceeded launch limit with" : "launched",
service->n_intro_circuits_launched,
(int)intro_period_elapsed,
rend_max_intro_circs_per_period(service->n_intro_points_wanted),
INTRO_CIRC_RETRY_PERIOD, msg);
rend_service_dump_stats(severity);
tor_free(msg);
}
}
}
/** Replace the old value of <b>service</b>-\>desc with one that reflects
@ -4093,7 +4100,12 @@ rend_max_intro_circs_per_period(unsigned int n_intro_points_wanted)
/* Allow all but one of the initial connections to fail and be
* retried. (If all fail, we *want* to wait, because something is broken.) */
tor_assert(n_intro_points_wanted <= NUM_INTRO_POINTS_MAX);
return (int)(2*n_intro_points_wanted + NUM_INTRO_POINTS_EXTRA);
/* For the normal use case, 3 intro points plus 2 extra for performance and
* allow that twice because once every 24h or so, we can do it twice for two
* descriptors that is the current one and the next one. So (3 + 2) * 2 ==
* 12 allowed attempts for one period. */
return ((n_intro_points_wanted + NUM_INTRO_POINTS_EXTRA) * 2);
}
/** For every service, check how many intro points it currently has, and: