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

[tor/master] Warn and drop the circuit if we receive an inbound 'relay early' cell
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 02:44:05 2014 -0400 Warn and drop the circuit if we receive an inbound 'relay early' cell Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor versions are long gone from the network so we can afford to resume watching for them. Resolves the rest of bug 1038; bugfix on 0.2.1.19. --- changes/bug1038-3 | 6 ++++++ src/or/command.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/changes/bug1038-3 b/changes/bug1038-3 new file mode 100644 index 0000000..5af4afa --- /dev/null +++ b/changes/bug1038-3 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Warn and drop the circuit if we receive an inbound 'relay early' + cell. Those used to be normal to receive on hidden service circuits + due to bug 1038, but the buggy Tor versions are long gone from + the network so we can afford to resume watching for them. Resolves + the rest of bug 1038; bugfix on 0.2.1.19. diff --git a/src/or/command.c b/src/or/command.c index 51d07b0..78fd4fa 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -443,10 +443,22 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) * gotten no more than MAX_RELAY_EARLY_CELLS_PER_CIRCUIT of them. */ if (cell->command == CELL_RELAY_EARLY) { if (direction == CELL_DIRECTION_IN) { - /* Allow an unlimited number of inbound relay_early cells, - * for hidden service compatibility. There isn't any way to make - * a long circuit through inbound relay_early cells anyway. See - * bug 1038. -RD */ + /* Inbound early cells could once be encountered as a result of + * bug 1038; but relays running versions before 0.2.1.19 are long + * gone from the network, so any such cells now are surprising. */ + log_warn(LD_OR, + "Received an inbound RELAY_EARLY cell on circuit %u." + " Closing circuit. Please report this event," + " along with the following message.", + (unsigned)cell->circ_id); + if (CIRCUIT_IS_ORIGIN(circ)) { + circuit_log_path(LOG_WARN, LD_OR, TO_ORIGIN_CIRCUIT(circ)); + } else if (circ->n_chan) { + log_warn(LD_OR, " upstream=%s", + channel_get_actual_remote_descr(circ->n_chan)); + } + circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); + return; } else { or_circuit_t *or_circ = TO_OR_CIRCUIT(circ); if (or_circ->remaining_relay_early_cells == 0) {

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 29a82b5a8b6d5e75a1f8b880933c2a232458d386 Merge: 2126fea 68a2e4c Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 02:47:15 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug1038-3 | 6 ++++++ changes/bug12718 | 5 +++++ src/or/command.c | 20 ++++++++++++++++---- src/or/control.c | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5'
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 6c4a26b8ca3d8f61f55ad63baea2090e44fbc126 Merge: 3f39c0e 29a82b5 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 02:47:43 2014 -0400 Merge branch 'maint-0.2.5' changes/bug1038-3 | 6 ++++++ changes/bug12718 | 5 +++++ src/or/command.c | 20 ++++++++++++++++---- src/or/control.c | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.5] Confusing log message when circuit can't be extended
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 8f70d756fb5af54cc184d4683e445161f91cf1d1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Jul 27 18:05:01 2014 +0200 Confusing log message when circuit can't be extended --- src/or/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c index a88de12..ae9dd69 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2506,7 +2506,7 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len, goto done; } if (!node_has_descriptor(node)) { - connection_printf_to_buf(conn, "552 descriptor for \"%s\"\r\n", n); + connection_printf_to_buf(conn, "552 No descriptor for \"%s\"\r\n", n); goto done; } smartlist_add(nodes, (void*)node);

1 0

[tor/maint-0.2.5] add a changes file for bug 12718
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 8882dcfc598edde4d78c14ea0b90c8ed7f189274 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jul 27 15:41:30 2014 -0400 add a changes file for bug 12718 --- changes/bug12718 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug12718 b/changes/bug12718 new file mode 100644 index 0000000..0c5f708 --- /dev/null +++ b/changes/bug12718 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Correct a confusing error message when trying to extend a circuit + via the control protocol but we don't know a descriptor or + microdescriptor for one of the specified relays. Fixes bug 12718; + bugfix on 0.2.3.1-alpha.

1 0

[tor/maint-0.2.5] Warn and drop the circuit if we receive an inbound 'relay early' cell
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 02:44:05 2014 -0400 Warn and drop the circuit if we receive an inbound 'relay early' cell Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor versions are long gone from the network so we can afford to resume watching for them. Resolves the rest of bug 1038; bugfix on 0.2.1.19. --- changes/bug1038-3 | 6 ++++++ src/or/command.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/changes/bug1038-3 b/changes/bug1038-3 new file mode 100644 index 0000000..5af4afa --- /dev/null +++ b/changes/bug1038-3 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Warn and drop the circuit if we receive an inbound 'relay early' + cell. Those used to be normal to receive on hidden service circuits + due to bug 1038, but the buggy Tor versions are long gone from + the network so we can afford to resume watching for them. Resolves + the rest of bug 1038; bugfix on 0.2.1.19. diff --git a/src/or/command.c b/src/or/command.c index 51d07b0..78fd4fa 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -443,10 +443,22 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) * gotten no more than MAX_RELAY_EARLY_CELLS_PER_CIRCUIT of them. */ if (cell->command == CELL_RELAY_EARLY) { if (direction == CELL_DIRECTION_IN) { - /* Allow an unlimited number of inbound relay_early cells, - * for hidden service compatibility. There isn't any way to make - * a long circuit through inbound relay_early cells anyway. See - * bug 1038. -RD */ + /* Inbound early cells could once be encountered as a result of + * bug 1038; but relays running versions before 0.2.1.19 are long + * gone from the network, so any such cells now are surprising. */ + log_warn(LD_OR, + "Received an inbound RELAY_EARLY cell on circuit %u." + " Closing circuit. Please report this event," + " along with the following message.", + (unsigned)cell->circ_id); + if (CIRCUIT_IS_ORIGIN(circ)) { + circuit_log_path(LOG_WARN, LD_OR, TO_ORIGIN_CIRCUIT(circ)); + } else if (circ->n_chan) { + log_warn(LD_OR, " upstream=%s", + channel_get_actual_remote_descr(circ->n_chan)); + } + circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); + return; } else { or_circuit_t *or_circ = TO_OR_CIRCUIT(circ); if (or_circ->remaining_relay_early_cells == 0) {

1 0

[tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 29a82b5a8b6d5e75a1f8b880933c2a232458d386 Merge: 2126fea 68a2e4c Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 02:47:15 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug1038-3 | 6 ++++++ changes/bug12718 | 5 +++++ src/or/command.c | 20 ++++++++++++++++---- src/or/control.c | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.4] Warn and drop the circuit if we receive an inbound 'relay early' cell
by arma＠torproject.org 28 Jul '14

28 Jul '14

commit 68a2e4ca4baa595cc4595a511db11fa7ccbbc8f7 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 28 02:44:05 2014 -0400 Warn and drop the circuit if we receive an inbound 'relay early' cell Those used to be normal to receive on hidden service circuits due to bug 1038, but the buggy Tor versions are long gone from the network so we can afford to resume watching for them. Resolves the rest of bug 1038; bugfix on 0.2.1.19. --- changes/bug1038-3 | 6 ++++++ src/or/command.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/changes/bug1038-3 b/changes/bug1038-3 new file mode 100644 index 0000000..5af4afa --- /dev/null +++ b/changes/bug1038-3 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Warn and drop the circuit if we receive an inbound 'relay early' + cell. Those used to be normal to receive on hidden service circuits + due to bug 1038, but the buggy Tor versions are long gone from + the network so we can afford to resume watching for them. Resolves + the rest of bug 1038; bugfix on 0.2.1.19. diff --git a/src/or/command.c b/src/or/command.c index 51d07b0..78fd4fa 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -443,10 +443,22 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) * gotten no more than MAX_RELAY_EARLY_CELLS_PER_CIRCUIT of them. */ if (cell->command == CELL_RELAY_EARLY) { if (direction == CELL_DIRECTION_IN) { - /* Allow an unlimited number of inbound relay_early cells, - * for hidden service compatibility. There isn't any way to make - * a long circuit through inbound relay_early cells anyway. See - * bug 1038. -RD */ + /* Inbound early cells could once be encountered as a result of + * bug 1038; but relays running versions before 0.2.1.19 are long + * gone from the network, so any such cells now are surprising. */ + log_warn(LD_OR, + "Received an inbound RELAY_EARLY cell on circuit %u." + " Closing circuit. Please report this event," + " along with the following message.", + (unsigned)cell->circ_id); + if (CIRCUIT_IS_ORIGIN(circ)) { + circuit_log_path(LOG_WARN, LD_OR, TO_ORIGIN_CIRCUIT(circ)); + } else if (circ->n_chan) { + log_warn(LD_OR, " upstream=%s", + channel_get_actual_remote_descr(circ->n_chan)); + } + circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); + return; } else { or_circuit_t *or_circ = TO_OR_CIRCUIT(circ); if (or_circ->remaining_relay_early_cells == 0) {

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 28 Jul '14

28 Jul '14

commit ea6caca1e99fb93c63c9c8fdef0d371c00713f94 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 28 06:45:44 2014 +0000 Update translations for tor-launcher-network-settings_completed --- fi/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd index fdc1161..f8d6644 100644 --- a/fi/network-settings.dtd +++ b/fi/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Odotetaan Torin käynnistymistä..."> -<!ENTITY torsettings.restart "Käynnistä uudelleen"> +<!ENTITY torsettings.restartTor "Käynnistä Tor uudelleen"> <!ENTITY torsettings.optional "Vaihtoehtoinen">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Jul '14

28 Jul '14

commit f56ee9b4bbf8c4b185f10e70fcffc261817e41aa Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 28 06:45:42 2014 +0000 Update translations for tor-launcher-network-settings --- fi/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd index 5c8af5e..f8d6644 100644 --- a/fi/network-settings.dtd +++ b/fi/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Odotetaan Torin käynnistymistä..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Käynnistä Tor uudelleen"> <!ENTITY torsettings.optional "Vaihtoehtoinen">

1 0