[tor-commits] [tor/maint-0.4.6] hs-v2: Disable version 2 service

[dgoulet at torproject.org]

commit 471149b651cd3ef953cd0961b871c7a519313f37
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 19 09:11:12 2021 -0400

    hs-v2: Disable version 2 service
    
    The minimum service version is raised from 2 to 3 which effectively
    disable loading or creating an onion service v2.
    
    As for ADD_ONION, for version 2, a 551 error is returned:
    
      "551 Failed to add Onion Service"
    
    Part of #40476
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/control/control_cmd.c | 8 +++++---
 src/feature/hs/hs_common.h        | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
index 0456d709f5..3b23018c9c 100644
--- a/src/feature/control/control_cmd.c
+++ b/src/feature/control/control_cmd.c
@@ -1662,11 +1662,13 @@ add_onion_helper_add_service(int hs_version,
   tor_assert(port_cfgs);
   tor_assert(address_out);
 
+  /* Version 2 is disabled. */
+  (void) auth_type;
+  (void) auth_clients;
+
   switch (hs_version) {
   case HS_VERSION_TWO:
-    ret = rend_service_add_ephemeral(pk->v2, port_cfgs, max_streams,
-                                     max_streams_close_circuit, auth_type,
-                                     auth_clients, address_out);
+    ret = RSAE_INTERNAL;
     break;
   case HS_VERSION_THREE:
     ret = hs_service_add_ephemeral(pk->v3, port_cfgs, max_streams,
diff --git a/src/feature/hs/hs_common.h b/src/feature/hs/hs_common.h
index 4a9c7a9918..274017180a 100644
--- a/src/feature/hs/hs_common.h
+++ b/src/feature/hs/hs_common.h
@@ -25,7 +25,7 @@ struct ed25519_keypair_t;
 /** Version 3 of the protocol (prop224). */
 #define HS_VERSION_THREE 3
 /** Earliest version we support. */
-#define HS_VERSION_MIN HS_VERSION_TWO
+#define HS_VERSION_MIN HS_VERSION_THREE
 /** Latest version we support. */
 #define HS_VERSION_MAX HS_VERSION_THREE