commit 05ca50c9a3d7a7b3c6d8684d9743333f65bfabd7
parent 18fa53fdf4e2b35ceee54c317e989bdbc31183d5
Author: George Kadianakis <desnacked@riseup.net>
Date: Fri, 3 Jul 2020 15:54:24 +0300
Merge branch 'tor-github/pr/1962' into maint-0.4.4
Diffstat:
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/changes/ticket40003 b/changes/ticket40003
@@ -0,0 +1,3 @@
+ o Deprecated features (onion service v2):
+ - Add deprecation warning for onion service version 2. Tor now logs a
+ warning once if a version 2 service is configured. Closes ticket 40003.
diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c
@@ -132,6 +132,22 @@ static smartlist_t *rend_service_list = NULL;
* service on config reload. */
static smartlist_t *rend_service_staging_list = NULL;
+/** Helper: log the deprecation warning for version 2 only once. */
+static void
+log_once_deprecation_warning(void)
+{
+ static bool logged_once = false;
+ if (!logged_once) {
+ log_warn(LD_REND, "DEPRECATED: Onion service version 2 are deprecated. "
+ "Please use version 3 which is the default now. "
+ "Currently, version 2 is planned to be obsolete in "
+ "the Tor version 0.4.6 stable series.");
+ logged_once = true;
+ }
+}
+/** Macro to make it very explicit that we are warning about deprecation. */
+#define WARN_ONCE_DEPRECATION() log_once_deprecation_warning()
+
/* Like rend_get_service_list_mutable, but returns a read-only list. */
static const smartlist_t*
rend_get_service_list(const smartlist_t* substitute_service_list)
@@ -731,6 +747,9 @@ rend_config_service(const hs_opts_t *hs_opts,
tor_assert(hs_opts);
tor_assert(config);
+ /* We are about to configure a version 2 service. Warn of deprecation. */
+ WARN_ONCE_DEPRECATION();
+
/* Use the staging service list so that we can check then do the pruning
* process using the main list at the end. */
if (rend_service_staging_list == NULL) {
