gh #8 solution for tls configuration with sslcontext param for soap based endpoints

Author: Tomasz Gruszewski

README.md

@@ -1,4 +1,4 @@
-# Mobile ID Java client (v1.5.2)
+# Mobile ID Java client (v1.5.3)
 
 Swisscom Mobile ID is a cost-efficient, managed authentication service from Swisscom. The customer-facing API is
 based on open standard ETSI 102 2041. The library from this repository is a reference implementation for 
@@ -104,6 +104,7 @@ tls.setKeyStoreKeyPassword("secret");
 tls.setKeyStoreCertificateAlias("mid-cert");
 tls.setTrustStoreFile("truststore.jks");
 tls.setTrustStorePassword("secret");
+tls.setSslContext("SSLv3");
 
 HttpConfiguration http = config.getHttp();
 http.setConnectionTimeoutInMs(20 * 1000);

docs/configure-the-client.md

@@ -99,6 +99,7 @@ tls.setKeyStoreKeyPassword("secret");
 tls.setKeyStoreCertificateAlias("mid-cert");
 tls.setTrustStoreFile("truststore.jks");
 tls.setTrustStorePassword("secret");
+tls.setSslContext("SSLv3");
 
 HttpConfiguration http = config.getHttp();
 http.setConnectionTimeoutInMs(20 * 1000);

docs/use-the-client-programmatically.md

@@ -70,6 +70,7 @@ tls.setKeyStoreKeyPassword("secret");
 tls.setKeyStoreCertificateAlias("mid-cert");
 tls.setTrustStoreFile("truststore.jks");
 tls.setTrustStorePassword("secret");
+tls.setSslContext("SSLv3");
 
 HttpConfiguration http = config.getHttp();
 http.setConnectionTimeoutInMs(20 * 1000);

docs/version-history.md

@@ -1,5 +1,8 @@
 # Version history
 
+# v1.5.3
+Add support for sslContext configuration for mid-java-client-soap via sslContext property in TlsConfiguration instance. 
+
 # v1.5.2
 Update most of the libraries to their latest versions. Fix two vulnerabilities reported by Dependabot for the Jackson Databind libraries. 
 

mid-java-client-core/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>ch.mobileid.mid-java-client</groupId>
         <artifactId>mid-java-client-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3</version>
     </parent>
 
     <artifactId>mid-java-client-core</artifactId>
-    <version>1.5.2</version>
+    <version>1.5.3</version>
     <name>mid-java-client-core</name>
     <description>MobileID Java Client - Core Functionality</description>
     <packaging>jar</packaging>

mid-java-client-core/src/main/java/ch/swisscom/mid/client/config/TlsConfiguration.java

@@ -42,6 +42,7 @@ public class TlsConfiguration {
 
     private boolean hostnameVerification = true;
 
+    private String sslContext;
     // ----------------------------------------------------------------------------------------------------
 
     public String getKeyStoreFile() {
@@ -148,6 +149,14 @@ public void setHostnameVerification(boolean hostnameVerification) {
         this.hostnameVerification = hostnameVerification;
     }
 
+    public String getSslContext() {
+        return sslContext;
+    }
+
+    public void setSslContext(String sslContext) {
+        this.sslContext = sslContext;
+    }
+
     // ----------------------------------------------------------------------------------------------------
 
     public void validateYourself() {

mid-java-client-rest/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>ch.mobileid.mid-java-client</groupId>
         <artifactId>mid-java-client-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3</version>
     </parent>
 
     <artifactId>mid-java-client-rest</artifactId>
-    <version>1.5.2</version>
+    <version>1.5.3</version>
     <name>mid-java-client-rest</name>
     <description>MobileID Java Client - REST Implementation</description>
     <packaging>jar</packaging>

mid-java-client-rest/src/main/java/ch/swisscom/mid/client/rest/model/signresp/ServiceResponse.java

@@ -14,6 +14,7 @@ public class ServiceResponse {
 
     @JsonProperty("Description")
     private String description;
+
     @JsonProperty("Geofencing")
     private Geofencing geofencing;
 

mid-java-client-soap/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>ch.mobileid.mid-java-client</groupId>
         <artifactId>mid-java-client-parent</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.3</version>
     </parent>
 
     <artifactId>mid-java-client-soap</artifactId>
-    <version>1.5.2</version>
+    <version>1.5.3</version>
     <name>mid-java-client-soap</name>
     <description>MobileID Java Client - SOAP Implementation</description>
     <packaging>jar</packaging>

mid-java-client-soap/src/main/java/ch/swisscom/mid/client/soap/MssServiceFactory.java

@@ -187,9 +187,14 @@ private SSLSocketFactory produceAnSslSocketFactory(ClientConfiguration config) {
         logTlsConfiguration(tlsConfig);
 
         try {
-            SSLContext sslContext = SSLContext.getInstance("SSLv3");
-            KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            SSLContext sslContext;
+            if (tlsConfig.getSslContext() == null) {
+                sslContext = SSLContext.getInstance("Default");
+            } else {
+                sslContext = SSLContext.getInstance(tlsConfig.getSslContext());
+            }
 
+            KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
             keyManagerFactory.init(produceAKeyStore(tlsConfig), tlsConfig.getKeyStoreKeyPassword().toCharArray());
             KeyManager[] keyManagers = keyManagerFactory.getKeyManagers();