August 2017 - tor-commits - lists.torproject.org

[torspec/master] prop224: Fix ordering of the hsdir_index construction
by dgoulet＠torproject.org 29 Aug '17

29 Aug '17

commit 3bdbe6c9f290603c51c9b6700df5473f5c8b9073 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 29 12:08:25 2017 -0400 prop224: Fix ordering of the hsdir_index construction Turns out that it was implemented with period_num first and then period_length. Like asn said, let us consider that as an interesting engineering artifact and change the spec instead of the code that has been tested like that for a while now. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index dda7eb2..8ee5cdd 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -797,8 +797,8 @@ Table of contents: hsdir_index(node) = H("node-idx" | node_identity | shared_random_value | - INT_8(period_length) | - INT_8(period_num) ) + INT_8(period_num) | + INT_8(period_length) ) where shared_random_value is the shared value generated by the authorities in section [PUB-SHAREDRANDOM], and node_identity is the ed25519 identity

1 0

[tor/master] hs: Fix the intro circuit max retry
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 6507ecb7e8751b3b66886306bfae3ca846bd0f81 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Aug 28 14:31:32 2017 -0400 hs: Fix the intro circuit max retry Some parentheses were missing making the rend_max_intro_circs_per_period() return a lower value than it was suppose to. The calculation is that a service at most will open a number of intro points that it wants which is 3 by default or HiddenServiceNumIntroductionPoints. Two extra are launched for performance reason. Finally, this can happen twice for two descriptors for the current and next time period. From: 2 * n_intro_wanted + 2 ...which resulted in 8 for 3 intro points, this commit fixes it to: (n_intro_wanted + 2) * 2 ... resulting in 12 possible intro point circuit which is the correct maximum intro circuit allowed per period. Last, this commit rate limits the the log message if we ever go above that limit else over a INTRO_CIRC_RETRY_PERIOD, we can print it often! Fixes #22159 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/changes/bug22159 b/changes/bug22159 new file mode 100644 index 000000000..c319c7e32 --- /dev/null +++ b/changes/bug22159 @@ -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. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ede887945..2236fcca7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -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 service-\>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:

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 209bfe715cc8c1c59b2578c406749a0d4a5bd8cb Merge: be0127ff0 6307a759e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 29 11:11:12 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 6307a759ed5ce48f31a5c36b08f2563cbb226389 Merge: 5e08cf350 6507ecb7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 29 11:11:09 2017 -0400 Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1 changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-)

1 0

[tor/release-0.3.1] hs: Fix the intro circuit max retry
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 6507ecb7e8751b3b66886306bfae3ca846bd0f81 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Aug 28 14:31:32 2017 -0400 hs: Fix the intro circuit max retry Some parentheses were missing making the rend_max_intro_circs_per_period() return a lower value than it was suppose to. The calculation is that a service at most will open a number of intro points that it wants which is 3 by default or HiddenServiceNumIntroductionPoints. Two extra are launched for performance reason. Finally, this can happen twice for two descriptors for the current and next time period. From: 2 * n_intro_wanted + 2 ...which resulted in 8 for 3 intro points, this commit fixes it to: (n_intro_wanted + 2) * 2 ... resulting in 12 possible intro point circuit which is the correct maximum intro circuit allowed per period. Last, this commit rate limits the the log message if we ever go above that limit else over a INTRO_CIRC_RETRY_PERIOD, we can print it often! Fixes #22159 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/changes/bug22159 b/changes/bug22159 new file mode 100644 index 000000000..c319c7e32 --- /dev/null +++ b/changes/bug22159 @@ -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. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ede887945..2236fcca7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -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 service-\>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:

1 0

[tor/maint-0.3.1] hs: Fix the intro circuit max retry
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 6507ecb7e8751b3b66886306bfae3ca846bd0f81 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Aug 28 14:31:32 2017 -0400 hs: Fix the intro circuit max retry Some parentheses were missing making the rend_max_intro_circs_per_period() return a lower value than it was suppose to. The calculation is that a service at most will open a number of intro points that it wants which is 3 by default or HiddenServiceNumIntroductionPoints. Two extra are launched for performance reason. Finally, this can happen twice for two descriptors for the current and next time period. From: 2 * n_intro_wanted + 2 ...which resulted in 8 for 3 intro points, this commit fixes it to: (n_intro_wanted + 2) * 2 ... resulting in 12 possible intro point circuit which is the correct maximum intro circuit allowed per period. Last, this commit rate limits the the log message if we ever go above that limit else over a INTRO_CIRC_RETRY_PERIOD, we can print it often! Fixes #22159 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/changes/bug22159 b/changes/bug22159 new file mode 100644 index 000000000..c319c7e32 --- /dev/null +++ b/changes/bug22159 @@ -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. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ede887945..2236fcca7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -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 service-\>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:

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 6307a759ed5ce48f31a5c36b08f2563cbb226389 Merge: 5e08cf350 6507ecb7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 29 11:11:09 2017 -0400 Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1 changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 6307a759ed5ce48f31a5c36b08f2563cbb226389 Merge: 5e08cf350 6507ecb7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 29 11:11:09 2017 -0400 Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1 changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 7ed803749595d9d22a1cf021430b8ec6a3432943 Merge: ff2c31093 6307a759e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 29 11:11:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-)

1 0

[tor/release-0.3.1] Add test_hs_descriptor.inc to include.am to unbreak distcheck.
by nickm＠torproject.org 29 Aug '17

29 Aug '17

commit 5e08cf350bfa0157b1be62753bdf4dc6b8dd2988 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 23 13:08:59 2017 -0400 Add test_hs_descriptor.inc to include.am to unbreak distcheck. --- src/test/include.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/include.am b/src/test/include.am index 29ba1ce7c..d5ae0bec1 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -275,6 +275,7 @@ noinst_HEADERS+= \ src/test/failing_routerdescs.inc \ src/test/ed25519_vectors.inc \ src/test/test_descriptors.inc \ + src/test/test_hs_descriptor.inc \ src/test/vote_descriptors.inc noinst_PROGRAMS+= src/test/test-ntor-cl

1 0