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

Remove sd-export-usb persistent USB device attachment #323

Merged
merged 2 commits into from
Nov 13, 2019

Conversation

rmol
Copy link
Contributor

@rmol rmol commented Nov 8, 2019

Removes the configuration of a single USB device persistently attached to sd-export-usb, in preparation for automatic attachment of export devices. Until that happens, the Qubes Devices tool should be used to attach them before exporting.

Fixes #320.

Testing

  • In your dom0 clone of securedrop-workstation, run make remove-sd-export to remove your current configuration.
  • Check out this branch in your source repository.
  • Back in dom0, run make clone to pull these changes.
  • (Optional) Remove the "usb" attribute from your config.json.
  • Run make sd-export to recreate the export domains.
  • Start sd-export-usb with Qube Manager.
  • Attach a disk export device to sd-export-usb with Qubes Devices.
  • Export something from the client, or if you have a disk export archive handy, just export it with qvm-open-in-vm sd-export-usb "filename".
  • The export should succeed.

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

Thanks @rmol this looks good, make sd-export and make remove-sd-export seem to work for me locally, I've been having some issues getting a clean install run to complete (for reasons unrelated to this PR). We may need to rebase this on #325 once it gets approved/merged in order to fully test this.

Yesterday, we've merged changes in securedrop-export that mean that the config.json file for the export should no longer be required. As a result, I think the following 2 items can also safely be removed:

@rmol rmol force-pushed the 320-remove-persistent-export-device branch from 2d1394c to 26c0a66 Compare November 13, 2019 19:35
@rmol rmol force-pushed the 320-remove-persistent-export-device branch from 26c0a66 to db037d1 Compare November 13, 2019 19:38
Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

Ran through the test plan, works exactly as advertised, thanks @rmol ! make test also has all (41) tests passing locally.

For those who forget to make clean on the previous branch, they can run qvm-usb remove sd-export-usb in dom0.

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.

Remove persistent attachment to sd-export-usb VM
2 participants