Add v2 onion deprecation warning to securedrop-admin

freedomofpress · Jul 14, 2020 · 0ab186c · 0ab186c
1 parent 0ad9e63
commit 0ab186c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/admin/securedrop_admin/__init__.py b/admin/securedrop_admin/__init__.py
@@ -410,7 +410,9 @@ def __init__(self, args):
              str.split,
              lambda config: True],
             ['v2_onion_services', self.check_for_v2_onion(), bool,
-             'Do you want to enable v2 onion services (recommended only for SecureDrop instances installed before 1.0.0)?',  # noqa: E501
+             'WARNING: For security reasons, support for v2 onion services ' +
+             'will be removed in February 2021. ' +
+             'Do you want to enable v2 onion services?',
              SiteConfig.ValidateYesNo(),
              lambda x: x.lower() == 'yes',
              lambda config: True],

diff --git a/admin/tests/test_integration.py b/admin/tests/test_integration.py
@@ -340,7 +340,7 @@ def verify_locales_prompt(child):
 
 
 def verify_v2_onion_for_first_time(child):
-    child.expect(rb' installed before 1.0.0\)\?\:', timeout=2)  # noqa: E501
+    child.expect(rb'Do you want to enable v2 onion services\?\:', timeout=2)  # noqa: E501
     assert ANSI_ESCAPE.sub('', child.buffer.decode("utf-8")).strip() == 'no'  # noqa: E501