[tor-commits] [tor/main] dirauth: Reject EOL relays

[ahf at torproject.org]

commit 0f7e0d5f2f4d2e472d1c5eeb47bbc61d4704acbb
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Oct 8 11:04:11 2021 -0400

    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 at torproject.org>
---
 changes/ticket40480                 |  3 +++
 src/feature/dirauth/process_descs.c |  8 ++++----
 src/test/test_process_descs.c       | 14 +++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/changes/ticket40480 b/changes/ticket40480
new file mode 100644
index 0000000000..525e848a1f
--- /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 eca987b8b5..5ea9d16850 100644
--- 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 fa2657f6c2..5503fc69ee 100644
--- 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 },
   };