January 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 129456e22257d24c380bed0f9ebc9d68955a01df Merge: de3cf40fa 7f2e23e7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:30:50 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 00a42277eaa5838e5b7d0b07a53db01780232511 Merge: 483a59ec2 f98f7ca89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:30:02 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1 changes/bug24895 | 8 ++++++++ src/or/hs_common.c | 17 +++++++++++++++++ src/or/hs_common.h | 1 + src/or/hs_service.c | 1 + src/or/rendservice.c | 10 ++++++++-- 5 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit a2aaf9509ba578f4e7705b506ee9a0f764d24ff2 Merge: 36567c5ca 490ae26b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:29:15 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9 changes/bug24895 | 8 ++++++++ src/or/rendservice.c | 29 ++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 00a42277eaa5838e5b7d0b07a53db01780232511 Merge: 483a59ec2 f98f7ca89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:30:02 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1 changes/bug24895 | 8 ++++++++ src/or/hs_common.c | 17 +++++++++++++++++ src/or/hs_common.h | 1 + src/or/hs_service.c | 1 + src/or/rendservice.c | 10 ++++++++-- 5 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 129456e22257d24c380bed0f9ebc9d68955a01df Merge: de3cf40fa 7f2e23e7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:30:50 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 7f2e23e7acc0735e5ae933535a1b617a0860e528 Merge: 00a42277e b39c50cde Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:30:12 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid maint-0.3.0's version of 24895.

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit de3cf40fa658d62a61bb620c9dba8e90105da339 Merge: e2aacf100 f870f9c8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:30:44 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2 changes/bug24895 | 8 ++++++++ src/or/hs_circuit.c | 7 ++++++- src/or/hs_common.c | 17 +++++++++++++++++ src/or/hs_common.h | 2 ++ src/or/rendservice.c | 4 ++-- 5 files changed, 35 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit b39c50cde8b1d7e3e27d5a6fc2e58ff208982637 Merge: 1cf11b694 a2aaf9509 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 16:29:43 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 Conflicts: src/or/rendservice.c changes/bug24895 | 8 ++++++++ src/or/rendservice.c | 26 ++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] MAX_REND_FAILURES is 1, but we would try three times
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit a15eb9ff439623f800de813c1a78eeb5d61f7f5a Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jan 15 16:30:55 2018 -0500 MAX_REND_FAILURES is 1, but we would try three times 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. Fixes bug 24895; bugfix on 0.0.6. --- changes/bug24895 | 6 ++++++ src/or/rendservice.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug24895 b/changes/bug24895 new file mode 100644 index 000000000..7b90f6d26 --- /dev/null +++ b/changes/bug24895 @@ -0,0 +1,6 @@ + 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. Fixes bug 24895; bugfix on 0.0.6. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index a8c383444..acc431a57 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2930,8 +2930,11 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) } oldcirc->hs_service_side_rend_circ_has_been_relaunched = 1; + /* We check failure_count >= MAX_REND_FAILURES-1 below rather than + * failure_count >= MAX_REND_FAILURES, because we increment the failure + * count for our current failure *after* this clause. */ if (!oldcirc->build_state || - oldcirc->build_state->failure_count > MAX_REND_FAILURES || + oldcirc->build_state->failure_count >= MAX_REND_FAILURES-1 || oldcirc->build_state->expiry_time < time(NULL)) { log_info(LD_REND, "Attempt to build circuit to %s for rendezvous has failed "

1 0

[tor/release-0.3.0] turn MAX_REND_FAILURES into a function
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit cc5a9e96674f39677a65daa2f7a2f5af7ac3106e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jan 19 02:38:07 2018 -0500 turn MAX_REND_FAILURES into a function no actual changes in behavior --- src/or/rendservice.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index acc431a57..b503eda7f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -108,13 +108,18 @@ struct rend_service_port_config_s { /** Don't try to build more than this many circuits before giving up * for a while.*/ #define MAX_INTRO_CIRCS_PER_PERIOD 10 -/** How many times will a hidden service operator attempt to connect to - * a requested rendezvous point before giving up? */ -#define MAX_REND_FAILURES 1 /** How many seconds should we spend trying to connect to a requested * rendezvous point before giving up? */ #define MAX_REND_TIMEOUT 30 +/** 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 1; +} + /* Hidden service directory file names: * new file names should be added to rend_service_add_filenames_to_list() * for sandboxing purposes. */ @@ -2028,7 +2033,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=get_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 @@ -2930,11 +2936,13 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) } oldcirc->hs_service_side_rend_circ_has_been_relaunched = 1; - /* We check failure_count >= MAX_REND_FAILURES-1 below rather than - * failure_count >= MAX_REND_FAILURES, because we increment the failure - * count for our current failure *after* this clause. */ + /* 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 || - oldcirc->build_state->failure_count >= MAX_REND_FAILURES-1 || + 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 "

1 0