Changeset 5233

Timestamp:

01/07/11 18:34:30 (14 years ago)

Author:

bfarka

Message:

restructure of service project #1218

Location:

branches/OKBJavaConnector/HLOKBWebClient/src/main

Files:

• java/at/hl/okb/wsclient/OKBServiceClient.java (modified) (5 diffs)
• resources/HLOKB_KeystoreLocalhost.jks (modified) (previous)
• resources/OKBService.xml (modified) (3 diffs)

branches/OKBJavaConnector/HLOKBWebClient/src/main/java/at/hl/okb/wsclient/OKBServiceClient.java

@@ -3 +3 @@
 import static at.hl.okb.wsclient.Utilities.createNameFilter;
 
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8 +10 @@
 import java.util.Map;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Iterables;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 
 import at.hl.wsclient.okb.Algorithm;
@@ -17 +19 @@
 import at.hl.wsclient.okb.ArrayOfAlgorithm;
 import at.hl.wsclient.okb.ArrayOfAlgorithmParameter;
-import at.hl.wsclient.okb.ArrayOfPlatform;
 import at.hl.wsclient.okb.ArrayOfProblem;
 import at.hl.wsclient.okb.IOKBService;
@@ -25 +26 @@
 import at.hl.wsclient.okb.Problem;
 
+import com.google.common.collect.Iterables;
+
 public class OKBServiceClient {
     OKBService srv = null;
     IOKBService port = null;
 
+    // hack for allowing self signed certificates
+    static {
+  // Create a trust manager that does not validate certificate chains
+  TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
+      public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+    return new java.security.cert.X509Certificate[] {};
+      }
+
+      public void checkClientTrusted(
+        java.security.cert.X509Certificate[] certs, String authType) {
+      }
+
+      public void checkServerTrusted(
+        java.security.cert.X509Certificate[] certs, String authType) {
+      }
+  } };
+
+  SSLContext sc;
+  try {
+      sc = SSLContext.getInstance("SSL");
+      sc.init(null, trustAllCerts, new java.security.SecureRandom());
+      HttpsURLConnection
+        .setDefaultSSLSocketFactory(sc.getSocketFactory());
+  } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException(e);
+  } catch (KeyManagementException e) {
+      throw new RuntimeException(e);
+  }
+
+    }
+
     public OKBServiceClient() {
   this.srv = new OKBService();
-  this.port = srv.getWSHttpBindingIOKBService();
+  this.port = srv.getWSHttpBindingIOKBService1();
     }
 
@@ -48 +82 @@
 
     private void createPlatform(String name) {
-  
+
   ObjectFactory factory = new ObjectFactory();
   Platform platform = factory.createPlatform();
-  
+
   platform.setName(factory.createNamedOKBItemName(name));
   port.addPlatform(platform);

branches/OKBJavaConnector/HLOKBWebClient/src/main/resources/OKBService.xml

@@ -2053 +2053 @@
           <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
             <X509Data>
-              <X509Certificate>MIIB7jCCAVugAwIBAgIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEwMDgxNzE2MTFaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzU+W3f1o9F66BJYnw2RwOfPBWYIUsz3B2A1mNbI7a6kjJmR8qKp/bi5dN6SJxOE0HRSpRXtebU2dvPR78haVgvBSAGVc7FNFpzC7vd64qIcTiUnWz6r7Z4tb11IC8HSyFg/XBUAxEJUB88zOi1uSvf5CAnPDdSEhjF67tPEeFDkCAwEAAaNJMEcwRQYDVR0BBD4wPIAQ5KbnDDhtrCbHXkz79n0QA6EWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAA4GBAC2A/h0HV1CUKqB9x2wxGE4Vjx8K8Xad4zcYNiXC/TxE09jMVJlN2k0OeBWM6Y4bhkxwtFfP0ZTH/4sIv+6hfY0ApDEmWdVtQHs6CIzTjc7Mm7aW8my5dvo90tkm2IgPR/qJeBG7kNAeiqEAHCp2Xn3UZ5i9Y7s9QN7vS7MtxASa
-              </X509Certificate>
+              <!-- <X509Certificate>MIIB7jCCAVugAwIBAgIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEwMDgxNzE2MTFaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzU+W3f1o9F66BJYnw2RwOfPBWYIUsz3B2A1mNbI7a6kjJmR8qKp/bi5dN6SJxOE0HRSpRXtebU2dvPR78haVgvBSAGVc7FNFpzC7vd64qIcTiUnWz6r7Z4tb11IC8HSyFg/XBUAxEJUB88zOi1uSvf5CAnPDdSEhjF67tPEeFDkCAwEAAaNJMEcwRQYDVR0BBD4wPIAQ5KbnDDhtrCbHXkz79n0QA6EWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAA4GBAC2A/h0HV1CUKqB9x2wxGE4Vjx8K8Xad4zcYNiXC/TxE09jMVJlN2k0OeBWM6Y4bhkxwtFfP0ZTH/4sIv+6hfY0ApDEmWdVtQHs6CIzTjc7Mm7aW8my5dvo90tkm2IgPR/qJeBG7kNAeiqEAHCp2Xn3UZ5i9Y7s9QN7vS7MtxASa
+              </X509Certificate> 
+              <X509Certificate>MIIB7jCCAVugAwIBAgIQ0meBmhk5CIFPO5UnHjhOUjAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMTAxMDcxNDAwMzZaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuLYzZApEB/L9S7GWjvERJabg85yL3hZttvQNmBss2vQdE8cJnn9fBTKo8itl0XkGDGtY5Iz3zsR8fsqL7cNCUnMl/c+C5CNz7vYa8U7xf38q6udFx1NL7EMR9V1SfTyCXkOqiMb2NqX6yw1Rq9QYe+VnVL5k3hZtoLuyKAPuJk0CAwEAAaNJMEcwRQYDVR0BBD4wPIAQMzdxtx7LYu7RVs3k80vXj6EWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQ0meBmhk5CIFPO5UnHjhOUjAJBgUrDgMCHQUAA4GBACItYyuXIJJdA32tI8q8kxolwhWZHeJ1wSkoqhU8zOJQTIHS2gFjNgHC8gPQhoV9g9hZ9WGj07F9/VL6F9ziKbXLaYtXv8lzoYOD5iodF8/35Ew4O9tbwFXrNbZBQqk7ZrZF9G15aAH408zoMc/quURFzQKkBa3Z9Apz/l36ewtb
+              </X509Certificate>-->
             </X509Data>
           </KeyInfo>
@@ -2069 +2071 @@
           <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
             <X509Data>
-              <X509Certificate>MIIB7jCCAVugAwIBAgIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEwMDgxNzE2MTFaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzU+W3f1o9F66BJYnw2RwOfPBWYIUsz3B2A1mNbI7a6kjJmR8qKp/bi5dN6SJxOE0HRSpRXtebU2dvPR78haVgvBSAGVc7FNFpzC7vd64qIcTiUnWz6r7Z4tb11IC8HSyFg/XBUAxEJUB88zOi1uSvf5CAnPDdSEhjF67tPEeFDkCAwEAAaNJMEcwRQYDVR0BBD4wPIAQ5KbnDDhtrCbHXkz79n0QA6EWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAA4GBAC2A/h0HV1CUKqB9x2wxGE4Vjx8K8Xad4zcYNiXC/TxE09jMVJlN2k0OeBWM6Y4bhkxwtFfP0ZTH/4sIv+6hfY0ApDEmWdVtQHs6CIzTjc7Mm7aW8my5dvo90tkm2IgPR/qJeBG7kNAeiqEAHCp2Xn3UZ5i9Y7s9QN7vS7MtxASa
-              </X509Certificate>
+              <!-- <X509Certificate>MIIB7jCCAVugAwIBAgIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEwMDgxNzE2MTFaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzU+W3f1o9F66BJYnw2RwOfPBWYIUsz3B2A1mNbI7a6kjJmR8qKp/bi5dN6SJxOE0HRSpRXtebU2dvPR78haVgvBSAGVc7FNFpzC7vd64qIcTiUnWz6r7Z4tb11IC8HSyFg/XBUAxEJUB88zOi1uSvf5CAnPDdSEhjF67tPEeFDkCAwEAAaNJMEcwRQYDVR0BBD4wPIAQ5KbnDDhtrCbHXkz79n0QA6EWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQXxe3/zOBlYpBpwBjMEbJ4DAJBgUrDgMCHQUAA4GBAC2A/h0HV1CUKqB9x2wxGE4Vjx8K8Xad4zcYNiXC/TxE09jMVJlN2k0OeBWM6Y4bhkxwtFfP0ZTH/4sIv+6hfY0ApDEmWdVtQHs6CIzTjc7Mm7aW8my5dvo90tkm2IgPR/qJeBG7kNAeiqEAHCp2Xn3UZ5i9Y7s9QN7vS7MtxASa
+              </X509Certificate> 
+              <X509Certificate>MIIB7jCCAVugAwIBAgIQ0meBmhk5CIFPO5UnHjhOUjAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMTAxMDcxNDAwMzZaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuLYzZApEB/L9S7GWjvERJabg85yL3hZttvQNmBss2vQdE8cJnn9fBTKo8itl0XkGDGtY5Iz3zsR8fsqL7cNCUnMl/c+C5CNz7vYa8U7xf38q6udFx1NL7EMR9V1SfTyCXkOqiMb2NqX6yw1Rq9QYe+VnVL5k3hZtoLuyKAPuJk0CAwEAAaNJMEcwRQYDVR0BBD4wPIAQMzdxtx7LYu7RVs3k80vXj6EWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQ0meBmhk5CIFPO5UnHjhOUjAJBgUrDgMCHQUAA4GBACItYyuXIJJdA32tI8q8kxolwhWZHeJ1wSkoqhU8zOJQTIHS2gFjNgHC8gPQhoV9g9hZ9WGj07F9/VL6F9ziKbXLaYtXv8lzoYOD5iodF8/35Ew4O9tbwFXrNbZBQqk7ZrZF9G15aAH408zoMc/quURFzQKkBa3Z9Apz/l36ewtb
+              </X509Certificate>-->
             </X509Data>
           </KeyInfo>
@@ -2082 +2086 @@
         <sc:CallbackHandlerConfiguration
           wspp:visibility="private">
-          <sc:CallbackHandler default="MartinH" name="usernameHandler" />
-          <sc:CallbackHandler default="mh2404" name="passwordHandler" />
+          <sc:CallbackHandler default="fab" name="usernameHandler" />
+          <sc:CallbackHandler default="fab123" name="passwordHandler" />
         </sc:CallbackHandlerConfiguration>