Fixes #38119: When the "server_ca_cert" is set and has an empty line, it will fail #969
+1
−1
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
When bundle_pem contains non-certificate contents after the final `---END CERTIFICATE---` line, the `OpenSSL::X509::Certificate.new(pem.join)` action will fail because `pem.join` will be an empty or non-certificate string and the `load_fullchain(bundle_pem)` function will fail. This change adds a check for the presence of `-+BEGIN` followed (however many lines later) by `-+END` before trying to load it as an x509 certificate object.
phess
changed the title
|
I am first trying to update the tests to show this -- #971 |
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.
When bundle_pem contains non-certificate contents after the final
---END CERTIFICATE---line, theOpenSSL::X509::Certificate.new(pem.join)action will fail becausepem.joinwill be an empty or non-certificate string and theload_fullchain(bundle_pem)function will fail.This change adds a check for the presence of
-+BEGINfollowed (however many lines later) by-+ENDbefore trying to load it as an x509 certificate object, thus preventing blank contents from being loaded as x509 certificates.