mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 09:50:29 +01:00
Code Issues Projects Releases Wiki Activity

hs-v2: Add deprecation warning for service

Browse Source 
If at least one service is configured as a version 2, a log warning is emitted
once and only once.

Closes #40003

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2020-07-01 10:53:30 -04:00 committed by Nick Mathewson
parent 5f5587ee50
commit b404f085ad
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40003 Normal file
View File

@ -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.

19
src/feature/rend/rendservice.c
View File

@ -130,6 +130,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 config_line_t *line_,
tor_assert(options);
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) {