October 2021 - tor-commits - lists.torproject.org

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

21 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.6] Merge branch 'maint-0.4.6' into release-0.4.6
by ahf＠torproject.org 21 Oct '21

21 Oct '21

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

1 0

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

21 Oct '21

commit 059ea671ed15a72b13ed0f9446cdcef648b821b7 Merge: 7c2c749d89 1e08efdb58 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 21:47:26 2021 +0000 Merge branch 'maint-0.4.6' into main changes/ticket30477 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

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

21 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/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 21 Oct '21

21 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/main] Announce URL to bridge status page when starting Tor as a bridge relay.
by ahf＠torproject.org 21 Oct '21

21 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/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 21 Oct '21

21 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/maint-0.4.5] Announce URL to bridge status page when starting Tor as a bridge relay.
by ahf＠torproject.org 21 Oct '21

21 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/maint-0.4.6] Announce URL to bridge status page when starting Tor as a bridge relay.
by ahf＠torproject.org 21 Oct '21

21 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.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 2a247f425556a72b9652360635638e383d06d603 Merge: 46de5eb054 7372739765 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 20 21:44:56 2021 +0000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket30477 | 4 ++++ src/feature/relay/router.c | 23 +++++++++++++++++++++++ src/feature/relay/router.h | 1 + 3 files changed, 28 insertions(+)

1 0