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

Unbreak export on Qubes OS R4.1 #1495

Merged
merged 1 commit into from
May 26, 2022
Merged

Unbreak export on Qubes OS R4.1 #1495

merged 1 commit into from
May 26, 2022

Conversation

eaon
Copy link
Contributor

@eaon eaon commented May 25, 2022

Description

On templates using R4.1 tools, qvm-open-in-vm redirects stdout/stderr to /dev/null, so instead we call qrexec-client-vm directly

Fixes freedomofpress/securedrop-workstation#775

Test Plan

In Qubes 4.0:

  • Exporting a file from the client is successful

In Qubes 4.1, using our VM templates with Qubes R4.1 repositories (i.e. bullseye, buster with manual upgrade, or after in-place upgrade to 4.1):

  • Exporting a file from the client is successful

Checklist

  • I have tested these changes in the appropriate Qubes environment
  • No update to the AppArmor profile is required for these changes
  • No database schema changes are needed

@eaon eaon requested a review from a team as a code owner May 25, 2022 03:09
@eaon eaon added this to Ready for Review in SecureDrop Team Board May 25, 2022
@sssoleileraaa
Copy link
Contributor

In Qubes 4.1, using our VM templates with Qubes R4.1 repositories (i.e. bullseye, buster with manual upgrade, or after in-place upgrade to 4.1):

Right now, @eloquence is the only other dev with the appropriate setup for testing with an environment that point to the 4.1 repos (I can work through the same steps that @eaon took to get a fresh install set up, but that might not happen this week, so it would be great if @eloquence could review this one)

@eloquence
Copy link
Member

eloquence commented May 26, 2022

  • Tested on 4.0; works without issues.
  • Tested on 4.1 with 4.1 repos in templates; works without issues.

One smol legit test failure (and may need rebase to pick up #1499), once that's updated, looks good to merge!

On templates using R4.1 tools, `qvm-open-in-vm` redirects stdout/stderr to
`/dev/null`, so instead we call `qrexec-client-vm` directly

Fixes securedrop-workstation#775
@eaon
Copy link
Contributor Author

eaon commented May 26, 2022

Rebased and test adapted 🤞

Copy link
Member

@eloquence eloquence left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks much :)

@eloquence eloquence merged commit bdf2f39 into main May 26, 2022
SecureDrop Team Board automation moved this from Ready for Review to Done May 26, 2022
@eloquence eloquence deleted the export-4.1-compat branch May 26, 2022 22:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Export broken on Qubes 4.1 [in-place upgrade/4.1 repos]
3 participants