MapR [SPARK-263] Add possibility to use keyPassword which is differen…

…t from keyStorePassword (apache#299)
arjunshroff · Sep 19, 2019 · fb8825c · fb8825c
1 parent f73411c
commit fb8825c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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))