openssl_pkcs12: Add idempotency checks #54633
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
ansibot
added
affects_2.8
ansibot
added
needs_revision
ansibot
added
community_review
Shaps
force-pushed
the
openssl_pkcs12_idempotency
branch
from
a43b1fe
to
910f4bb
Compare
| if (pkcs12_other_certificates is not None) and (self.ca_certificates is not None): | ||
| expected_ca_certs = [crypto.dump_certificate(crypto.FILETYPE_PEM, | ||
| ca_cert) for ca_cert in self.pkcs12.get_ca_certificates()] | ||
| expected_ca_certs.append(crypto.dump_certificate(crypto.FILETYPE_PEM, self.pkcs12.get_certificate())) |
There was a problem hiding this comment.
Why do you include the current certificate in the set of CA certs?
| elif bool(pkcs12_other_certificates) != bool(self.ca_certificates): | ||
| return False | ||
|
|
||
| if not pkcs12_other_certificates: |
There was a problem hiding this comment.
It appears that if the pkcs12 file has additional certs, the get_friendlyname method ( from parse ) returns None, making this fail unnecessarily. That said, I guess I could/should change this to be
not pkcs12_other_certificates and not pkcs12_friendly_nameThere was a problem hiding this comment.
Hmm, that's even more strange. I'd say outright terrible :)
I've looked at the pyOpenSSL implementation of encoding and decoding PKCS12 files, it is essentially calling the OpenSSL functions from the other comment. The friendly name comes from the main cert extracted from the PKCS12 file, i.e. when the order is f**ked up, I would expect friendly_name to also be wrong.
|
Also, you need a changelog fragment :) |
|
YES :D
|
ansibot
added
stale_ci
Also decoupled the 'parse' and 'generate' function from the file write as they are now used in different places that do not need the file to be written to disk.
Also adds a new test for pkcs12 files with multiple certificates
ca_certificates is left as an alias to other_certificates; friendlyname depends on private key, so it will be ignored while checking for idempotency if the pkey is not set; idempotency check only checks for correct certs in the stack
Shaps
force-pushed
the
openssl_pkcs12_idempotency
branch
from
b171709
to
c45f8d5
Compare
ansibot
added
core_review
ffdybuster
approved these changes
Apr 10, 2019
felixfontein
approved these changes
Apr 10, 2019
ansibot
added
shipit
|
Thanks all! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
Adds idempotency checks to the openssl_pkcs12 module and related tests.
Also decoupled
parseandgeneratefrom the file write, as they are now used for multiple stuff that don't require the file to be written to disk.Fixes #53221
ISSUE TYPE
COMPONENT NAME
openssl_pkcs12