From 50b564da184f317cc5ecbddc84f787320579fbf8 Mon Sep 17 00:00:00 2001 From: nonameformee <545-nonameformee@gitlab.torproject.org> Date: Sun, 10 Dec 2023 10:36:48 +0000 Subject: [PATCH] dirauth: Reject 0.4.7.x series at the authority level --- changes/ticket40896 | 2 ++ src/feature/dirauth/dirauth_options.inc | 2 +- src/test/test_process_descs.c | 12 ++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 changes/ticket40896 diff --git a/changes/ticket40896 b/changes/ticket40896 new file mode 100644 index 0000000000..4f04ce71dc --- /dev/null +++ b/changes/ticket40896 @@ -0,0 +1,2 @@ + o Minor feature (authority): + - Reject 0.4.7.x series at the authority level. Closes ticket 40896. \ No newline at end of file diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc index 9284c31a59..c6f9c09213 100644 --- a/src/feature/dirauth/dirauth_options.inc +++ b/src/feature/dirauth/dirauth_options.inc @@ -77,7 +77,7 @@ CONF_VAR(RecommendedClientVersions, LINELIST, 0, NULL) CONF_VAR(RecommendedServerVersions, LINELIST, 0, NULL) /** Which minimal version of tor do we accept relay descriptors from? */ -CONF_VAR(MinimalAcceptedServerVersion, STRING, 0, "0.4.7.0-alpha-dev") +CONF_VAR(MinimalAcceptedServerVersion, STRING, 0, "0.4.8.0-alpha-dev") /** Relays which should be voted Guard regardless of uptime and bandwidth. */ CONF_VAR(AuthDirVoteGuard, ROUTERSET, 0, NULL) diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c index c13e8b58c4..4e35d89ff2 100644 --- a/src/test/test_process_descs.c +++ b/src/test/test_process_descs.c @@ -54,11 +54,15 @@ test_process_descs_versions(void *arg) { "Tor 0.4.6.1-alpha", true }, { "Tor 0.4.6.5", true }, { "Tor 0.4.6.50", true }, /* Non existing one in the 0.4.6 series */ + { "Tor 0.4.7.0-alpha-dev", true }, + { "Tor 0.4.7.3-alpha", true }, + { "Tor 0.4.7.12", true }, - /* The 0.4.7.x series is supported. */ - { "Tor 0.4.7.0-alpha-dev", false }, - { "Tor 0.4.7.3-alpha", false }, - { "Tor 0.4.7.12", false }, + /* The 0.4.8.x series is supported. */ + { "Tor 0.4.8.0-alpha-dev", false }, + { "Tor 0.4.8.2-alpha", false }, + { "Tor 0.4.8.3-rc", false }, + { "Tor 0.4.8.12", false }, // Very far in the future { "Tor 100.100.1.5", false },