redwood: Don't armor encrypted files/messages #7023
Merged
Conversation
This file contains 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
|
Hmm, seems like there are tests that need an armored version to POST. 🤔 |
...except in one test. We didn't have GPG armor ciphertext, so we don't need redwood to either. This will result in a noticable speedup during encryption. Keys will still be armored when being stored in the database. Tests make this a bit more complicated, we want to generate an armored message we can post to the journalist API, so we make it an optional parameter for redwood.encrypt_message() only. We have to adjust other tests now that we can no longer easily look for the "-----BEGIN PGP MESSAGE-----" string. Refs #7022.
legoktm
force-pushed
the
redwood-no-armor
branch
from
0c1db4b
to
a7a0513
Compare
cfm
approved these changes
Oct 27, 2023
| encrypted_file = encrypted_file_path.read_bytes() | ||
| assert encrypted_file.startswith(b"-----BEGIN PGP MESSAGE-----") | ||
| assert file_to_encrypt_path.read_bytes() not in encrypted_file |
There was a problem hiding this comment.
I raised an eyebrow at this, since file_to_encrypt_path.read_bytes() could be up to 500 MB: couldn't we just check the first chunk, of whatever size? But of course this is just a test, so we control the plaintext input as well as the ciphertext output.
3 tasks
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.
Status
Ready for review
Description of Changes
We didn't have GPG armor ciphertext, so we don't need redwood to either. This will result in a noticable speedup during encryption (c.f. #7022).
We do need to adjust tests now that we can no longer easily look for the "-----BEGIN PGP MESSAGE-----" string.
Testing
How should the reviewer test this PR?
Deployment
Any special considerations for deployment? No, this restores the status quo of non-armored messages.
Checklist
make lint) and tests (make test) pass in the development container