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

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/316' into maint-0.4.5
by nickm＠torproject.org 22 Feb '21

22 Feb '21

commit bc21ed32903459c53599ee03605e8d23bf42ffe9 Merge: 26c2e843f9 4d7f31b964 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 15:37:31 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/316' into maint-0.4.5 changes/ticket40300 | 5 +++++ src/feature/relay/relay_find_addr.c | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 22 Feb '21

22 Feb '21

commit 4400ca83e0da193cef1d6ef6189a1b7dc5a0b56c Merge: 37af94daf9 bc21ed3290 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 15:37:39 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5

1 0

[tor/release-0.4.5] relay: Move log notice after suggested address lookup
by nickm＠torproject.org 22 Feb '21

22 Feb '21

commit 4d7f31b9645d360e7074844711f10565e5d25b7b Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 22 09:13:54 2021 -0500 relay: Move log notice after suggested address lookup When trying to find our address to publish, we would log notice if we couldn't find it from the cache but then we would look at the suggested cache (which contains the address from the authorities) in which we might actually have the address. Thus that log notice was misplaced. Move it down after the suggested address cache lookup. Closes #40300 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40300 | 5 +++++ src/feature/relay/relay_find_addr.c | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/changes/ticket40300 b/changes/ticket40300 new file mode 100644 index 0000000000..aef01b4c64 --- /dev/null +++ b/changes/ticket40300 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay): + - Remove a spammy log notice that should not have been indicating the + operator that its IPv4/v6 was missing but it was not. Fixes bug 40300; + bugfix on 0.4.5.1-alpha. + diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index 39e1cc6a19..2a3f602438 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -144,17 +144,6 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, if (find_my_address(options, family, LOG_INFO, addr_out, NULL, NULL)) { goto found; } - /* No publishable address was found even though we have an ORPort thus - * print a notice log so operator can notice. We'll do that every hour so - * it is not too spammy but enough so operators address the issue. */ - static ratelim_t rlim = RATELIM_INIT(3600); - log_fn_ratelim(&rlim, LOG_NOTICE, LD_CONFIG, - "Unable to find %s address for ORPort %u. " - "You might want to specify %sOnly to it or set an " - "explicit address or set Address.", - fmt_af_family(family), - routerconf_find_or_port(options, family), - fmt_af_family(family)); } /* Third, consider address from our suggestion cache. */ @@ -163,7 +152,19 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, goto found; } - /* No publishable address was found. */ + /* No publishable address was found even though we have an ORPort thus + * print a notice log so operator can notice. We'll do that every hour so + * it is not too spammy but enough so operators address the issue. */ + static ratelim_t rlim = RATELIM_INIT(3600); + log_fn_ratelim(&rlim, LOG_NOTICE, LD_CONFIG, + "Unable to find %s address for ORPort %u. " + "You might want to specify %sOnly to it or set an " + "explicit address or set Address.", + fmt_af_family(family), + routerconf_find_or_port(options, family), + fmt_af_family(family)); + + /* Not found. */ return false; found:

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/316' into release-0.4.5
by nickm＠torproject.org 22 Feb '21

22 Feb '21

commit 37af94daf938fc21883d3ab0d49231af4373ba33 Merge: 21ca3c2501 4d7f31b964 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 15:34:17 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/316' into release-0.4.5 changes/ticket40300 | 5 +++++ src/feature/relay/relay_find_addr.c | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-)

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/309' into maint-0.4.5
by ahf＠torproject.org 22 Feb '21

22 Feb '21

commit 26c2e843f958c5451c836bbf9a4979aecac177c4 Merge: 03c686563b 8a8045c788 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Feb 22 19:12:53 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/309' into maint-0.4.5 changes/bug40287 | 4 ++++ src/feature/relay/selftest.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by ahf＠torproject.org 22 Feb '21

22 Feb '21

commit a4df1e8ea47842a76e4fc3ebc750e68b728f222e Merge: c0589d06be 26c2e843f9 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Feb 22 19:13:12 2021 +0000 Merge branch 'maint-0.4.5' changes/bug40287 | 4 ++++ src/feature/relay/selftest.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] relay: No longer test dirport reachability for authorities
by ahf＠torproject.org 22 Feb '21

22 Feb '21

commit 8a8045c788b6883751b5ecbfbd3de4da0dfd313a Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 10 03:10:12 2021 -0500 relay: No longer test dirport reachability for authorities Now that exit relays don't allow exit connections to directory authority DirPorts, the follow-up step is to make directory authorities stop doing DirPort reachability checks. Fixes #40287 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug40287 | 4 ++++ src/feature/relay/selftest.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug40287 b/changes/bug40287 new file mode 100644 index 0000000000..5a9c899d52 --- /dev/null +++ b/changes/bug40287 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - Now that exit relays don't allow exit connections to directory authority + DirPorts (network reentry), disable authorities' reachability self test + on the DirPort. Fixes bug 40287; bugfix on 0.4.5.5-rc. diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 86b1533be1..46b4b20ffc 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -31,6 +31,8 @@ #include "feature/control/control_events.h" +#include "feature/dirauth/authmode.h" + #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" @@ -142,12 +144,14 @@ router_orport_seems_reachable(const or_options_t *options, * - we've seen a successful reachability check, or * - there is no DirPort set, or * - AssumeReachable is set, or + * - We're a dir auth (see ticket #40287), or * - the network is disabled. */ int router_dirport_seems_reachable(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options) || + authdir_mode(options) || !options->DirPort_set; return reach_checks_disabled || can_reach_dir_port;

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/309' into maint-0.4.5
by ahf＠torproject.org 22 Feb '21

22 Feb '21

commit 26c2e843f958c5451c836bbf9a4979aecac177c4 Merge: 03c686563b 8a8045c788 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Feb 22 19:12:53 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/309' into maint-0.4.5 changes/bug40287 | 4 ++++ src/feature/relay/selftest.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.4.5] relay: No longer test dirport reachability for authorities
by ahf＠torproject.org 22 Feb '21

22 Feb '21

commit 8a8045c788b6883751b5ecbfbd3de4da0dfd313a Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 10 03:10:12 2021 -0500 relay: No longer test dirport reachability for authorities Now that exit relays don't allow exit connections to directory authority DirPorts, the follow-up step is to make directory authorities stop doing DirPort reachability checks. Fixes #40287 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug40287 | 4 ++++ src/feature/relay/selftest.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug40287 b/changes/bug40287 new file mode 100644 index 0000000000..5a9c899d52 --- /dev/null +++ b/changes/bug40287 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - Now that exit relays don't allow exit connections to directory authority + DirPorts (network reentry), disable authorities' reachability self test + on the DirPort. Fixes bug 40287; bugfix on 0.4.5.5-rc. diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 86b1533be1..46b4b20ffc 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -31,6 +31,8 @@ #include "feature/control/control_events.h" +#include "feature/dirauth/authmode.h" + #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" @@ -142,12 +144,14 @@ router_orport_seems_reachable(const or_options_t *options, * - we've seen a successful reachability check, or * - there is no DirPort set, or * - AssumeReachable is set, or + * - We're a dir auth (see ticket #40287), or * - the network is disabled. */ int router_dirport_seems_reachable(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options) || + authdir_mode(options) || !options->DirPort_set; return reach_checks_disabled || can_reach_dir_port;

1 0

[tor/release-0.4.5] relay: No longer test dirport reachability for authorities
by ahf＠torproject.org 22 Feb '21

22 Feb '21

commit 8a8045c788b6883751b5ecbfbd3de4da0dfd313a Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 10 03:10:12 2021 -0500 relay: No longer test dirport reachability for authorities Now that exit relays don't allow exit connections to directory authority DirPorts, the follow-up step is to make directory authorities stop doing DirPort reachability checks. Fixes #40287 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug40287 | 4 ++++ src/feature/relay/selftest.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug40287 b/changes/bug40287 new file mode 100644 index 0000000000..5a9c899d52 --- /dev/null +++ b/changes/bug40287 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - Now that exit relays don't allow exit connections to directory authority + DirPorts (network reentry), disable authorities' reachability self test + on the DirPort. Fixes bug 40287; bugfix on 0.4.5.5-rc. diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 86b1533be1..46b4b20ffc 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -31,6 +31,8 @@ #include "feature/control/control_events.h" +#include "feature/dirauth/authmode.h" + #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" @@ -142,12 +144,14 @@ router_orport_seems_reachable(const or_options_t *options, * - we've seen a successful reachability check, or * - there is no DirPort set, or * - AssumeReachable is set, or + * - We're a dir auth (see ticket #40287), or * - the network is disabled. */ int router_dirport_seems_reachable(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options) || + authdir_mode(options) || !options->DirPort_set; return reach_checks_disabled || can_reach_dir_port;

1 0