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

[pluggable-transports/snowflake] branch main updated: Fix broker race condition
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. itchyonion pushed a commit to branch main in repository pluggable-transports/snowflake. The following commit(s) were added to refs/heads/main by this push: new 03b2b56 Fix broker race condition 03b2b56 is described below commit 03b2b56f879879bb379cff8d7352ace1102d8811 Author: itchyonion <itchyonion(a)torproject.com> AuthorDate: Thu May 26 23:26:38 2022 -0700 Fix broker race condition --- broker/broker.go | 2 +- broker/ipc.go | 41 ++++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 2bf4614..c356de9 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -154,8 +154,8 @@ func (ctx *BrokerContext) AddSnowflake(id string, proxyType string, natType stri heap.Push(ctx.restrictedSnowflakes, snowflake) } ctx.metrics.promMetrics.AvailableProxies.With(prometheus.Labels{"nat": natType, "type": proxyType}).Inc() - ctx.snowflakeLock.Unlock() ctx.idToSnowflake[id] = snowflake + ctx.snowflakeLock.Unlock() return snowflake } diff --git a/broker/ipc.go b/broker/ipc.go index 30de180..6b8971f 100644 --- a/broker/ipc.go +++ b/broker/ipc.go @@ -190,19 +190,10 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error { offer.fingerprint = BridgeFingerprint.ToBytes() - // Only hand out known restricted snowflakes to unrestricted clients - var snowflakeHeap *SnowflakeHeap - if offer.natType == NATUnrestricted { - snowflakeHeap = i.ctx.restrictedSnowflakes + snowflake := i.matchSnowflake(offer.natType) + if snowflake != nil { + snowflake.offerChannel <- offer } else { - snowflakeHeap = i.ctx.snowflakes - } - - // Immediately fail if there are no snowflakes available. - i.ctx.snowflakeLock.Lock() - numSnowflakes := snowflakeHeap.Len() - i.ctx.snowflakeLock.Unlock() - if numSnowflakes <= 0 { i.ctx.metrics.lock.Lock() i.ctx.metrics.clientDeniedCount++ i.ctx.metrics.promMetrics.ClientPollTotal.With(prometheus.Labels{"nat": offer.natType, "status": "denied"}).Inc() @@ -216,13 +207,6 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error { return sendClientResponse(resp, response) } - // Otherwise, find the most available snowflake proxy, and pass the offer to it. - // Delete must be deferred in order to correctly process answer request later. - i.ctx.snowflakeLock.Lock() - snowflake := heap.Pop(snowflakeHeap).(*Snowflake) - i.ctx.snowflakeLock.Unlock() - snowflake.offerChannel <- offer - // Wait for the answer to be returned on the channel or timeout. select { case answer := <-snowflake.answerChannel: @@ -248,6 +232,25 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error { return err } +func (i *IPC) matchSnowflake(natType string) *Snowflake { + // Only hand out known restricted snowflakes to unrestricted clients + var snowflakeHeap *SnowflakeHeap + if natType == NATUnrestricted { + snowflakeHeap = i.ctx.restrictedSnowflakes + } else { + snowflakeHeap = i.ctx.snowflakes + } + + i.ctx.snowflakeLock.Lock() + defer i.ctx.snowflakeLock.Unlock() + + if snowflakeHeap.Len() > 0 { + return heap.Pop(snowflakeHeap).(*Snowflake) + } else { + return nil + } +} + func (i *IPC) ProxyAnswers(arg messages.Arg, response *[]byte) error { answer, id, err := messages.DecodeAnswerRequest(arg.Body) if err != nil || answer == "" { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: relay: Remove unused conn->ext_or_conn_id
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new b7f9a24c08 relay: Remove unused conn->ext_or_conn_id new ce1675ef65 Merge branch 'tor-gitlab/mr/601' b7f9a24c08 is described below commit b7f9a24c08de435a54424caeb8dbc3916faca96c Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Tue Jul 26 11:18:15 2022 -0400 relay: Remove unused conn->ext_or_conn_id This also incidently removes a use of uninitialized stack data from the connection_or_set_ext_or_identifier() function. Fixes #40648 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40648 | 3 +++ src/core/mainloop/connection.c | 2 -- src/core/or/or_connection_st.h | 2 -- src/feature/relay/ext_orport.c | 13 ------------- src/feature/relay/ext_orport.h | 4 ---- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/changes/ticket40648 b/changes/ticket40648 new file mode 100644 index 0000000000..a891e30204 --- /dev/null +++ b/changes/ticket40648 @@ -0,0 +1,3 @@ + o Code simplification and refactoring (bridges): + - Remove unused code related to ExtPort connection ID. Fixes bug 40648; + bugfix on 0.3.5.1-alpha. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 75fc3c8918..883610d7e1 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -590,7 +590,6 @@ or_connection_new(int type, int socket_family) /* If we aren't told an address for this connection, we should * presume it isn't local, and should be rate-limited. */ TO_CONN(or_conn)->always_rate_limit_as_remote = 1; - connection_or_set_ext_or_identifier(or_conn); } return or_conn; @@ -957,7 +956,6 @@ connection_free_minimal(connection_t *conn) connection_or_clear_identity(TO_OR_CONN(conn)); } if (conn->type == CONN_TYPE_OR || conn->type == CONN_TYPE_EXT_OR) { - tor_free(TO_OR_CONN(conn)->ext_or_conn_id); tor_free(TO_OR_CONN(conn)->ext_or_auth_correct_client_hash); tor_free(TO_OR_CONN(conn)->ext_or_transport); } diff --git a/src/core/or/or_connection_st.h b/src/core/or/or_connection_st.h index 81ba2091ec..aceed4d2c4 100644 --- a/src/core/or/or_connection_st.h +++ b/src/core/or/or_connection_st.h @@ -26,8 +26,6 @@ struct or_connection_t { * if the other side hasn't shown us a valid identity key. */ char identity_digest[DIGEST_LEN]; - /** Extended ORPort connection identifier. */ - char *ext_or_conn_id; /** This is the ClientHash value we expect to receive from the * client during the Extended ORPort authentication protocol. We * compute it upon receiving the ClientNoce from the client, and we diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 3dd884932e..89b287b0b4 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -656,19 +656,6 @@ connection_ext_or_start_auth(or_connection_t *or_conn) return 0; } -/** Creates an Extended ORPort identifier for <b>conn</b> and deposits - * it into the global list of identifiers. */ -void -connection_or_set_ext_or_identifier(or_connection_t *conn) -{ - char random_id[EXT_OR_CONN_ID_LEN]; - - if (!conn->ext_or_conn_id) - conn->ext_or_conn_id = tor_malloc_zero(EXT_OR_CONN_ID_LEN); - - memcpy(conn->ext_or_conn_id, random_id, EXT_OR_CONN_ID_LEN); -} - /** Free any leftover allocated memory of the ext_orport.c subsystem. */ void ext_orport_free_all(void) diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index 722dc3787c..5a9063d005 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -35,7 +35,6 @@ int connection_ext_or_start_auth(or_connection_t *or_conn); -void connection_or_set_ext_or_identifier(or_connection_t *conn); int connection_ext_or_finished_flushing(or_connection_t *conn); int connection_ext_or_process_inbuf(or_connection_t *or_conn); char *get_ext_or_auth_cookie_file_name(void); @@ -67,9 +66,6 @@ connection_ext_or_process_inbuf(or_connection_t *conn) tor_assert_nonfatal_unreached(); return -1; } -#define connection_or_set_ext_or_identifier(conn) \ - ((void)(conn)) - #define get_ext_or_auth_cookie_file_name() \ (NULL) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch release-0.4.7 updated (e234df6098 -> e98995bb08)
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from e234df6098 version: Bump version to 0.4.7.8-dev new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell new 5260b4ef34 Merge branch 'maint-0.4.5' into maint-0.4.6 new e98995bb08 Merge branch 'maint-0.4.6' into maint-0.4.7 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch release-0.4.6 updated (5568961cbf -> 2dee45267b)
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.6 in repository tor. from 5568961cbf Merge branch 'maint-0.4.6' into release-0.4.6 new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell new 5260b4ef34 Merge branch 'maint-0.4.5' into maint-0.4.6 new 2dee45267b Merge branch 'maint-0.4.6' into release-0.4.6 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch release-0.4.5 updated (621c922134 -> 611ee0d707)
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.5 in repository tor. from 621c922134 Merge branch 'maint-0.4.5' into release-0.4.5 new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell new 611ee0d707 Merge branch 'maint-0.4.5' into release-0.4.5 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (e234df6098 -> e98995bb08)
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.7 in repository tor. from e234df6098 version: Bump version to 0.4.7.8-dev new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell new 5260b4ef34 Merge branch 'maint-0.4.5' into maint-0.4.6 new e98995bb08 Merge branch 'maint-0.4.6' into maint-0.4.7 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.6 updated (4ba89c0ccc -> 5260b4ef34)
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.6 in repository tor. from 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell new 5260b4ef34 Merge branch 'maint-0.4.5' into maint-0.4.6 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.5 updated (c213c1b0d1 -> 8d8afc4efa)
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.5 in repository tor. from c213c1b0d1 Add changes entry to tor!575. new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (ed74c52158 -> 028f5fd6ea)
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from ed74c52158 cmux: Remove a log bug that is actually an acceptable race new 8d8afc4efa relay: Send DESTROY cell instead of TRUNCATED cell new 5260b4ef34 Merge branch 'maint-0.4.5' into maint-0.4.6 new e98995bb08 Merge branch 'maint-0.4.6' into maint-0.4.7 new 028f5fd6ea Merge branch 'maint-0.4.7' The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40623 | 4 ++++ src/core/or/command.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40623 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 4

[tor] branch main updated: cmux: Remove a log bug that is actually an acceptable race
by gitolite role 26 Jul '22

26 Jul '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new ed74c52158 cmux: Remove a log bug that is actually an acceptable race ed74c52158 is described below commit ed74c5215862e1464e4f72b9c5995613ea00e9c8 Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Tue Jul 26 11:45:43 2022 -0400 cmux: Remove a log bug that is actually an acceptable race Closes #40647 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40647 | 4 ++++ src/core/or/relay.c | 21 +++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/changes/ticket40647 b/changes/ticket40647 new file mode 100644 index 0000000000..ae20aae3f3 --- /dev/null +++ b/changes/ticket40647 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Remove a "BUG" warning for an acceptable race between a circuit close + and considering that circuit active. Fixes bug 40647; bugfix on + 0.3.5.1-alpha. diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 68fddd1ae7..332878a8ea 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -3038,10 +3038,23 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) streams_blocked = circ->streams_blocked_on_p_chan; } - /* Circuitmux told us this was active, so it should have cells */ - if (/*BUG(*/ queue->n == 0 /*)*/) { - log_warn(LD_BUG, "Found a supposedly active circuit with no cells " - "to send. Trying to recover."); + /* Circuitmux told us this was active, so it should have cells. + * + * Note: In terms of logic and coherence, this should never happen but the + * cmux dragon is powerful. Reason is that when the OOM is triggered, when + * cleaning up circuits, we mark them for close and then clear their cell + * queues. And so, we can have a circuit considered active by the cmux + * dragon but without cells. The cmux subsystem is only notified of this + * when the circuit is freed which leaves a tiny window between close and + * free to end up here. + * + * We are accepting this as an "ok" race else the changes are likely non + * trivial to make the mark for close to set the num cells to 0 and change + * the free functions to detach the circuit conditionnaly without creating + * a chain effect of madness. + * + * The lesson here is arti will prevail and leave the cmux dragon alone. */ + if (queue->n == 0) { circuitmux_set_num_cells(cmux, circ, 0); if (! circ->marked_for_close) circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0