From fb8825c9570024aa01f8b19a273ff2f0c1d555e6 Mon Sep 17 00:00:00 2001 From: Egor Krivokon Date: Thu, 14 Jun 2018 12:59:45 +0300 Subject: [PATCH] MapR [SPARK-263] Add possibility to use keyPassword which is different from keyStorePassword (#299) --- core/src/main/scala/org/apache/spark/SSLOptions.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/SSLOptions.scala b/core/src/main/scala/org/apache/spark/SSLOptions.scala index e651b9aa96a6c..9033bb3be7d16 100644 --- a/core/src/main/scala/org/apache/spark/SSLOptions.scala +++ b/core/src/main/scala/org/apache/spark/SSLOptions.scala @@ -191,7 +191,9 @@ private[spark] object SSLOptions extends Logging { .orElse(defaults.flatMap(_.keyStorePassword)) .orElse(Option(sslConfig.getClientKeystorePassword.mkString)) - val keyPassword = keyStorePassword + val keyPassword = conf.getWithSubstitution(s"$ns.keyPassword") + .orElse(defaults.flatMap(_.keyPassword)) + .orElse(Option(sslConfig.getClientKeyPassword.mkString)) val keyStoreType = conf.getWithSubstitution(s"$ns.keyStoreType") .orElse(defaults.flatMap(_.keyStoreType))