tor-commits October 2021

tor-commits@lists.torproject.org

15 participants
2054 discussions

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 5717b88bcb88d374b7b934622f0b7bf62cdab05c Merge: fdc7549b61 7372739765 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 21:47:17 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.5 changes/ticket30477 | 4 ++++ src/feature/relay/router.c | 23 +++++++++++++++++++++++ src/feature/relay/router.h | 1 + 3 files changed, 28 insertions(+) diff --cc src/feature/relay/router.c index 2696b8633b,7ea2a4e719..0589786619 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@@ -1140,11 -1121,11 +1159,15 @@@ init_keys(void log_err(LD_FS, "Error writing hashed fingerprint to file"); return -1; } + if (router_write_fingerprint(0, 1)) { + log_err(LD_FS, "Error writing ed25519 identity to file"); + return -1; + } + /* Display URL to bridge status page. */ + if (! public_server_mode(options)) + router_announce_bridge_status_page(); + if (!authdir_mode(options)) return 0; /* 6. [authdirserver only] load approved-routers file */ diff --cc src/feature/relay/router.h index aa03c27142,2d9ff3f8f3..9556a66e68 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@@ -125,29 -115,11 +125,30 @@@ void router_reset_warnings(void) void router_free_all(void); #ifdef ROUTER_PRIVATE -/* Used only by router.c and test.c */ +/* Used only by router.c and the unit tests */ STATIC void get_platform_str(char *platform, size_t len); -STATIC int router_write_fingerprint(int hashed); +STATIC int router_write_fingerprint(int hashed, int ed25519_identity); +STATIC smartlist_t *get_my_declared_family(const or_options_t *options); + STATIC void router_announce_bridge_status_page(void); -#endif +STATIC int load_stats_file(const char *filename, const char *ts_tag, + time_t now, char **out); + +#ifdef TOR_UNIT_TESTS +extern time_t desc_clean_since; +extern const char *desc_dirty_reason; +void set_server_identity_key_digest_testing(const uint8_t *digest); +MOCK_DECL(STATIC const struct curve25519_keypair_t *, + get_current_curve25519_keypair,(void)); + +MOCK_DECL(STATIC int, + router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)); +STATIC extrainfo_t *router_build_fresh_signed_extrainfo( + const routerinfo_t *ri); +STATIC void router_update_routerinfo_from_extrainfo(routerinfo_t *ri, + const extrainfo_t *ei); +STATIC int router_dump_and_sign_routerinfo_descriptor_body(routerinfo_t *ri); +#endif /* defined(TOR_UNIT_TESTS) */ + +#endif /* defined(ROUTER_PRIVATE) */ #endif /* !defined(TOR_ROUTER_H) */

1 0

[tor/release-0.4.5] Announce URL to bridge status page when starting Tor as a bridge relay.
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 73727397652f933c710d701c5b2e27cbac12af49 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Nov 23 23:41:17 2020 +0000 Announce URL to bridge status page when starting Tor as a bridge relay. This patch makes Tor announce the relay specific bridge status page URL when Tor is starting up before bootstrap occours. See: tor#30477 --- changes/ticket30477 | 4 ++++ src/feature/relay/router.c | 23 +++++++++++++++++++++++ src/feature/relay/router.h | 1 + 3 files changed, 28 insertions(+) diff --git a/changes/ticket30477 b/changes/ticket30477 new file mode 100644 index 0000000000..379fc4e7eb --- /dev/null +++ b/changes/ticket30477 @@ -0,0 +1,4 @@ + o Minor features (bridge): + - We now announce the URL to Tor's new bridge status at + https://bridges.torproject.org/ when Tor is configured to run as a bridge + relay. Closes ticket 30477. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 283f7c326b..7ea2a4e719 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -803,6 +803,25 @@ router_initialize_tls_context(void) (unsigned int)lifetime); } +/** Announce URL to bridge status page. */ +STATIC void +router_announce_bridge_status_page(void) +{ + char fingerprint[FINGERPRINT_LEN + 1]; + + if (crypto_pk_get_hashed_fingerprint(get_server_identity_key(), + fingerprint) < 0) { + // LCOV_EXCL_START + log_err(LD_GENERAL, "Unable to compute bridge fingerprint"); + return; + // LCOV_EXCL_STOP + } + + log_notice(LD_GENERAL, "You can check the status of your bridge relay at " + "https://bridges.torproject.org/status?id=%s", + fingerprint); +} + /** Compute fingerprint (or hashed fingerprint if hashed is 1) and write * it to 'fingerprint' (or 'hashed-fingerprint'). Return 0 on success, or * -1 if Tor should die, @@ -1103,6 +1122,10 @@ init_keys(void) return -1; } + /* Display URL to bridge status page. */ + if (! public_server_mode(options)) + router_announce_bridge_status_page(); + if (!authdir_mode(options)) return 0; /* 6. [authdirserver only] load approved-routers file */ diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index ab1f771017..2d9ff3f8f3 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -119,6 +119,7 @@ void router_free_all(void); /* Used only by router.c and test.c */ STATIC void get_platform_str(char *platform, size_t len); STATIC int router_write_fingerprint(int hashed); +STATIC void router_announce_bridge_status_page(void); #endif #endif /* !defined(TOR_ROUTER_H) */

1 0

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

1 0

[tor/release-0.3.5] Announce URL to bridge status page when starting Tor as a bridge relay.
by ahf＠torproject.org 20 Oct '21

20 Oct '21

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit d6b6cd7cd7b9fedb1b2955b1bd7a4ec8b0218e89 Merge: 04886b3393 5717b88bcb Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 21:47:26 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket30477 | 4 ++++ src/feature/relay/router.c | 23 +++++++++++++++++++++++ src/feature/relay/router.h | 1 + 3 files changed, 28 insertions(+)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit 1e08efdb5891008f8180603bccf461c467275f57 Merge: 16cbbf04c4 5717b88bcb Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 21:47:26 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket30477 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/release-0.4.6] Announce URL to bridge status page when starting Tor as a bridge relay.
by ahf＠torproject.org 20 Oct '21

20 Oct '21

1 0

[tor/main] relay: Comment out a unused variable for now
by dgoulet＠torproject.org 20 Oct '21

20 Oct '21

commit 7c2c749d8987d675bfe0a74100c2da5f693037c0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 20 15:17:06 2021 -0400 relay: Comment out a unused variable for now We keep it around until libevent is fixed, it should be used again. In the meantime, avoid the compiler to complain of this unused variable. https://gitlab.torproject.org/dgoulet/tor/-/jobs/43358#L1522 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/relay_metrics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c index 5f1238a5d3..0886b6ae87 100644 --- a/src/feature/relay/relay_metrics.c +++ b/src/feature/relay/relay_metrics.c @@ -124,6 +124,8 @@ fill_tcp_exhaustion_values(void) metrics_store_entry_update(sentry, rep_hist_get_n_tcp_exhaustion()); } +/* NOTE: Disable the record type label until libevent is fixed. */ +#if 0 /** Helper array containing mapping for the name of the different DNS records * and their corresponding libevent values. */ static struct dns_type { @@ -135,6 +137,7 @@ static struct dns_type { { .name = "AAAA", .type = DNS_IPv6_AAAA }, }; static const size_t num_dns_types = ARRAY_LENGTH(dns_types); +#endif /** Fill function for the RELAY_METRICS_NUM_DNS_ERRORS metrics. */ static void @@ -166,7 +169,6 @@ fill_dns_error_values(void) static const size_t num_errors = ARRAY_LENGTH(errors); /* NOTE: Disable the record type label until libevent is fixed. */ - (void) num_dns_types; #if 0 for (size_t i = 0; i < num_dns_types; i++) { /* Dup the label because metrics_format_label() returns a pointer to a

1 0

[tor/main] Move "Didn't recognize cell, but circ stops here" into heartbeat.
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit bcc953307b571df5b640f9fbc299b93c74d3847f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 19 15:16:49 2021 -0400 Move "Didn't recognize cell, but circ stops here" into heartbeat. When we looked, this was the third most frequent message at PROTOCOL_WARN, and doesn't actually tell us what to do about it. Now: * we just log it at info * we log it only once per circuit * we report, in the heartbeat, how many times it happens, how many cells it happens with per circuit, and how long these circuits have been alive (on average). Fixes the final part of #40400. --- changes/bug40400_part3 | 7 +++++++ src/core/or/circuitlist.c | 7 +++++++ src/core/or/or_circuit_st.h | 5 ++++- src/core/or/relay.c | 13 +++++++++++-- src/core/or/status.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/core/or/status.h | 3 +++ 6 files changed, 75 insertions(+), 3 deletions(-) diff --git a/changes/bug40400_part3 b/changes/bug40400_part3 new file mode 100644 index 0000000000..b78e800229 --- /dev/null +++ b/changes/bug40400_part3 @@ -0,0 +1,7 @@ + o Minor features (logging, heartbeat): + - When a relay receives a cell that isn't encrypted properly for + it, but the relay is the last hop on the circuit, the relay + now counts how many cells of this kind it receives, on how + many circuits, and reports this information in the log. + Previously, we'd log each cell at PROTOCOL_WARN level, which + is far too verbose to be useful. Fixes part of ticket 40400. diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index 88c4159294..4dbf4d4549 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -64,6 +64,7 @@ #include "core/or/circuitpadding.h" #include "core/or/crypt_path.h" #include "core/or/extendinfo.h" +#include "core/or/status.h" #include "core/or/trace_probes_circuit.h" #include "core/mainloop/connection.h" #include "app/config/config.h" @@ -2346,6 +2347,12 @@ circuit_about_to_free(circuit_t *circ) circuitmux_detach_circuit(or_circ->p_chan->cmux, circ); circuit_set_p_circid_chan(or_circ, 0, NULL); } + + if (or_circ->n_cells_discarded_at_end) { + time_t age = approx_time() - circ->timestamp_created.tv_sec; + note_circ_closed_for_unrecognized_cells( + age, or_circ->n_cells_discarded_at_end); + } } else { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); edge_connection_t *conn; diff --git a/src/core/or/or_circuit_st.h b/src/core/or/or_circuit_st.h index b8fbf9658e..11695ec301 100644 --- a/src/core/or/or_circuit_st.h +++ b/src/core/or/or_circuit_st.h @@ -52,6 +52,10 @@ struct or_circuit_t { /** Stores KH for the handshake. */ char rend_circ_nonce[DIGEST_LEN];/* KH in tor-spec.txt */ + /** Number of cells which we have discarded because of having no next hop, + * despite not recognizing the cell. */ + uint32_t n_cells_discarded_at_end; + /** How many more relay_early cells can we send on this circuit, according * to the specification? */ unsigned int remaining_relay_early_cells : 4; @@ -93,4 +97,3 @@ struct or_circuit_t { }; #endif /* !defined(OR_CIRCUIT_ST_H) */ - diff --git a/src/core/or/relay.c b/src/core/or/relay.c index a2123f991c..68fddd1ae7 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -333,8 +333,17 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, } return 0; } - log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Didn't recognize cell, but circ stops here! Closing circ."); + if (BUG(CIRCUIT_IS_ORIGIN(circ))) { + /* Should be impossible at this point. */ + return -END_CIRC_REASON_TORPROTOCOL; + } + or_circuit_t *or_circ = TO_OR_CIRCUIT(circ); + if (++or_circ->n_cells_discarded_at_end == 1) { + time_t seconds_open = approx_time() - circ->timestamp_created.tv_sec; + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Didn't recognize a cell, but circ stops here! Closing circuit. " + "It was created %ld seconds ago.", (long)seconds_open); + } return -END_CIRC_REASON_TORPROTOCOL; } diff --git a/src/core/or/status.c b/src/core/or/status.c index 9e7ae70535..1e599aafb3 100644 --- a/src/core/or/status.c +++ b/src/core/or/status.c @@ -147,6 +147,32 @@ note_connection(bool inbound, int family) } } +/** + * @name Counters for unrecognized cells + * + * Track cells that we drop because they are unrecognized and we have + * nobody to send them to. + **/ +/**@{*/ +static unsigned n_circs_closed_for_unrecognized_cells; +static uint64_t n_unrecognized_cells_discarded; +static uint64_t n_secs_on_circs_with_unrecognized_cells; +/**@}*/ + +/** + * Note that a circuit has closed @a n_seconds after having been created, + * because of one or more unrecognized cells. Also note the number of + * unrecognized cells @a n_cells. + */ +void +note_circ_closed_for_unrecognized_cells(time_t n_seconds, uint32_t n_cells) +{ + ++n_circs_closed_for_unrecognized_cells; + n_unrecognized_cells_discarded += n_cells; + if (n_seconds >= 0) + n_secs_on_circs_with_unrecognized_cells += (uint64_t) n_seconds; +} + /** Log a "heartbeat" message describing Tor's status and history so that the * user can know that there is indeed a running Tor. Return 0 on success and * -1 on failure. */ @@ -240,6 +266,23 @@ log_heartbeat(time_t now) (main_loop_idle_count)); } + if (n_circs_closed_for_unrecognized_cells) { + double avg_time_alive = ((double) n_secs_on_circs_with_unrecognized_cells) + / n_circs_closed_for_unrecognized_cells; + double avg_cells = ((double) n_unrecognized_cells_discarded) + / n_circs_closed_for_unrecognized_cells; + log_fn(LOG_NOTICE, LD_HEARTBEAT, + "Since our last heartbeat, %u circuits were closed because of " + "unrecognized cells while we were the last hop. On average, each " + "one was alive for %lf seconds, and had %lf unrecognized cells.", + n_circs_closed_for_unrecognized_cells, + avg_time_alive, + avg_cells); + n_circs_closed_for_unrecognized_cells = 0; + n_unrecognized_cells_discarded = 0; + n_secs_on_circs_with_unrecognized_cells = 0; + } + /** Now, if we are an HS service, log some stats about our usage */ log_onion_service_stats(); diff --git a/src/core/or/status.h b/src/core/or/status.h index 927df9a192..57e28002fc 100644 --- a/src/core/or/status.h +++ b/src/core/or/status.h @@ -12,6 +12,9 @@ #include "lib/testsupport/testsupport.h" void note_connection(bool inbound, int family); +void note_circ_closed_for_unrecognized_cells(time_t n_seconds, + uint32_t n_cells); + int log_heartbeat(time_t now); #ifdef STATUS_PRIVATE

1 0

[tor/main] Merge branch 'tor-gitlab/mr/464_squashed' into main
by ahf＠torproject.org 20 Oct '21

20 Oct '21

commit bae6780e705e6a5d78e037b0d4e426b355d84ffe Merge: a5dc1a4c85 bcc953307b Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 18:39:07 2021 +0000 Merge branch 'tor-gitlab/mr/464_squashed' into main changes/bug40400_part3 | 7 +++++++ src/core/or/circuitlist.c | 7 +++++++ src/core/or/or_circuit_st.h | 5 ++++- src/core/or/relay.c | 13 +++++++++++-- src/core/or/status.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/core/or/status.h | 3 +++ 6 files changed, 75 insertions(+), 3 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2021