fix(api): Do not manage unknown trustore or keystore for SSL configur…

…ation Closes gravitee-io/issues#1647
gravitee-io · Nov 7, 2018 · ccf1662 · ccf1662
1 parent 71ca746
commit ccf1662
Showing 1 changed file with 40 additions and 32 deletions.
diff --git a/...a/io/gravitee/definition/jackson/datatype/api/deser/HttpClientSslOptionsDeserializer.java b/...a/io/gravitee/definition/jackson/datatype/api/deser/HttpClientSslOptionsDeserializer.java
@@ -71,23 +71,27 @@ public HttpClientSslOptions deserialize(JsonParser jp, DeserializationContext ct
 
         JsonNode trustStoreNode = node.get("trustStore");
         if (trustStoreNode != null) {
-            TrustStoreType type = TrustStoreType.valueOf(
-                    trustStoreNode.path("type").asText().toUpperCase());
-
-            TrustStore trustStore = null;
-            switch (type) {
-                case JKS:
-                    trustStore = trustStoreNode.traverse(jp.getCodec()).readValueAs(JKSTrustStore.class);
-                    break;
-                case PEM:
-                    trustStore = trustStoreNode.traverse(jp.getCodec()).readValueAs(PEMTrustStore.class);
-                    break;
-                case PKCS12:
-                    trustStore = trustStoreNode.traverse(jp.getCodec()).readValueAs(PKCS12TrustStore.class);
-                    break;
-            }
+            try {
+                TrustStoreType type = TrustStoreType.valueOf(
+                        trustStoreNode.path("type").asText().toUpperCase());
+
+                TrustStore trustStore = null;
+                switch (type) {
+                    case JKS:
+                        trustStore = trustStoreNode.traverse(jp.getCodec()).readValueAs(JKSTrustStore.class);
+                        break;
+                    case PEM:
+                        trustStore = trustStoreNode.traverse(jp.getCodec()).readValueAs(PEMTrustStore.class);
+                        break;
+                    case PKCS12:
+                        trustStore = trustStoreNode.traverse(jp.getCodec()).readValueAs(PKCS12TrustStore.class);
+                        break;
+                }
+
+                httpClientSslOptions.setTrustStore(trustStore);
+            } catch (IllegalArgumentException iae) {
 
-            httpClientSslOptions.setTrustStore(trustStore);
+            }
         }
 
         // No trustore defined -> trustAll is enabled
@@ -97,23 +101,27 @@ public HttpClientSslOptions deserialize(JsonParser jp, DeserializationContext ct
 
         JsonNode keyStoreNode = node.get("keyStore");
         if (keyStoreNode != null) {
-            KeyStoreType type = KeyStoreType.valueOf(
-                    keyStoreNode.path("type").asText().toUpperCase());
-
-            KeyStore keyStore = null;
-            switch (type) {
-                case JKS:
-                    keyStore = keyStoreNode.traverse(jp.getCodec()).readValueAs(JKSKeyStore.class);
-                    break;
-                case PEM:
-                    keyStore = keyStoreNode.traverse(jp.getCodec()).readValueAs(PEMKeyStore.class);
-                    break;
-                case PKCS12:
-                    keyStore = keyStoreNode.traverse(jp.getCodec()).readValueAs(PKCS12KeyStore.class);
-                    break;
-            }
+            try {
+                KeyStoreType type = KeyStoreType.valueOf(
+                        keyStoreNode.path("type").asText().toUpperCase());
+
+                KeyStore keyStore = null;
+                switch (type) {
+                    case JKS:
+                        keyStore = keyStoreNode.traverse(jp.getCodec()).readValueAs(JKSKeyStore.class);
+                        break;
+                    case PEM:
+                        keyStore = keyStoreNode.traverse(jp.getCodec()).readValueAs(PEMKeyStore.class);
+                        break;
+                    case PKCS12:
+                        keyStore = keyStoreNode.traverse(jp.getCodec()).readValueAs(PKCS12KeyStore.class);
+                        break;
+                }
+
+                httpClientSslOptions.setKeyStore(keyStore);
+            } catch (IllegalArgumentException iae) {
 
-            httpClientSslOptions.setKeyStore(keyStore);
+            }
         }
 
         return httpClientSslOptions;