Skip to content

KAFKA-9771: Port patch for inter-worker Connect SSL from Jetty 9.4.25 #8369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkonstantine merged 2 commits into from
Mar 27, 2020
Merged

KAFKA-9771: Port patch for inter-worker Connect SSL from Jetty 9.4.25 #8369

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe2f87
KAFKA-9771: Port patch for inter-worker Connect SSL from Jetty 9.4.25
C0urante Mar 25, 2020
b694735
KAFKA-9771: Remove unused import
C0urante Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/util/SSLUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.kafka.connect.runtime.WorkerConfig;
import org.eclipse.jetty.util.ssl.SslContextFactory;

import javax.net.ssl.X509ExtendedKeyManager;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -64,7 +65,20 @@ public static SslContextFactory createServerSideSslContextFactory(WorkerConfig c
public static SslContextFactory createClientSideSslContextFactory(WorkerConfig config) {
Map<String, Object> sslConfigValues = config.valuesWithPrefixAllOrNothing("listeners.https.");

final SslContextFactory.Client ssl = new SslContextFactory.Client();
// Override this method in order to avoid running into
// https://github.com/eclipse/jetty.project/issues/4385, which would otherwise cause this to
// break when the keystore contains multiple certificates.
// The override here matches the bug fix in Jetty for that issue:
// https://github.com/eclipse/jetty.project/pull/4404/files#diff-58640db0f8f2cd84b7e653d1c1540913R2188-R2193
// TODO: Remove this override when the version of Jetty for the framework is bumped to
// 9.4.25 or later
final SslContextFactory.Client ssl = new SslContextFactory.Client() {
@Override
@SuppressWarnings("deprecation")
protected X509ExtendedKeyManager newSniX509ExtendedKeyManager(X509ExtendedKeyManager keyManager) {
Comment thread
C0urante marked this conversation as resolved.
return keyManager;
}
};

configureSslContextFactoryKeyStore(ssl, sslConfigValues);
configureSslContextFactoryTrustStore(ssl, sslConfigValues);
Expand Down