ZOOKEEPER-5070: Support Single EKU certificates - #2429
Open
PDavid wants to merge 2 commits into
Open
Conversation
Added client keystore, server truststore config
…pport Replace custom ClientServerX509KeyManager and ClientServerX509TrustManager wrappers with two separate SSLContext instances — one for client role (outgoing connections) and one for server role (incoming connections). The custom wrappers were passed to SSLContext.init(), which is rejected by JVM-level FIPS providers that only accept their own validated manager implementations. The new approach initializes each context with standard PKIX managers from their respective keystores, making single-EKU certificate support fully FIPS-compatible. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
PDavid
force-pushed
the
ZOOKEEPER-5070-single-eku
branch
from
August 18, 2026 13:54
bad8dd7 to
d056eeb
Compare
PDavid
marked this pull request as ready for review
August 19, 2026 08:28
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.
Goal
Support certificates with a single Extended Key Usage (EKU) - one cert with
serverAuthfor incoming connections, another withclientAuthfor outgoing connectionsApproach
Use separate
SSLContextinstances for client and server role instead of one. Each is initialized with standard PKIX managers from its own keystore / truststore.If these new properties are not set, ZooKeeper falls back to the existing keyStore.* and trustStore.* configs (shared for both roles), so the change is fully backward-compatible.
Configuration changes
Introduces the following new config properties:
Client keystore
Presented when initiating connections (client role). Allows using a certificate with only clientAuth EKU.
Server truststore
Used when accepting connections (server role). Validates the connecting client's certificate during mTLS.
Quorum client keystore
Quorum server truststore (validates clients when accepting connections)