SSL truststore working.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / http / client / SpnegoHttpClient.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java b/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
index 674cfdf150a55fff6ec1fda1a9528fdfad538c72..806a57569449f8fec9bd4565411df03756d08227 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/client/SpnegoHttpClient.java
@@ -69,33 +69,15 @@ public class SpnegoHttpClient {
        }
 
        private static HttpClient openHttpClient(Subject subject) {
-               // disable https check
-               // jdk.internal.httpclient.disableHostnameVerification=true
-               HttpClient client = HttpClient.newBuilder().sslContext(insecureContext())
-//                             .authenticator(new Authenticator() {
-//                     public PasswordAuthentication getPasswordAuthentication() {
-//                             return null;
-//                     }
-//
-//             })
-                               .version(HttpClient.Version.HTTP_1_1).build();
+               HttpClient client = HttpClient.newBuilder() //
+//                             .sslContext(insecureContext()) //
+                               .version(HttpClient.Version.HTTP_1_1) //
+                               .build();
 
                return client;
-
-               // return client;
-//                     AuthPolicy.registerAuthScheme(SpnegoAuthScheme.NAME, SpnegoAuthScheme.class);
-//                     HttpParams params = DefaultHttpParams.getDefaultParams();
-//                     ArrayList<String> schemes = new ArrayList<>();
-//                     schemes.add(SpnegoAuthScheme.NAME);
-//                     params.setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, schemes);
-//                     params.setParameter(CredentialsProvider.PROVIDER, new HttpCredentialProvider());
-//                     HttpClient httpClient = new HttpClient();
-//                     httpClient.executeMethod(new GetMethod(("https://" + server + "/ipa/session/json")));
-//                     return httpClient;
-
        }
 
-       private static SSLContext insecureContext() {
+       static SSLContext insecureContext() {
                TrustManager[] noopTrustManager = new TrustManager[] { new X509TrustManager() {
                        public void checkClientTrusted(X509Certificate[] xcs, String string) {
                        }