SONAR-11487 Update OKHttp to 3.11.0

diff --git a/build.gradle b/build.gradle
index 4a77204c672820f0d99ab98184c38b4481d661dd..4dfe23ea4ab4475298ac1cde7da468227397501f 100644 (file)
--- 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 b6f2f037a9841f928de9aa54e51d00691f809481..9a1ffd80e1b8b99a4c0b66d90a0fabed5a7af562 100644 (file)
--- 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 50d0c24b17b166ef570d6a047bdfa34cb2505c5b..26f30c98702adae9b5e69e2483fe17b99404c260 100644 (file)
--- 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();
   }