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

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit 2e5eb029282696f68267cd106235b854f79771ed Merge: d6aa6549b bfcfeaed0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 13:22:14 2018 -0400 Merge branch 'maint-0.3.4'

1 0

[tor/release-0.3.4] Bug 26214: Test updates.
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit 46b06cd6999439608f4a8a34bb68f6fe6a6311e9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 19 19:53:58 2018 +0000 Bug 26214: Test updates. --- src/test/test_relaycell.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 841174982..1bd17b73b 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -240,11 +240,26 @@ test_circbw_relay(void *arg) circ->cpath); ASSERT_UNCOUNTED_BW(); - /* Sendme on stream: not counted */ + /* Sendme on valid stream: counted */ ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, circ->cpath); + ASSERT_COUNTED_BW(); + + /* Sendme on valid stream with full window: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + edgeconn->package_window = 500; + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, + circ->cpath); + ASSERT_UNCOUNTED_BW(); + + /* Sendme on unknown stream: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, + circ->cpath); ASSERT_UNCOUNTED_BW(); /* Sendme on circuit with full window: not counted */

1 0

[tor/master] Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3 Merge: cf8c3abff 46b06cd69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 13:22:07 2018 -0400 Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4 changes/bug26214 | 3 +++ src/or/or.h | 1 + src/or/relay.c | 24 ++++++++++++++++++++++-- src/test/test_relaycell.c | 17 ++++++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Bug 26214: Changes file.
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit 11d993869447d08a3fe4ab3b36d34fc53aa21ba1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun May 27 01:43:19 2018 +0000 Bug 26214: Changes file. --- changes/bug26214 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26214 b/changes/bug26214 new file mode 100644 index 000000000..4277b9c6e --- /dev/null +++ b/changes/bug26214 @@ -0,0 +1,3 @@ + o Minor bugfixes (correctness, flow control): + - Upon receiving a stream-level SENDME cell, verify that our window has + not grown too large. Fixes bug 26214; bugfix on svn r54 (pre-0.0.1)

1 0

[tor/release-0.3.4] Bug 26214: Check stream SENDME against max.
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit dc397f9a61e2e2caeea1acd46beab0e7205eaa9f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun May 27 01:42:35 2018 +0000 Bug 26214: Check stream SENDME against max. --- src/or/or.h | 1 + src/or/relay.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index e106ec66f..db8f9544f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -929,6 +929,7 @@ typedef enum { /** Initial value on both sides of a stream transmission window when the * stream is initialized. Measured in cells. */ #define STREAMWINDOW_START 500 +#define STREAMWINDOW_START_MAX 500 /** Amount to increment a stream window when we get a stream SENDME. */ #define STREAMWINDOW_INCREMENT 50 diff --git a/src/or/relay.c b/src/or/relay.c index 50f59d6b9..3632678af 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1752,8 +1752,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, circuit_resume_edge_reading(circ, layer_hint); /* We count circuit-level sendme's as valid delivered data because - * they are rate limited. Note that we cannot count stream - * sendme's because the other end could send as many as they like. + * they are rate limited. */ if (CIRCUIT_IS_ORIGIN(circ)) { circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), @@ -1783,6 +1782,27 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, rh.stream_id); return 0; } + + /* Don't allow the other endpoint to request more than our maximim + * (ie initial) stream SENDME window worth of data. Well-behaved + * stock clients will not request more than this max (as per the check + * in the while loop of connection_edge_consider_sending_sendme()). + */ + if (conn->package_window + STREAMWINDOW_INCREMENT > + STREAMWINDOW_START_MAX) { + static struct ratelim_t stream_warn_ratelim = RATELIM_INIT(600); + log_fn_ratelim(&stream_warn_ratelim,LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected stream sendme cell. Closing circ (window %d).", + conn->package_window); + return -END_CIRC_REASON_TORPROTOCOL; + } + + /* At this point, the stream sendme is valid */ + if (CIRCUIT_IS_ORIGIN(circ)) { + circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), + rh.length); + } + conn->package_window += STREAMWINDOW_INCREMENT; log_debug(domain,"stream-level sendme, packagewindow now %d.", conn->package_window);

1 0

[tor/release-0.3.4] Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3 Merge: cf8c3abff 46b06cd69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 13:22:07 2018 -0400 Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4 changes/bug26214 | 3 +++ src/or/or.h | 1 + src/or/relay.c | 24 ++++++++++++++++++++++-- src/test/test_relaycell.c | 17 ++++++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Bug 26214: Changes file.
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit 11d993869447d08a3fe4ab3b36d34fc53aa21ba1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun May 27 01:43:19 2018 +0000 Bug 26214: Changes file. --- changes/bug26214 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26214 b/changes/bug26214 new file mode 100644 index 000000000..4277b9c6e --- /dev/null +++ b/changes/bug26214 @@ -0,0 +1,3 @@ + o Minor bugfixes (correctness, flow control): + - Upon receiving a stream-level SENDME cell, verify that our window has + not grown too large. Fixes bug 26214; bugfix on svn r54 (pre-0.0.1)

1 0

[tor/maint-0.3.4] Bug 26214: Check stream SENDME against max.
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit dc397f9a61e2e2caeea1acd46beab0e7205eaa9f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun May 27 01:42:35 2018 +0000 Bug 26214: Check stream SENDME against max. --- src/or/or.h | 1 + src/or/relay.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index e106ec66f..db8f9544f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -929,6 +929,7 @@ typedef enum { /** Initial value on both sides of a stream transmission window when the * stream is initialized. Measured in cells. */ #define STREAMWINDOW_START 500 +#define STREAMWINDOW_START_MAX 500 /** Amount to increment a stream window when we get a stream SENDME. */ #define STREAMWINDOW_INCREMENT 50 diff --git a/src/or/relay.c b/src/or/relay.c index 50f59d6b9..3632678af 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1752,8 +1752,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, circuit_resume_edge_reading(circ, layer_hint); /* We count circuit-level sendme's as valid delivered data because - * they are rate limited. Note that we cannot count stream - * sendme's because the other end could send as many as they like. + * they are rate limited. */ if (CIRCUIT_IS_ORIGIN(circ)) { circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), @@ -1783,6 +1782,27 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, rh.stream_id); return 0; } + + /* Don't allow the other endpoint to request more than our maximim + * (ie initial) stream SENDME window worth of data. Well-behaved + * stock clients will not request more than this max (as per the check + * in the while loop of connection_edge_consider_sending_sendme()). + */ + if (conn->package_window + STREAMWINDOW_INCREMENT > + STREAMWINDOW_START_MAX) { + static struct ratelim_t stream_warn_ratelim = RATELIM_INIT(600); + log_fn_ratelim(&stream_warn_ratelim,LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected stream sendme cell. Closing circ (window %d).", + conn->package_window); + return -END_CIRC_REASON_TORPROTOCOL; + } + + /* At this point, the stream sendme is valid */ + if (CIRCUIT_IS_ORIGIN(circ)) { + circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), + rh.length); + } + conn->package_window += STREAMWINDOW_INCREMENT; log_debug(domain,"stream-level sendme, packagewindow now %d.", conn->package_window);

1 0

[tor/maint-0.3.4] Bug 26214: Test updates.
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit 46b06cd6999439608f4a8a34bb68f6fe6a6311e9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 19 19:53:58 2018 +0000 Bug 26214: Test updates. --- src/test/test_relaycell.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 841174982..1bd17b73b 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -240,11 +240,26 @@ test_circbw_relay(void *arg) circ->cpath); ASSERT_UNCOUNTED_BW(); - /* Sendme on stream: not counted */ + /* Sendme on valid stream: counted */ ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, circ->cpath); + ASSERT_COUNTED_BW(); + + /* Sendme on valid stream with full window: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + edgeconn->package_window = 500; + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, + circ->cpath); + ASSERT_UNCOUNTED_BW(); + + /* Sendme on unknown stream: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, + circ->cpath); ASSERT_UNCOUNTED_BW(); /* Sendme on circuit with full window: not counted */

1 0

[tor/maint-0.3.4] Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
by nickm＠torproject.org 02 Jul '18

02 Jul '18

commit bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3 Merge: cf8c3abff 46b06cd69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 13:22:07 2018 -0400 Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4 changes/bug26214 | 3 +++ src/or/or.h | 1 + src/or/relay.c | 24 ++++++++++++++++++++++-- src/test/test_relaycell.c | 17 ++++++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-)

1 0