dirauth: Reject EOL relays

Series 0.4.2.x, 0.4.3.x and 0.4.4.x will all be rejected at the
authority level at this commit.

Futhermore, the 0.4.5.x alphas and rc will also be rejected.

Closes #40480

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

diff --git a/changes/ticket40480 b/changes/ticket40480
new file mode 100644 (file)
index 0000000..525e848
--- /dev/null
+++ b/changes/ticket40480
@@ -0,0 +1,3 @@
+  o Minor feature (authority, relay):
+    - Reject End-Of-Life relays running version 0.4.2.x, 0.4.3.x, 0.4.4.x and
+      0.4.5 alphas and rc. Closes ticket 40480.

diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c
index eca987b8b5a2ba8492bea3e933764b80e0012785..5ea9d1685089b5f34363838a863d2a80f56214d5 100644 (file)
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -412,11 +412,11 @@ dirserv_rejects_tor_version(const char *platform,
     return true;
   }
 
-  /* Series between Tor 0.3.6 and 0.4.1 inclusive are unsupported. Reject
-   * them. 0.3.6.0-alpha-dev only existed for a short time, before it was
-   * renamed to 0.4.0.0-alpha-dev. */
+  /* Series between Tor 0.3.6.x and 0.4.5.5-rc inclusive are unsupported.
+   * Reject them. 0.3.6.0-alpha-dev only existed for a short time, before it
+   * was renamed to 0.4.0.0-alpha-dev. */
   if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") &&
-      !tor_version_as_new_as(platform,"0.4.2.1-alpha")) {
+      !tor_version_as_new_as(platform,"0.4.5.6")) {
     if (msg) {
       *msg = please_upgrade_string;
     }

diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c
index fa2657f6c25228e91c8d7ebfc30680db66312257..5503fc69ee9624c0b8cbb0d148052402f0ccb1eb 100644 (file)
--- a/src/test/test_process_descs.c
+++ b/src/test/test_process_descs.c
@@ -39,12 +39,20 @@ test_process_descs_versions(void *arg)
     { "Tor 0.4.1.1-alpha", true },
     { "Tor 0.4.1.4-rc", true },
     { "Tor 0.4.1.5", true },
+    { "Tor 0.4.2.1-alpha", true },
+    { "Tor 0.4.2.4-rc", true },
+    { "Tor 0.4.2.5", true },
+    { "Tor 0.4.3.0-alpha-dev", true },
+    { "Tor 0.4.3.8", true },
+    { "Tor 0.4.4.9", true },
+    { "Tor 0.4.5.5-rc", true },
     // new enough to be supported
     { "Tor 0.3.5.7", false },
     { "Tor 0.3.5.8", false },
-    { "Tor 0.4.2.1-alpha", false },
-    { "Tor 0.4.2.4-rc", false },
-    { "Tor 0.4.3.0-alpha-dev", false },
+    { "Tor 0.4.5.6", false },
+    { "Tor 0.4.6.0-alpha-dev", false },
+    { "Tor 0.4.6.5", false },
+    { "Tor 0.4.7.0-alpha-dev", false },
     // Very far in the future
     { "Tor 100.100.1.5", false },
   };