MPP-3852: Use cryptography for SNS signature validation, remove pyopenssl and pem
#5235
Conversation
This file contains hidden or 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
groovecoder
approved these changes
Dec 4, 2024
Comment on lines
+19
to
+20
| NOTIFICATION_HASH_FORMAT = """\ | ||
| Message |
There was a problem hiding this comment.
praise: nice little clean-up.
emails/sns.py
Outdated
| # Extract the first certificate in the file and confirm it's a valid | ||
| # PEM certificate | ||
| certificates = pem.parse(smart_bytes(pemfile)) | ||
|
|
||
| certs = x509.load_pem_x509_certificates(pemfile) |
There was a problem hiding this comment.
quibble (non-blocking): this is 2x calls to x509.load_pem_x509_certificate[s] when we could maybe change the code to only call load_pem_x509_certificate 1x and return the single valid cert that it loaded?
There was a problem hiding this comment.
I took it one step futher and changed _grab_keyfile, returning PEM bytes, to _get_signing_public_key, returning an RSAPublicKey. This way the certificate is loaded and validated the first time it is read, not every time it is fetched from the cache.
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.
This builds on PR #5234. It changes
emails/sns.pyto usecryptographyfor PEM loading, certificate validation, and signature verification. It removes the dependenciespyopensslandpem, which are no longer needed.It adds a new exception
VerificationFailedfor exceptions, rather than replaceOpenSSL.crypto.Errorwithcryptography.exceptions.InvalidSignature. This requires updating some tests andtryblocks, which would have needed to update anyway, but does insulate the code from future changes.Once this merges, I expect