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 17 Jan '18

17 Jan '18

commit 4e653ac2cab08edf0e811ae38204e61bc13f1871 Merge: f02c6bcad af8cadf3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 11:12:15 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ src/rust/Cargo.lock | 12 ++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --cc src/rust/Cargo.lock index 4ac9606ce,4ac9606ce..e208e1432 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@@ -1,14 -1,14 +1,14 @@@ --[root] ++[[package]] ++name = "libc" ++version = "0.2.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] name = "tor_util" version = "0.0.1" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", ] --[[package]] --name = "libc" --version = "0.2.22" --source = "registry+https://github.com/rust-lang/crates.io-index" -- [metadata] "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502"

1 0

[tor/master] Remove false positives from channel_is_client()
by nickm＠torproject.org 17 Jan '18

17 Jan '18

commit af8cadf3a9febe3dbe22899b828f9f7946a82cef Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jan 15 22:33:40 2018 -0500 Remove false positives from channel_is_client() Fix a set of false positives where relays would consider connections to other relays as being client-only connections (and thus e.g. deserving different link padding schemes) if those relays fell out of the consensus briefly. Now we look only at the initial handshake and whether the connection authenticated as a relay. Fixes bug 24898; bugfix on 0.3.1.1-alpha. --- changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/changes/bug24898 b/changes/bug24898 new file mode 100644 index 000000000..f64340d71 --- /dev/null +++ b/changes/bug24898 @@ -0,0 +1,8 @@ + o Major bugfixes (relays): + - Fix a set of false positives where relays would consider connections + to other relays as being client-only connections (and thus e.g. + deserving different link padding schemes) if those relays fell out + of the consensus briefly. Now we look only at the initial handshake + and whether the connection authenticated as a relay. Fixes bug + 24898; bugfix on 0.3.1.1-alpha. + diff --git a/src/or/command.c b/src/or/command.c index c667cbbe5..894483e00 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -328,12 +328,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan) if (connection_or_digest_is_known_relay(chan->identity_digest)) { rep_hist_note_circuit_handshake_requested(create_cell->handshake_type); - // Needed for chutney: Sometimes relays aren't in the consensus yet, and - // get marked as clients. This resets their channels once they appear. - // Probably useful for normal operation wrt relay flapping, too. - chan->is_client = 0; - } else { - channel_mark_client(chan); } if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) { diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 59a9bdffd..fcd281da2 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1952,6 +1952,12 @@ connection_or_set_state_open(or_connection_t *conn) connection_or_change_state(conn, OR_CONN_STATE_OPEN); control_event_or_conn_status(conn, OR_CONN_EVENT_CONNECTED, 0); + /* Link protocol 3 appeared in Tor 0.2.3.6-alpha, so any connection + * that uses an earlier link protocol should not be treated as a relay. */ + if (conn->link_proto < 3) { + channel_mark_client(TLS_CHAN_TO_BASE(conn->chan)); + } + or_handshake_state_free(conn->handshake_state); conn->handshake_state = NULL; connection_start_reading(TO_CONN(conn));

1 0

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

17 Jan '18

commit 83648ef077d7972f27d82e22b9189af8202b2264 Merge: f9fe48989 af8cadf3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 11:12:33 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ 3 files changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.1] Remove false positives from channel_is_client()
by nickm＠torproject.org 17 Jan '18

17 Jan '18

commit af8cadf3a9febe3dbe22899b828f9f7946a82cef Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jan 15 22:33:40 2018 -0500 Remove false positives from channel_is_client() Fix a set of false positives where relays would consider connections to other relays as being client-only connections (and thus e.g. deserving different link padding schemes) if those relays fell out of the consensus briefly. Now we look only at the initial handshake and whether the connection authenticated as a relay. Fixes bug 24898; bugfix on 0.3.1.1-alpha. --- changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/changes/bug24898 b/changes/bug24898 new file mode 100644 index 000000000..f64340d71 --- /dev/null +++ b/changes/bug24898 @@ -0,0 +1,8 @@ + o Major bugfixes (relays): + - Fix a set of false positives where relays would consider connections + to other relays as being client-only connections (and thus e.g. + deserving different link padding schemes) if those relays fell out + of the consensus briefly. Now we look only at the initial handshake + and whether the connection authenticated as a relay. Fixes bug + 24898; bugfix on 0.3.1.1-alpha. + diff --git a/src/or/command.c b/src/or/command.c index c667cbbe5..894483e00 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -328,12 +328,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan) if (connection_or_digest_is_known_relay(chan->identity_digest)) { rep_hist_note_circuit_handshake_requested(create_cell->handshake_type); - // Needed for chutney: Sometimes relays aren't in the consensus yet, and - // get marked as clients. This resets their channels once they appear. - // Probably useful for normal operation wrt relay flapping, too. - chan->is_client = 0; - } else { - channel_mark_client(chan); } if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) { diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 59a9bdffd..fcd281da2 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1952,6 +1952,12 @@ connection_or_set_state_open(or_connection_t *conn) connection_or_change_state(conn, OR_CONN_STATE_OPEN); control_event_or_conn_status(conn, OR_CONN_EVENT_CONNECTED, 0); + /* Link protocol 3 appeared in Tor 0.2.3.6-alpha, so any connection + * that uses an earlier link protocol should not be treated as a relay. */ + if (conn->link_proto < 3) { + channel_mark_client(TLS_CHAN_TO_BASE(conn->chan)); + } + or_handshake_state_free(conn->handshake_state); conn->handshake_state = NULL; connection_start_reading(TO_CONN(conn));

1 0

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

17 Jan '18

commit 4e653ac2cab08edf0e811ae38204e61bc13f1871 Merge: f02c6bcad af8cadf3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 11:12:15 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ src/rust/Cargo.lock | 12 ++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --cc src/rust/Cargo.lock index 4ac9606ce,4ac9606ce..e208e1432 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@@ -1,14 -1,14 +1,14 @@@ --[root] ++[[package]] ++name = "libc" ++version = "0.2.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] name = "tor_util" version = "0.0.1" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", ] --[[package]] --name = "libc" --version = "0.2.22" --source = "registry+https://github.com/rust-lang/crates.io-index" -- [metadata] "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502"

1 0

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

17 Jan '18

commit 959af2024789c32a3daa74360a173fb16cf092fd Merge: 86aa7f0a3 4e653ac2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 11:13:18 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ 3 files changed, 14 insertions(+), 6 deletions(-)

1 0

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

17 Jan '18

commit 4bfc3557990c2b06cfb008c8a2af277df2ea40ba Merge: b1267114c 4e653ac2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 11:12:33 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ src/rust/Cargo.lock | 12 ++++++------ 4 files changed, 20 insertions(+), 12 deletions(-)

1 0

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

17 Jan '18

commit 4e653ac2cab08edf0e811ae38204e61bc13f1871 Merge: f02c6bcad af8cadf3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 11:12:15 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ src/rust/Cargo.lock | 12 ++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --cc src/rust/Cargo.lock index 4ac9606ce,4ac9606ce..e208e1432 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@@ -1,14 -1,14 +1,14 @@@ --[root] ++[[package]] ++name = "libc" ++version = "0.2.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] name = "tor_util" version = "0.0.1" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", ] --[[package]] --name = "libc" --version = "0.2.22" --source = "registry+https://github.com/rust-lang/crates.io-index" -- [metadata] "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502"

1 0

[tor/release-0.3.2] Remove false positives from channel_is_client()
by nickm＠torproject.org 17 Jan '18

17 Jan '18

commit af8cadf3a9febe3dbe22899b828f9f7946a82cef Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jan 15 22:33:40 2018 -0500 Remove false positives from channel_is_client() Fix a set of false positives where relays would consider connections to other relays as being client-only connections (and thus e.g. deserving different link padding schemes) if those relays fell out of the consensus briefly. Now we look only at the initial handshake and whether the connection authenticated as a relay. Fixes bug 24898; bugfix on 0.3.1.1-alpha. --- changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/changes/bug24898 b/changes/bug24898 new file mode 100644 index 000000000..f64340d71 --- /dev/null +++ b/changes/bug24898 @@ -0,0 +1,8 @@ + o Major bugfixes (relays): + - Fix a set of false positives where relays would consider connections + to other relays as being client-only connections (and thus e.g. + deserving different link padding schemes) if those relays fell out + of the consensus briefly. Now we look only at the initial handshake + and whether the connection authenticated as a relay. Fixes bug + 24898; bugfix on 0.3.1.1-alpha. + diff --git a/src/or/command.c b/src/or/command.c index c667cbbe5..894483e00 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -328,12 +328,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan) if (connection_or_digest_is_known_relay(chan->identity_digest)) { rep_hist_note_circuit_handshake_requested(create_cell->handshake_type); - // Needed for chutney: Sometimes relays aren't in the consensus yet, and - // get marked as clients. This resets their channels once they appear. - // Probably useful for normal operation wrt relay flapping, too. - chan->is_client = 0; - } else { - channel_mark_client(chan); } if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) { diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 59a9bdffd..fcd281da2 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1952,6 +1952,12 @@ connection_or_set_state_open(or_connection_t *conn) connection_or_change_state(conn, OR_CONN_STATE_OPEN); control_event_or_conn_status(conn, OR_CONN_EVENT_CONNECTED, 0); + /* Link protocol 3 appeared in Tor 0.2.3.6-alpha, so any connection + * that uses an earlier link protocol should not be treated as a relay. */ + if (conn->link_proto < 3) { + channel_mark_client(TLS_CHAN_TO_BASE(conn->chan)); + } + or_handshake_state_free(conn->handshake_state); conn->handshake_state = NULL; connection_start_reading(TO_CONN(conn));

1 0

[tor/maint-0.3.2] v3 onion services now obey MAX_REND_FAILURES
by nickm＠torproject.org 17 Jan '18

17 Jan '18

commit 7ce335c9217f36b1aca6973d119630c7b846c1ce Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jan 15 16:41:47 2018 -0500 v3 onion services now obey MAX_REND_FAILURES New-style (v3) onion services now obey the "max rendezvous circuit attempts" logic. Previously they would make as many rendezvous circuit attempts as they could fit in the MAX_REND_TIMEOUT second window before giving up. Fixes bug 24894; bugfix on 0.3.2.1-alpha. --- changes/bug24894 | 5 +++++ src/or/hs_circuit.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug24894 b/changes/bug24894 new file mode 100644 index 000000000..b08cdce1f --- /dev/null +++ b/changes/bug24894 @@ -0,0 +1,5 @@ + o Major bugfixes (v3 onion services): + - New-style (v3) onion services now obey the "max rendezvous circuit + attempts" logic. Previously they would make as many rendezvous + circuit attempts as they could fit in the MAX_REND_TIMEOUT second + window before giving up. Fixes bug 24894; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index a58166ccd..11ce2a188 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -545,7 +545,7 @@ retry_service_rendezvous_point(const origin_circuit_t *circ) /* Transfer build state information to the new circuit state in part to * catch any other failures. */ - new_circ->build_state->failure_count = bstate->failure_count++; + new_circ->build_state->failure_count = bstate->failure_count+1; new_circ->build_state->expiry_time = bstate->expiry_time; new_circ->hs_ident = hs_ident_circuit_dup(circ->hs_ident);

1 0