Merge pull request #9 from MobileID-Strong-Authentication/dev-sslcontext-cfg

Dev sslcontext cfg #8

Author: phaupt

README.md

@@ -106,6 +106,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/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/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/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();
 

mid-java-client-soap/src/test/java/ch/swisscom/mid/client/soap/TestSupport.java

@@ -53,7 +53,7 @@ public static ClientConfiguration buildConfig() {
         tls.setTrustStoreBytes(fileToBytes("/empty-store.jks"));
         tls.setTrustStorePassword("secret");
         tls.setHostnameVerification(false);
-
+        tls.setSslContext("SSLv3");
         HttpConfiguration http = config.getHttp();
         http.setConnectionTimeoutInMs(2 * 1000);
         http.setResponseTimeoutInMs(2 * 1000);

mid-java-client-usage/src/main/java/ch/swisscom/mid/client/cli/Cli.java

@@ -125,6 +125,7 @@ public static void main(String[] args) {
         tls.setKeyStorePassword(properties.getProperty("client.keyStore.password"));
         tls.setKeyStoreKeyPassword(properties.getProperty("client.keyStore.keyPassword"));
         tls.setKeyStoreCertificateAlias(properties.getProperty("client.keyStore.certAlias"));
+        tls.setSslContext(properties.getProperty("client.tls.sslContext"));
         tls.setTrustStoreFile(properties.getProperty("server.trustStore.file"));
         tls.setTrustStorePassword(properties.getProperty("server.trustStore.password"));
         tls.setHostnameVerification(Boolean.parseBoolean(properties.getProperty("server.hostnameVerification")));

mid-java-client-usage/src/main/resources/cli-files/config-sample.properties

@@ -5,6 +5,7 @@ client.keyStore.file=keystore.jks
 client.keyStore.password=secret
 client.keyStore.keyPassword=secret
 client.keyStore.certAlias=my-cert-alias
+client.tls.sslContext=SSLv3
 # --
 client.http.connectionTimeoutInSeconds=20
 client.http.responseTimeoutInSeconds=100