Improve events and web sockets

[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..42b2a2d12af77ccec9eee093ddf0f017b37fa921 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
@@ -21,8 +21,8 @@ import org.argeo.cms.auth.RemoteAuthUtils;
 
 public class SpnegoHttpClient {
        public static void main(String[] args) throws MalformedURLException {
-               String principal = System.getProperty("javax.security.auth.login.name");
-               if (args.length == 0 || principal == null) {
+//             String principal = System.getProperty("javax.security.auth.login.name");
+               if (args.length == 0 ) {
                        System.err.println("usage: java -Djavax.security.auth.login.name=<principal@REALM> "
                                        + SpnegoHttpClient.class.getName() + " <url>");
                        System.exit(1);
@@ -31,8 +31,8 @@ public class SpnegoHttpClient {
                String url = args[0];
                URL u = new URL(url);
                String server = u.getHost();
-
-               URL jaasUrl = SpnegoAuthScheme.class.getResource("jaas.cfg");
+               
+               URL jaasUrl = SpnegoHttpClient.class.getResource("jaas.cfg");
                System.setProperty("java.security.auth.login.config", jaasUrl.toExternalForm());
                try {
                        LoginContext lc = new LoginContext("SINGLE_USER");
@@ -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) {
                        }