tor

commit fbca1df9dd7691ada4837ce4deda87315c87e6a2
parent 56819b0a5027807ed6c7894c164a541bf32ee957
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 30 Jan 2024 10:56:16 -0500

dirauth: Reject 0.4.7.x series at the authority level

Signed-off-by: David Goulet <dgoulet@torproject.org>

Diffstat:
A
changes/ticket40896
 | 
3
+++
M
src/feature/dirauth/process_descs.c
 | 
4
++--
M
src/test/test_process_descs.c
 | 
12
++++++++----

3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/changes/ticket40896 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/process_descs.c b/src/feature/dirauth/process_descs.c
@@ -404,8 +404,8 @@ dirserv_rejects_tor_version(const char *platform,
   static const char please_upgrade_string[] =
     "Tor version is insecure or unsupported. Please upgrade!";
 
-  /* Anything before 0.4.7.0 is unsupported. Reject them. */
-  if (!tor_version_as_new_as(platform,"0.4.7.0-alpha-dev")) {
+  /* Anything before 0.4.8.0 is unsupported. Reject them. */
+  if (!tor_version_as_new_as(platform,"0.4.8.0-alpha-dev")) {
     if (msg) {
       *msg = please_upgrade_string;
     }
diff --git 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 },