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

Update shell extension tasks to check for site-specific file #6905

Merged
merged 1 commit into from
Aug 8, 2023

Conversation

zenmonkeykstop
Copy link
Contributor

Status

Ready for review

Description of Changes

Fixes #6903.

During installation of the Tails shell extension:

  • Ansible checks for existence of site-specific before attempting to load variables from it
  • The extension JS script gets sensible defaults if site-specific is not present

Testing

  • Follow docs for creation of a Journalist workstation and verify that it succeeds, with no SSH options in the shell extension
  • Follow docs for creation of an Admin Workstation and verify that it succeeds, with SSH options in the shell extension.

Deployment

  • Will be deployed and set up with next release
  • a docs workaround may be necessary in the interim for fresh installs.

Checklist

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

Choose one of the following:

  • I have opened a PR in the docs repo for these changes, or will do so later
  • I would appreciate help with the documentation
  • These changes do not require documentation

@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner August 2, 2023 18:08
@nathandyer nathandyer self-requested a review August 2, 2023 18:11
Copy link
Contributor

@nathandyer nathandyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the changes here LGTM

Testing

  • Follow docs for creation of a Journalist workstation and verify that it succeeds, with no SSH options in the shell extension
    • Brand-new USB stick with Tails freshly installed
    • ./securedrop-admin tailsconfig succeeds without error
    • SecureDrop Menu loads on Tor connection after next reboot
    • SSH options do not appear
  • Follow docs for creation of an Admin Workstation and verify that it succeeds, with SSH options in the shell extension.
    • ./securedrop-admin tailsconfig succeeded without error
    • SecureDrop Menu loads on Tor connection after next reboot
    • SSH options in the shell extension on reboot
    • SSH options functional

Not a maintainer so I can't merge, but this should be ready for a stamp.

@zenmonkeykstop please let me know what (if any) changes we need to make to the docs prior to this fix making it to an official release, and I'll get a docs PR filed. Thanks!

@legoktm legoktm merged commit 3d861f5 into develop Aug 8, 2023
@legoktm legoktm deleted the 6903-fix-jw branch August 8, 2023 22:55
@cfm cfm mentioned this pull request Aug 17, 2023
22 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provisioning a Journalist Workstation fails without the site-specific file
3 participants