Fix keystore for APM-server communication#2362
Merged
SylvainJuge merged 3 commits intoelastic:masterfrom Dec 21, 2021
Merged
Conversation
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
jackshirazi
reviewed
Dec 21, 2021
apm-agent-core/src/main/java/co/elastic/apm/agent/report/ssl/SslUtils.java
Outdated
Show resolved
Hide resolved
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
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.
What does this PR do?
For the communication with APM server, we use a separate SSL context as the default that is used for the whole JVM.
That allows to implement TLS fallback and disable server certificate validation through configuration when needed.
One side effect of this was that the standard
keyStoreconfiguration parameters that are provided through JVM parameters would not be taken in account by this separate SSL context.In short, it now means that the following parameters are now also effective for the communication with APM server, hence allowing to have client-side certificate validation.
javax.net.ssl.keyStorejavax.net.ssl.keyStorePasswordjavax.net.ssl.keyStoreTypejavax.net.ssl.keyStoreProviderChecklist
I have added tests that would fail without this fix