Skip to content

Fix keystore for APM-server communication#2362

Merged
SylvainJuge merged 3 commits intoelastic:masterfrom
SylvainJuge:add-keystore-support
Dec 21, 2021
Merged

Fix keystore for APM-server communication#2362
SylvainJuge merged 3 commits intoelastic:masterfrom
SylvainJuge:add-keystore-support

Conversation

@SylvainJuge
Copy link
Member

@SylvainJuge SylvainJuge commented Dec 21, 2021

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 keyStore configuration 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.keyStore
  • javax.net.ssl.keyStorePassword
  • javax.net.ssl.keyStoreType
  • javax.net.ssl.keyStoreProvider

Checklist

@ghost
Copy link

ghost commented Dec 21, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-21T10:46:00.591+0000

  • Duration: 65 min 10 sec

  • Commit: d6e3c30

Test stats 🧪

Test Results
Failed 0
Passed 2639
Skipped 21
Total 2660

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run benchmark tests : Run the benchmark test.

  • run compatibility tests : Run the JDK Compatibility test.

  • run integration tests : Run the APM-ITs.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@SylvainJuge SylvainJuge self-assigned this Dec 21, 2021
Copy link
Contributor

@jackshirazi jackshirazi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice work!

@SylvainJuge SylvainJuge enabled auto-merge (squash) December 21, 2021 10:50
@SylvainJuge SylvainJuge added the await-release Mark issues that depend on next release, or PRs that are planned to be included label Dec 21, 2021
@SylvainJuge SylvainJuge merged commit e83f547 into elastic:master Dec 21, 2021
@SylvainJuge SylvainJuge deleted the add-keystore-support branch December 21, 2021 12:09
@SylvainJuge SylvainJuge removed the await-release Mark issues that depend on next release, or PRs that are planned to be included label Feb 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

2 participants