Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add v2 onion deprecation warning to securedrop-admin #5370

Merged
merged 1 commit into from
Jul 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion admin/securedrop_admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion admin/tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down