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

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

12 Feb '21

commit 9b6b1aedcdd1f8b76379fb9796020a04416e6b16 Merge: 9fbedc74c3 088a74aaab Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:54:18 2021 +0200 Merge branch 'maint-0.4.5' changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/294' into maint-0.4.5
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 088a74aaab84c5598f589fa6d0b6203ca8c666fa Merge: 58b5300f44 8d80126eee Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:53:45 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/294' into maint-0.4.5 changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.5] Remove DirCache=1 from list of supported versions.
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 8d80126eee396b503e464f2647b7ca00fd9db6c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 11:40:35 2021 -0500 Remove DirCache=1 from list of supported versions. Closes #40221 --- changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/ticket40221_045 b/changes/ticket40221_045 new file mode 100644 index 0000000000..0f3ab894c2 --- /dev/null +++ b/changes/ticket40221_045 @@ -0,0 +1,6 @@ + o Minor features (protocol versions): + - Stop claiming to support the "DirCache=1" subprotocol version. + Technically, we stopped supporting this subprotocol back in + 0.4.5.1-alpha, but we needed to wait for the authorities to stop + listing it as "required" before we can drop support. Closes ticket + 40221. diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 5a87ade3da..aa96cafff9 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -398,7 +398,7 @@ protover_get_supported_protocols(void) return "Cons=1-2 " "Desc=1-2 " - "DirCache=1-2 " + "DirCache=2 " "FlowCtrl=1 " "HSDir=1-2 " "HSIntro=3-5 " diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 0060864a2e..da87509ffa 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -160,7 +160,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { cstr!( "Cons=1-2 \ Desc=1-2 \ - DirCache=1-2 \ + DirCache=2 \ FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-5 \ @@ -175,7 +175,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { cstr!( "Cons=1-2 \ Desc=1-2 \ - DirCache=1-2 \ + DirCache=2 \ FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-5 \ diff --git a/src/test/test_protover.c b/src/test/test_protover.c index be3aeb5e40..dd65f4bbf5 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -467,9 +467,6 @@ test_protover_supported_protocols(void *arg) PROTOVER_HSDIR_V3)); /* No DirCache versions appear anywhere in the code. */ - tt_assert(protocol_list_supports_protocol(supported_protocols, - PRT_DIRCACHE, - PROTOVER_DIRCACHE_V1)); tt_assert(protocol_list_supports_protocol(supported_protocols, PRT_DIRCACHE, PROTOVER_DIRCACHE_V2));

1 0

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

12 Feb '21

commit 14bd196eb866809159712e810937cec6749f4733 Merge: fe32ac926e 088a74aaab Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:54:18 2021 +0200 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.5] Remove DirCache=1 from list of supported versions.
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 8d80126eee396b503e464f2647b7ca00fd9db6c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 11:40:35 2021 -0500 Remove DirCache=1 from list of supported versions. Closes #40221 --- changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/ticket40221_045 b/changes/ticket40221_045 new file mode 100644 index 0000000000..0f3ab894c2 --- /dev/null +++ b/changes/ticket40221_045 @@ -0,0 +1,6 @@ + o Minor features (protocol versions): + - Stop claiming to support the "DirCache=1" subprotocol version. + Technically, we stopped supporting this subprotocol back in + 0.4.5.1-alpha, but we needed to wait for the authorities to stop + listing it as "required" before we can drop support. Closes ticket + 40221. diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 5a87ade3da..aa96cafff9 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -398,7 +398,7 @@ protover_get_supported_protocols(void) return "Cons=1-2 " "Desc=1-2 " - "DirCache=1-2 " + "DirCache=2 " "FlowCtrl=1 " "HSDir=1-2 " "HSIntro=3-5 " diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 0060864a2e..da87509ffa 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -160,7 +160,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { cstr!( "Cons=1-2 \ Desc=1-2 \ - DirCache=1-2 \ + DirCache=2 \ FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-5 \ @@ -175,7 +175,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { cstr!( "Cons=1-2 \ Desc=1-2 \ - DirCache=1-2 \ + DirCache=2 \ FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-5 \ diff --git a/src/test/test_protover.c b/src/test/test_protover.c index be3aeb5e40..dd65f4bbf5 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -467,9 +467,6 @@ test_protover_supported_protocols(void *arg) PROTOVER_HSDIR_V3)); /* No DirCache versions appear anywhere in the code. */ - tt_assert(protocol_list_supports_protocol(supported_protocols, - PRT_DIRCACHE, - PROTOVER_DIRCACHE_V1)); tt_assert(protocol_list_supports_protocol(supported_protocols, PRT_DIRCACHE, PROTOVER_DIRCACHE_V2));

1 0

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

12 Feb '21

commit 9fbedc74c3f3b26efdec7300e1cc41e7e2c23f49 Merge: b64fe4bf55 58b5300f44 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:50:36 2021 +0200 Merge branch 'maint-0.4.5' changes/bug40281 | 6 ++++++ src/feature/nodelist/networkstatus.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/master] Don't log supported-protover warnings if consensus is older than Tor.
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 56f1cab9c12349538c5526de92d6e64fecb81184 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 11:52:53 2021 -0500 Don't log supported-protover warnings if consensus is older than Tor. Previously we would warn in this case... but there's really no justification for doing so, and it can only cause confusion. Fixes bug #40281; bugfix on 0.4.0.1-alpha. --- changes/bug40281 | 6 ++++++ src/feature/nodelist/networkstatus.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changes/bug40281 b/changes/bug40281 new file mode 100644 index 0000000000..0708039f04 --- /dev/null +++ b/changes/bug40281 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - Avoid a spurious log message about missing subprotocol versions, when + the consensus that we're reading from is older than the current + release. . Previously we had made this message nonfatal in this case, + but in practice, it is never relevant when the consensus is older than + the current release. Fixes bug 40281; bugfix on 0.4.0.1-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index e07d58c91c..8e47fafd3c 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2713,6 +2713,13 @@ networkstatus_check_required_protocols(const networkstatus_t *ns, const bool consensus_postdates_this_release = ns->valid_after >= tor_get_approx_release_date(); + if (! consensus_postdates_this_release) { + // We can't meaningfully warn about this case: This consensus is from + // before we were released, so whatever is says about required or + // recommended versions may no longer be true. + return 0; + } + tor_assert(warning_out); if (client_mode) { @@ -2730,7 +2737,7 @@ networkstatus_check_required_protocols(const networkstatus_t *ns, "%s on the Tor network. The missing protocols are: %s", func, missing); tor_free(missing); - return consensus_postdates_this_release ? 1 : 0; + return 1; } if (! protover_all_supported(recommended, &missing)) {

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/295' into maint-0.4.5
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 58b5300f4433f7cb741681a0501adba19af4ae6f Merge: 758000aa98 56f1cab9c1 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:44:03 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/295' into maint-0.4.5 changes/bug40281 | 6 ++++++ src/feature/nodelist/networkstatus.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/295' into maint-0.4.5
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 58b5300f4433f7cb741681a0501adba19af4ae6f Merge: 758000aa98 56f1cab9c1 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:44:03 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/295' into maint-0.4.5 changes/bug40281 | 6 ++++++ src/feature/nodelist/networkstatus.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Don't log supported-protover warnings if consensus is older than Tor.
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 56f1cab9c12349538c5526de92d6e64fecb81184 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 11:52:53 2021 -0500 Don't log supported-protover warnings if consensus is older than Tor. Previously we would warn in this case... but there's really no justification for doing so, and it can only cause confusion. Fixes bug #40281; bugfix on 0.4.0.1-alpha. --- changes/bug40281 | 6 ++++++ src/feature/nodelist/networkstatus.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changes/bug40281 b/changes/bug40281 new file mode 100644 index 0000000000..0708039f04 --- /dev/null +++ b/changes/bug40281 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - Avoid a spurious log message about missing subprotocol versions, when + the consensus that we're reading from is older than the current + release. . Previously we had made this message nonfatal in this case, + but in practice, it is never relevant when the consensus is older than + the current release. Fixes bug 40281; bugfix on 0.4.0.1-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index e07d58c91c..8e47fafd3c 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2713,6 +2713,13 @@ networkstatus_check_required_protocols(const networkstatus_t *ns, const bool consensus_postdates_this_release = ns->valid_after >= tor_get_approx_release_date(); + if (! consensus_postdates_this_release) { + // We can't meaningfully warn about this case: This consensus is from + // before we were released, so whatever is says about required or + // recommended versions may no longer be true. + return 0; + } + tor_assert(warning_out); if (client_mode) { @@ -2730,7 +2737,7 @@ networkstatus_check_required_protocols(const networkstatus_t *ns, "%s on the Tor network. The missing protocols are: %s", func, missing); tor_free(missing); - return consensus_postdates_this_release ? 1 : 0; + return 1; } if (! protover_all_supported(recommended, &missing)) {

1 0