Merge freedomofpress/0.10.2 #24

philmcmahon · 2024-07-19T11:01:39Z

Description

This PR aims to bring our fork of securedrop-client up to date with version 0.10.2 of freedomofpress/securedrop-client.

There has been a significant refactor of the securedrop-client project since we last merged in the upstream repo. As a result I gave up on doing a rebase, instead doing something like this:

git checkout -b merge-0.10.2
git merge freedomofpress/0.10.2
<lots of conflict fixing>

The main challenge with this merge was that the way 'export to USB' works has changed a lot (it uses QWizard now) - and that's what we based our 'export to whistleflow' feature off. Fortunately, the 'print' process remains on the old modal-style process, so I was able to copy that pattern to get whistleflow export working following the giant merge. I've grouped the whistleflow related functions together at the bottom of the new 'export.py' file.

If you're trying to review this, I suggest just looking at ef8cc93 - all the other commits come from the one giant merge commit

Test Plan

I've tested this by running it on my qubes 4.2 workstation in the sd-dev VM and attempting to export to whistleflow. It worked!

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

Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Turkish) Currently translated at 87.5% (91 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Alper Gunay <[email protected]> Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/tr/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Icelandic) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Icelandic) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Icelandic) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Icelandic) Currently translated at 100.0% (98 of 98 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Icelandic) Currently translated at 100.0% (97 of 97 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Icelandic) Currently translated at 100.0% (93 of 93 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Oktavia <[email protected]> Co-authored-by: Sveinn í Felli <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/is/ Translation: SecureDrop/SecureDrop Client

Currently translated at 95.1% (99 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Portuguese (Brazil)) Currently translated at 84.6% (88 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Guilherme <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/pt_BR/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Croatian) Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Croatian) Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Croatian) Currently translated at 96.1% (100 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Croatian) Currently translated at 87.5% (91 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Croatian) Currently translated at 100.0% (94 of 94 strings) Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Igor K <[email protected]> Co-authored-by: Milo Ivir <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/hr/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (German) Currently translated at 100.0% (97 of 97 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (German) Currently translated at 100.0% (93 of 93 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Ettore Atalan <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/de/ Translation: SecureDrop/SecureDrop Client

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Greek) Currently translated at 87.5% (91 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Greek) Currently translated at 100.0% (94 of 94 strings) Added translation using Weblate (Greek) Co-authored-by: Adrian <[email protected]> Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/el/ Translation: SecureDrop/SecureDrop Client

Currently translated at 75.0% (78 of 104 strings) Translated using Weblate (Italian) Currently translated at 56.7% (59 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Italian) Currently translated at 44.2% (46 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Italian) Currently translated at 50.0% (47 of 94 strings) Co-authored-by: Claudio Arseni <[email protected]> Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Weblate <[email protected]> Co-authored-by: lsd-cat <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/it/ Translation: SecureDrop/SecureDrop Client

Currently translated at 98.0% (102 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Russian) Currently translated at 87.5% (91 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Russian) Currently translated at 98.9% (93 of 94 strings) Co-authored-by: Alexey Peschany <[email protected]> Co-authored-by: Andrey <[email protected]> Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ru/ Translation: SecureDrop/SecureDrop Client

Currently translated at 85.5% (89 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Spanish) Currently translated at 87.5% (91 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Spanish) Currently translated at 100.0% (94 of 94 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (94 of 94 strings) Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: David Figuera <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/es/ Translation: SecureDrop/SecureDrop Client

Currently translated at 81.7% (85 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Slovak) Currently translated at 83.6% (87 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: 1000101 <[email protected]> Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/sk/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (French) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (French) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (French) Currently translated at 100.0% (97 of 97 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (French) Currently translated at 100.0% (93 of 93 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (French) Currently translated at 100.0% (94 of 94 strings) Translated using Weblate (French) Currently translated at 100.0% (94 of 94 strings) Translated using Weblate (French) Currently translated at 100.0% (94 of 94 strings) Added translation using Weblate (French) Co-authored-by: AO Localization Lab <[email protected]> Co-authored-by: Weblate <[email protected]> Co-authored-by: vex vex <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/fr/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Swedish) Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Swedish) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Swedish) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Swedish) Currently translated at 100.0% (98 of 98 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Swedish) Currently translated at 100.0% (97 of 97 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Swedish) Currently translated at 100.0% (93 of 93 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Swedish) Currently translated at 100.0% (94 of 94 strings) Co-authored-by: Jonas Waga <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/sv/ Translation: SecureDrop/SecureDrop Client

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Bengali) Currently translated at 2.1% (2 of 94 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Added translation using Weblate (Bengali) Co-authored-by: Weblate <[email protected]> Co-authored-by: diyaf <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/bn/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Finnish) Currently translated at 86.5% (90 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Finnish) Currently translated at 98.9% (93 of 94 strings) Translated using Weblate (Finnish) Currently translated at 97.8% (92 of 94 strings) Translated using Weblate (Finnish) Currently translated at 72.3% (68 of 94 strings) Added translation using Weblate (Finnish) Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Jiri Grönroos <[email protected]> Co-authored-by: Oskari Lavinto <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/fi/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Polish) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Polish) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Polish) Currently translated at 100.0% (98 of 98 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Polish) Currently translated at 100.0% (97 of 97 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Polish) Currently translated at 100.0% (93 of 93 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Polish) Currently translated at 100.0% (94 of 94 strings) Translated using Weblate (Polish) Currently translated at 100.0% (94 of 94 strings) Added translation using Weblate (Polish) Co-authored-by: Adam Rak <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/pl/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Portuguese (Portugal)) Currently translated at 99.0% (103 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Portuguese (Portugal)) Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Portuguese (Portugal)) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Portuguese (Portugal)) Currently translated at 100.0% (97 of 97 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate <[email protected]> Co-authored-by: deeplow <[email protected]> Co-authored-by: notmuchtohide <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/pt_PT/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (104 of 104 strings) Translated using Weblate (Chinese (Traditional)) Currently translated at 15.3% (16 of 104 strings) Added translation using Weblate (Chinese (Traditional)) Co-authored-by: Chi-Hsun Tsai <[email protected]> Co-authored-by: Chido Musodza <[email protected]> Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/zh_Hant/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Chinese (Simplified)) Currently translated at 87.5% (91 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (94 of 94 strings) Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Kishin Sagume <[email protected]> Co-authored-by: Weblate <[email protected]> Co-authored-by: ff98sha <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/zh_Hans/ Translation: SecureDrop/SecureDrop Client

Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (English (XA pseudolocale)) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (English (XA pseudolocale)) Currently translated at 100.0% (104 of 104 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (English (XA pseudolocale)) Currently translated at 100.0% (98 of 98 strings) Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translated using Weblate (English (XA pseudolocale)) Currently translated at 100.0% (97 of 97 strings) Added translation using Weblate (English (XA pseudolocale)) Co-authored-by: Cory Francis Myers <[email protected]> Co-authored-by: Weblate <[email protected]> Co-authored-by: anonymous <[email protected]> Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/ Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/en_XA/ Translation: SecureDrop/SecureDrop Client

Updated by "Squash Git commits" hook in Weblate. Translation: SecureDrop/SecureDrop Client Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/

Same as the last one, we're not concerned with malicious redirects.

We don't install dependencies from mercurial repositories.

Switch dependency management to use poetry, which is much nicer than pip-tools. This is largely based off of <freedomofpress/securedrop-proxy#122> and applies the same changes to the Makefile and CI. The main difference is that we install PyQt5 via system packages, so the two versions we specifically need are listed in pyproject.toml and vary on the Python versions shipped with bullseye and bookworm. We also don't actually need the pathlib2 dependency any more because our Python version is high enough, so it's dropped now that poetry is smart enough to detect it!

Ignore urllib3 and pip alerts

Migrate dependency management to poetry

…xport

…ot use untrusted templates and do not use the from_string function.

…r-ref-pin [0.10.2] Pin builder version for builds at pre-rust-proxy ref

…ate-changelog [0.10.2-rc1] Update changelog

…ngelog-version Update changelog and version to 0.10.2

…export) SecureDrop Client 0.10.2

philmcmahon · 2024-07-19T11:17:40Z

client/securedrop_client/logic.py

@@ -31,7 +31,6 @@
 import sqlalchemy.orm.exc
 from PyQt5.QtCore import QObject, QProcess, QThread, QTimer, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import QCheckBox
-from sdclientapi import AuthError, RequestTimeoutError, ServerConnectionError


sdclientapi is now securedrop_client.sdk (see line 65)

philmcmahon · 2024-07-19T11:18:51Z

client/securedrop_client/gui/conversation/export/whistleflow_dialog.py

@@ -92,7 +94,7 @@ def _show_starting_instructions(self) -> None:

    def _send_to_whistleflow(self) -> None:
        timestamp = datetime.datetime.now().isoformat()
-        self._device.whistleflow_export_requested.emit(
+        self._device.send_files_to_whistleflow(


note - this is a simplification - we're calling the export function directly rather than using signals

philmcmahon · 2024-07-19T11:22:52Z

client/securedrop_client/gui/auth/__init__.py

-from securedrop_client.gui.auth.dialog import LoginDialog  # noqa: F401
+from securedrop_client.gui.auth.dialog import LoginDialog
+
+__all__ = ["LoginDialog"]


somehow this file got messed up in the merge, this reverts it to the state it is in in freedomofpress/0.10.2

philmcmahon · 2024-07-19T11:23:28Z

client/securedrop_client/gui/conversation/export/whistleflow_dialog.py

@@ -13,19 +14,18 @@
 from securedrop_client.export import ExportError, ExportStatus
 from securedrop_client.gui.base import ModalDialog, SecureQLabel

-from .device import Device
+from ....export import Export


there used to be a device.py file but that has been merged with export.py

philmcmahon · 2024-07-19T16:16:08Z

A note on the various CI tests failing:

component-lint - this is failing due to a shell=True being set on a subprocess. I don't know why because semgrep has been deliberately suppressed for that function
safety - this is a vulnerable dependencies checker. I've not modified any dependencies so not sure why this one is failing
test-functional, bullseye - this works on my (bookworm) qubes workstation, I'm not sure what's going on here but tempted to ignore since bullseye is going away very soon

zekehuntergreen · 2024-07-22T16:22:11Z

client/securedrop_client/gui/conversation/export/whistleflow_dialog.py

@@ -13,19 +14,18 @@
 from securedrop_client.export import ExportError, ExportStatus


Suggested change

from securedrop_client.export import ExportError, ExportStatus

from securedrop_client.export import Export, ExportError, ExportStatus

hmm there was a problem with this line - import was from the wrong file, which I've fixed. Export is imported a few lines below, in a slightly weird style with .... but that's the same way as it's done in the print dialog

Ah ok, let's leave it the way it is then. Maybe it fixes a circular import or something?

zekehuntergreen · 2024-07-22T16:30:20Z

Looks good ⭐ thanks for talking me through the changes

weblate and others added 30 commits November 22, 2023 19:12

Update translation files

8f41381

Updated by "Squash Git commits" hook in Weblate. Translation: SecureDrop/SecureDrop Client Translate-URL: https://weblate.securedrop.org/projects/securedrop/securedrop-client/

Ignore urllib3 CVE-2023-45803

883e9d1

Same as the last one, we're not concerned with malicious redirects.

Ignore CVE-2023-5752 in pip

3635064

We don't install dependencies from mercurial repositories.

Merge pull request freedomofpress#1674 from freedomofpress/urllib-ignore

7e8ed3b

Ignore urllib3 and pip alerts

Update README for Poetry changes

b956a6c

Merge pull request freedomofpress#1671 from freedomofpress/only-poetry

fa18de2

Migrate dependency management to poetry

Move client files into client/ folder

9973f9e

Move export files into export/ folder

c519b08

Merge branch 'main' of https://github.com/freedomofpress/securedrop-e…

342c002

…xport

Move log files into log/ folder

5a01a42

zenmonkeykstop and others added 10 commits June 24, 2024 14:13

Updated to reference a tagged version of ssecuredrop-builder

a17d453

Ignore reviewed safety alerts 71064, 67895

dd0f9c4

Ignore safety 70612 (https://data.safetycli.com/v/70612/97c). We do n…

4b108e1

…ot use untrusted templates and do not use the from_string function.

Merge pull request freedomofpress#2050 from freedomofpress/4.1-builde…

fe7fa97

…r-ref-pin [0.10.2] Pin builder version for builds at pre-rust-proxy ref

release-0.10.2-rc1: update changelog

460481e

Merge pull request freedomofpress#2079 from freedomofpress/0.10.2-upd…

7f05d41

…ate-changelog [0.10.2-rc1] Update changelog

Update changelog and version to 0.10.2

43b57cb

Merge pull request freedomofpress#2085 from freedomofpress/0.10.2-cha…

e2aea09

…ngelog-version Update changelog and version to 0.10.2

Merge tag '0.10.2' into merge-0.10.2 (note - this breaks whistleflow …

a43c9bf

…export) SecureDrop Client 0.10.2

Fix whistleflow export following merge of 0.10.2

ef8cc93

philmcmahon force-pushed the merge-0.10.2 branch from 77a05b6 to ef8cc93 Compare July 19, 2024 11:15

philmcmahon commented Jul 19, 2024

View reviewed changes

fix various linting issues

4bd8a40

philmcmahon force-pushed the merge-0.10.2 branch from bd91a18 to 4bd8a40 Compare July 19, 2024 14:24

philmcmahon added 2 commits July 19, 2024 15:27

Update translation catalog

64342d5

fix delete source test (whistleflow has bumped it down the menu)

132a60b

philmcmahon added 2 commits July 19, 2024 17:21

Fix various linting issues

e663911

Add delete sources casette

df0fa1c

philmcmahon force-pushed the merge-0.10.2 branch from 4f7354d to df0fa1c Compare July 19, 2024 16:21

philmcmahon added 3 commits July 19, 2024 17:58

Bump version to 100.10.2

48bf913

Add version 100.10.2 to changelog

8fb2f89

Update changelog to include version 100.10.2

bb90a14

zekehuntergreen reviewed Jul 22, 2024

View reviewed changes

Use correct import in whistleflow_dialog

e5bd594

zekehuntergreen approved these changes Jul 23, 2024

View reviewed changes

philmcmahon merged commit 9a153fa into main Jul 23, 2024
82 of 92 checks passed

philmcmahon mentioned this pull request Jul 23, 2024

Merge version 0.12.0 of freedomofpress/securedrop-client #25

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge freedomofpress/0.10.2 #24

Merge freedomofpress/0.10.2 #24

philmcmahon commented Jul 19, 2024 •

edited

Loading

philmcmahon Jul 19, 2024

philmcmahon Jul 19, 2024

philmcmahon Jul 19, 2024

philmcmahon Jul 19, 2024

philmcmahon commented Jul 19, 2024

zekehuntergreen Jul 22, 2024

philmcmahon Jul 23, 2024

zekehuntergreen Jul 23, 2024

zekehuntergreen commented Jul 22, 2024

		@@ -13,19 +14,18 @@
		from securedrop_client.export import ExportError, ExportStatus

Merge freedomofpress/0.10.2 #24

Merge freedomofpress/0.10.2 #24

Conversation

philmcmahon commented Jul 19, 2024 • edited Loading

Description

Test Plan

Checklist

philmcmahon Jul 19, 2024

Choose a reason for hiding this comment

philmcmahon Jul 19, 2024

Choose a reason for hiding this comment

philmcmahon Jul 19, 2024

Choose a reason for hiding this comment

philmcmahon Jul 19, 2024

Choose a reason for hiding this comment

philmcmahon commented Jul 19, 2024

zekehuntergreen Jul 22, 2024

Choose a reason for hiding this comment

philmcmahon Jul 23, 2024

Choose a reason for hiding this comment

zekehuntergreen Jul 23, 2024

Choose a reason for hiding this comment

zekehuntergreen commented Jul 22, 2024

philmcmahon commented Jul 19, 2024 •

edited

Loading