You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/02/12 13:28:03 UTC

[GitHub] markusthoemmes commented on a change in pull request #3077: Enable ssl on the path between edge and controllers

markusthoemmes commented on a change in pull request #3077: Enable ssl on the path between edge and controllers
URL: https://github.com/apache/incubator-openwhisk/pull/3077#discussion_r167554513
 
 

 ##########
 File path: tests/src/test/scala/common/rest/WskRest.scala
 ##########
 @@ -85,15 +81,42 @@ import common.WskActorSystem
 import common.WskProps
 import whisk.core.entity.ByteSize
 import whisk.utils.retry
-import javax.net.ssl.{HostnameVerifier, KeyManager, SSLContext, SSLSession, X509TrustManager}
+import javax.net.ssl._
+
+import akka.actor.ActorSystem
 import com.typesafe.sslconfig.akka.AkkaSSLConfig
 import java.nio.charset.StandardCharsets
+import java.security.KeyStore
 
 class AcceptAllHostNameVerifier extends HostnameVerifier {
   override def verify(s: String, sslSession: SSLSession): Boolean = true
 }
 
 object SSL {
+
+  val controllerProtocol = WhiskProperties.getProperty("controller.protocol")
+  val controllerKeyStorePath = WhiskProperties.getProperty("controller.ssl.keystore.path")
+  val controllerKeyStorePassword = WhiskProperties.getProperty("controller.ssl.keystore.password")
+  val controllerKeyStoreFlavor = WhiskProperties.getProperty("controller.ssl.keystore.flavor")
+  val controllerClientAuth = WhiskProperties.getProperty("controller.ssl.clientAuth").toBoolean
 
 Review comment:
   Please refer to https://github.com/apache/incubator-openwhisk/pull/3111/commits/04579a3b786c582d0ff35f679208e63069473b68 for our future path of solving this. I back that we should move these to pureconfig and write the `.conf` the same way we write whisk.properties today.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services