Use guardian fork of securedrop-client #1
Merged
Conversation
This file contains hidden or 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
86070a0 to
781a55f
Compare
|
Update - I've added a step to launch the guardian's export VMs when securedrop workstation is launched (in sdw-launcher.py) |
philmcmahon
commented
Apr 6, 2023
launcher/whistleflow_launcher.py
Outdated
| def launch_whistleflow(): | ||
| """Launch the Whistleflow view, encrypt and send services""" | ||
| logger.info("Launching whistleflow-view") | ||
| subprocess.Popen(["qvm-run", "whistleflow-view", "systemctl start whistleflow-view"]) |
There was a problem hiding this comment.
this needs removing - whistleflow-view doesn't have a service
philmcmahon
commented
Apr 6, 2023
launcher/whistleflow_launcher.py
Outdated
| logger.info("Launching whistleflow-view") | ||
| subprocess.Popen(["qvm-run", "whistleflow-view", "systemctl start whistleflow-view"]) | ||
| logger.info("Launching whistleflow-encrypt") | ||
| subprocess.Popen(["qvm-run", "whistleflow-encrypt", "systemctl start whistleflow-encrypt"]) |
There was a problem hiding this comment.
not needed due to https://github.com/guardian/whistleflow/pull/17/files
zekehuntergreen
approved these changes
Apr 6, 2023
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.
Description of Changes
This change modifies securedrop-workstation so that it installs the guardian fork of securedrop-client. This is a temporary measure allowing the guardian to start using features such as batch deletion whilst we also collaborate with FPF on getting our desired features into the main branch.
Changes include:
guardianconfig block and required values.Testing
I've tested this fairly heavily on my Qubes machine.
Deployment
RPM files for this fork can be built using the guardian's securedrop build servers (currently closed source) - see https://github.com/guardian/investigations-platform/pull/424
Checklist
If you have made changes to the provisioning logic
make test) pass indom0I ran these and quite a few failed but they didn't appear to be related to my changes. The only actual changes made from the existing securedrop-workstation code are in
dom0/sd-app-files.slsand fairly clear so I'm quite relaxed about merging this.If you have added or removed files
MANIFEST.inandrpm-build/SPECS/securedrop-workstation-dom0-config.specIf documentation is required