April 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Merge branch 'bug15515_024' into maint-0.2.4
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 01e4bc80cd75bbf2a4ce3b18ff17550eed993bb0 Merge: 5f46a59 bcb8393 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 3 09:36:59 2015 -0400 Merge branch 'bug15515_024' into maint-0.2.4 changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 3781955f079f25f8d6aa47cb746e339497076050 Merge: 9063f29 01e4bc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 3 09:38:54 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 53a605ee001f54c80352e92e1c714ab9b8a08bab Merge: cfb61f9 3781955 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 3 09:52:15 2015 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)

1 0

[tor/master] Decrease the amount of rend circ relaunches for hidden services.
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 929a8f199bc236c39794f675a7bb8ad00b155257 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 2 15:58:33 2015 +0100 Decrease the amount of rend circ relaunches for hidden services. --- changes/bug11447 | 5 +++++ src/or/rendservice.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug11447 b/changes/bug11447 new file mode 100644 index 0000000..8cd4f5b --- /dev/null +++ b/changes/bug11447 @@ -0,0 +1,5 @@ + o Minor features (DoS-resistance): + - Decrease the amount of reattempts that a hidden service is + willing to perform when its rendezvous circuits fail. This + reduces the computational cost for hidden service under heavy + load. Resolves ticket #11447. \ No newline at end of file diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6c934c8..4ae06df 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -90,7 +90,7 @@ typedef struct rend_service_port_config_t { #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 8 +#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

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 24352d0d70542d43588a5c5a6da3f63a317d049d Merge: 8656cbc 929a8f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 3 09:47:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug11447 | 5 +++++ src/or/rendservice.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.6] Decrease the amount of rend circ relaunches for hidden services.
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 929a8f199bc236c39794f675a7bb8ad00b155257 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 2 15:58:33 2015 +0100 Decrease the amount of rend circ relaunches for hidden services. --- changes/bug11447 | 5 +++++ src/or/rendservice.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug11447 b/changes/bug11447 new file mode 100644 index 0000000..8cd4f5b --- /dev/null +++ b/changes/bug11447 @@ -0,0 +1,5 @@ + o Minor features (DoS-resistance): + - Decrease the amount of reattempts that a hidden service is + willing to perform when its rendezvous circuits fail. This + reduces the computational cost for hidden service under heavy + load. Resolves ticket #11447. \ No newline at end of file diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 6c934c8..4ae06df 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -90,7 +90,7 @@ typedef struct rend_service_port_config_t { #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 8 +#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

1 0

[tor/master] ... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit bcb839387ef65c0a87ca0a6b7957c3062188c601 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 2 13:38:52 2015 +0100 ... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit (Sending a nak would be pointless.) See ticket 15515 for discussion. --- src/or/rendmid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 2f75ffb..0a005a6 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -157,7 +157,8 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, "Blocking multiple introductions on the same circuit. " "Someone might be trying to attack a hidden service through " "this relay."); - goto err; + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + return -1; } circ->already_received_introduce1 = 1;

1 0

[tor/master] Merge branch 'bug15515_024' into maint-0.2.4
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 01e4bc80cd75bbf2a4ce3b18ff17550eed993bb0 Merge: 5f46a59 bcb8393 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 3 09:36:59 2015 -0400 Merge branch 'bug15515_024' into maint-0.2.4 changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit 3781955f079f25f8d6aa47cb746e339497076050 Merge: 9063f29 01e4bc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 3 09:38:54 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 03 Apr '15

03 Apr '15

commit c1b36488e9c318fc414220e8549624b423560ad2 Merge: b117a06 3781955 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 3 09:39:19 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)

1 0