commit d74dcca6dd109b22dbb7dd43b7dd21c4df002292
author korlov42 <korlov@gridgain.com> Fri Oct 09 20:24:11 2020 +0300
committer Andrew Gaul <andrew@gaul.org> Fri Feb 12 18:57:46 2021 +0900
tree a99816efb9aaf71dc509477eb66e31df39de8cd6
parent 44ff69d144ff4fa0fa980cfba0d2c14fd9175f85

fix UnsupportedOperationException during setting socketFactory

core/src/main/java/org/jclouds/http/config/SSLModule.java

diff --git a/core/src/main/java/org/jclouds/http/config/SSLModule.java b/core/src/main/java/org/jclouds/http/config/SSLModule.java
index 19b85de..f2ce7c1 100644
--- a/core/src/main/java/org/jclouds/http/config/SSLModule.java
+++ b/core/src/main/java/org/jclouds/http/config/SSLModule.java
@@ -46,6 +46,7 @@
       bind(new TypeLiteral<Supplier<SSLContext>>() {
       }).annotatedWith(Names.named("untrusted")).to(new TypeLiteral<UntrustedSSLContextSupplier>() {
       });
+      bind(X509TrustManager.class).annotatedWith(Names.named("untrusted")).to(TrustAllCerts.class);
    }
 
    /**

drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java

diff --git a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java
index 1958e66..40cd85d 100644
--- a/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java
+++ b/drivers/okhttp/src/main/java/org/jclouds/http/okhttp/config/OkHttpCommandExecutorServiceModule.java
@@ -21,6 +21,7 @@
 import javax.inject.Named;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
 
 import okhttp3.OkHttpClient;
 
@@ -56,15 +57,19 @@
    private static final class OkHttpClientProvider implements Provider<OkHttpClient> {
       private final HostnameVerifier verifier;
       private final Supplier<SSLContext> untrustedSSLContextProvider;
+      private final X509TrustManager trustAllCertsManager;
       private final HttpUtils utils;
       private final OkHttpClientSupplier clientSupplier;
 
       @Inject
       OkHttpClientProvider(HttpUtils utils, @Named("untrusted") HostnameVerifier verifier,
-            @Named("untrusted") Supplier<SSLContext> untrustedSSLContextProvider, OkHttpClientSupplier clientSupplier) {
+            @Named("untrusted") Supplier<SSLContext> untrustedSSLContextProvider,
+            @Named("untrusted") X509TrustManager trustAllCertsManager,
+            OkHttpClientSupplier clientSupplier) {
          this.utils = utils;
          this.verifier = verifier;
          this.untrustedSSLContextProvider = untrustedSSLContextProvider;
+         this.trustAllCertsManager = trustAllCertsManager;
          this.clientSupplier = clientSupplier;
       }
 
@@ -82,7 +87,7 @@
             clientBuilder.hostnameVerifier(verifier);
          }
          if (utils.trustAllCerts()) {
-            clientBuilder.sslSocketFactory(untrustedSSLContextProvider.get().getSocketFactory());
+            clientBuilder.sslSocketFactory(untrustedSSLContextProvider.get().getSocketFactory(), trustAllCertsManager);
          }
 
          return clientBuilder.build();