root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: Upgrade jetty to 9.4.27.v20200227 and jersey to 2.31 (#8859) 

Upgrade jetty to 9.4.27.v20200227 and jersey to 2.31

Also remove the workaround used on previous versions from Connect's SSLUtils. 
(Reverts KAFKA-9771 - commit ee832d7d)

Reviewers: Ismael Juma <ismael@juma.me.uk>, Chris Egerton <chrise@confluent.io>, Konstantine Karantasis <konstantine@confluent.io>
This commit is contained in:
Andras Katona 2020-06-17 18:25:02 +02:00 committed by GitHub
parent 0c2dfcfc85
commit 492306a0c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/util/SSLUtils.java
View File

@ -22,7 +22,6 @@ import org.apache.kafka.common.config.types.Password;
import org.apache.kafka.connect.runtime.WorkerConfig; import org.apache.kafka.connect.runtime.WorkerConfig;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import javax.net.ssl.X509ExtendedKeyManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -65,20 +64,7 @@ public class SSLUtils {
public static SslContextFactory createClientSideSslContextFactory(WorkerConfig config) { public static SslContextFactory createClientSideSslContextFactory(WorkerConfig config) {
Map<String, Object> sslConfigValues = config.valuesWithPrefixAllOrNothing("listeners.https."); Map<String, Object> sslConfigValues = config.valuesWithPrefixAllOrNothing("listeners.https.");
// Override this method in order to avoid running into final SslContextFactory.Client ssl = new SslContextFactory.Client();
// 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) {
return keyManager;
}
};
configureSslContextFactoryKeyStore(ssl, sslConfigValues); configureSslContextFactoryKeyStore(ssl, sslConfigValues);
configureSslContextFactoryTrustStore(ssl, sslConfigValues); configureSslContextFactoryTrustStore(ssl, sslConfigValues);

7
gradle/dependencies.gradle
View File

@ -68,11 +68,8 @@ versions += [
easymock: "4.2", easymock: "4.2",
jackson: "2.10.2", jackson: "2.10.2",
jacoco: "0.8.5", jacoco: "0.8.5",
// 9.4.25 renamed closeOutput to completeOutput (https://github.com/eclipse/jetty.project/commit/c5acf965067478784b54e2d241ec58fdb0b2c9fe) jetty: "9.4.27.v20200227",
// which is a method used by recent Jersey versions when this comment was written (2.30.1 was the latest). Please jersey: "2.31",
// verify that this is fixed in some way before bumping the Jetty version.
jetty: "9.4.24.v20191120",
jersey: "2.28",
jmh: "1.23", jmh: "1.23",
hamcrest: "2.2", hamcrest: "2.2",
log4j: "1.2.17", log4j: "1.2.17",