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

fix: Accept empty result from sd-devices during export for backwards compatibility #1596

Merged
merged 1 commit into from
Nov 22, 2022

Conversation

rocodes
Copy link
Contributor

@rocodes rocodes commented Nov 21, 2022

Description

Fixes #1594.

Test Plan

Check out this branch in your sd-app vm. Run the client and step through STR in linked issue. Ensure successful export, no errors in logs, and success confirmation message.

Checklist

If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:

  • I have tested these changes in the appropriate Qubes environment
  • I do not have an appropriate Qubes OS workstation set up (the reviewer will need to test these changes)
  • These changes should not need testing in Qubes

If these changes add or remove files other than client code, the AppArmor profile may need to be updated. Please check as applicable:

  • I have updated the AppArmor profile
  • No update to the AppArmor profile is required for these changes
  • I don't know and would appreciate guidance

If these changes modify the database schema, you should include a database migration. Please check as applicable:

  • I have written a migration and upgraded a test database based on main and confirmed that the migration is self-contained and applies cleanly
  • I have written a migration but have not upgraded a test database based on main and would like the reviewer to do so
  • I need help writing a database migration
  • No database schema changes are needed

@rocodes rocodes requested a review from a team as a code owner November 21, 2022 21:18
@rocodes
Copy link
Contributor Author

rocodes commented Nov 21, 2022

(CI is failing due to an outdated dependency, not related to this PR)

Copy link
Contributor

@gonzalo-bulnes gonzalo-bulnes left a comment

Choose a reason for hiding this comment

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

Looks good, still have to go through the test plan.

@gonzalo-bulnes gonzalo-bulnes added bug Something isn't working 🔥 Blocker This PR is somewhat urgent. labels Nov 21, 2022
@gonzalo-bulnes gonzalo-bulnes self-assigned this Nov 21, 2022
@rocodes rocodes force-pushed the 1594-fix-exportstatus branch 2 times, most recently from 8ef24ae to 9718cee Compare November 22, 2022 01:05
@rocodes rocodes force-pushed the 1594-fix-exportstatus branch from 9718cee to e3514b2 Compare November 22, 2022 01:14
Copy link
Contributor

@gonzalo-bulnes gonzalo-bulnes left a comment

Choose a reason for hiding this comment

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

  • I can reproduce the error in main
  • Exporting a file succeeds in this branch
  • Exporting a file doesn't cause errors in sd-devices logs (~/.securedrop_export/logs/export.log)
  • The success message is displayed in the dialog after the file has been exported

@gonzalo-bulnes gonzalo-bulnes merged commit ecb6070 into main Nov 22, 2022
@gonzalo-bulnes gonzalo-bulnes deleted the 1594-fix-exportstatus branch November 22, 2022 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working 🔥 Blocker This PR is somewhat urgent.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Successful export yields "Unexpected Return Status" error message
2 participants