cbickel 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_r167503054
##########
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:
You already put these variables into `application.conf`. Can we use them
instead?
Afterwards you can remove the entries from `whisk.properties` again.
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
