Remove v3 onion secrets when transitioning to ssh over local #4794
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- v2 aths secret file pattern does not match the one for v3 - Use async task for reboot for more immediate feedback - Instruct admin to run tailsconfig to update the ssh config on tails workstation
Codecov Report
@@ Coverage Diff @@
## develop #4794 +/- ##
===========================================
+ Coverage 81.68% 81.74% +0.05%
===========================================
Files 49 49
Lines 3418 3418
Branches 392 392
===========================================
+ Hits 2792 2794 +2
+ Misses 535 533 -2
Partials 91 91
Continue to review full report at Codecov.
|
|
Reviewed in prod VMs:
LGTM, will merge after a diff review |
zenmonkeykstop
approved these changes
Sep 11, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Fixes #4780 and fixes #4779.
Testing
Using a Tails prod setup (either VMs or hardware)
Install with default settings (ssh over tor, using v3 onion services)
set
enable_ssh_over_torto false, run./securedrop-admin installv3 onion secrets (app-ssh.auth_private and mon-ssh.auth_private) are no longer in `install_files/ansible-base
I can ssh to both app and mon servers after transitioning to ssh over local
set
enable_ssh_over_torto true, run./securedrop-admin installrun
./securedrop-admin tailsconfigI can ssh to app and mon servers over tor
Follow steps to reproduce in Playbook stalls when switching from SSH-over-Tor to SSH-over-LAN. #4779
This pr also closes Playbook stalls when switching from SSH-over-Tor to SSH-over-LAN. #4779
Deployment
This will be provided via the Ansible scripts delivered by git.
Checklist
If you made changes to the server application code:
make lint) and tests (make -C securedrop test) pass in the development containerIf you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerIf you made changes to the system configuration:
If you made non-trivial code changes:
If you made changes to documentation:
make docs-lint) passed locally