From 7603295e6d3d423c9bdb99a24c1ec589117ab435 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Thu, 15 Nov 2018 14:31:33 +0100 Subject: [PATCH] SONAR-11487 Update OKHttp to 3.11.0 --- build.gradle | 2 +- .../java/org/sonar/server/util/OkHttpClientProviderTest.java | 3 ++- .../main/java/org/sonarqube/ws/client/OkHttpClientBuilder.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 4a77204c672..4dfe23ea4ab 100644 --- a/build.gradle +++ b/build.gradle @@ -140,7 +140,7 @@ subprojects { dependency 'com.ibm.icu:icu4j:3.4.4' dependency 'com.microsoft.sqlserver:mssql-jdbc:6.2.2.jre8' dependency 'com.oracle.jdbc:ojdbc8:12.2.0.1.0' - dependencySet(group: 'com.squareup.okhttp3', version: '3.7.0') { + dependencySet(group: 'com.squareup.okhttp3', version: '3.11.0') { entry 'okhttp' entry 'mockwebserver' } diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java index b6f2f037a98..9a1ffd80e1b 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java @@ -66,7 +66,8 @@ public class OkHttpClientProviderTest { settings.setProperty("http.proxyPassword", "the-password"); OkHttpClient client = underTest.provide(settings.asConfig(), runtime); - Response response = new Response.Builder().protocol(Protocol.HTTP_1_1).request(new Request.Builder().url("http://foo").build()).code(407).build(); + Response response = new Response.Builder().protocol(Protocol.HTTP_1_1).request(new Request.Builder().url("http://foo").build()).code(407) + .message("").build(); Request request = client.proxyAuthenticator().authenticate(null, response); assertThat(request.header("Proxy-Authorization")).isEqualTo("Basic " + Base64.getEncoder().encodeToString("the-login:the-password".getBytes())); diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpClientBuilder.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpClientBuilder.java index 50d0c24b17b..26f30c98702 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpClientBuilder.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpClientBuilder.java @@ -46,6 +46,7 @@ import okhttp3.Interceptor; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +import okhttp3.internal.tls.OkHostnameVerifier; import static com.google.common.base.Strings.nullToEmpty; import static java.nio.charset.StandardCharsets.UTF_8; @@ -192,6 +193,7 @@ public class OkHttpClientBuilder { X509TrustManager trustManager = sslTrustManager != null ? sslTrustManager : systemDefaultTrustManager(); SSLSocketFactory sslFactory = sslSocketFactory != null ? sslSocketFactory : systemDefaultSslSocketFactory(trustManager); builder.sslSocketFactory(sslFactory, trustManager); + builder.hostnameVerifier(OkHostnameVerifier.INSTANCE); return builder.build(); } -- 2.39.5