#64 Make SSL truststore configuration optional

TheHive-Project · Aug 22, 2018 · 44a9c9f · 44a9c9f
1 parent 469704c
commit 44a9c9f
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/app/org/elastic4play/ClientAuthSSLEngineProvider.scala b/app/org/elastic4play/ClientAuthSSLEngineProvider.scala
@@ -33,20 +33,23 @@ class ClientAuthSSLEngineProvider(serverConfig: ServerConfig, appProvider: Appli
   }
 
   def readTrustManagers(): Array[TrustManager] = {
-    val trustStorePath = Paths.get(config.get[String]("play.server.https.trustStore.path"))
-    val keyStoreType = config.getOptional[String]("play.server.https.keyStore.type").getOrElse(KeyStore.getDefaultType)
-    val trustStorePassword = config.getOptional[String]("play.server.https.trustStore.password").getOrElse("").toCharArray
-    val trustInputStream = Files.newInputStream(trustStorePath)
-    try {
-      val keyStore = KeyStore.getInstance(keyStoreType)
-      keyStore.load(trustInputStream, trustStorePassword)
-      val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm)
-      tmf.init(keyStore)
-      tmf.getTrustManagers
-    }
-    finally {
-      trustInputStream.close()
-    }
+    config.getOptional[String]("play.server.https.trustStore.path")
+      .map { trustStorePath ⇒
+        val keyStoreType = config.getOptional[String]("play.server.https.keyStore.type").getOrElse(KeyStore.getDefaultType)
+        val trustStorePassword = config.getOptional[String]("play.server.https.trustStore.password").getOrElse("").toCharArray
+        val trustInputStream = Files.newInputStream(Paths.get(trustStorePath))
+        try {
+          val keyStore = KeyStore.getInstance(keyStoreType)
+          keyStore.load(trustInputStream, trustStorePassword)
+          val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm)
+          tmf.init(keyStore)
+          tmf.getTrustManagers
+        }
+        finally {
+          trustInputStream.close()
+        }
+      }
+      .getOrElse(Array.empty)
   }
 
   def createSSLContext(applicationProvider: ApplicationProvider): SSLContext = {