diff options
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SecurityManager.scala | 5 | ||||
| -rw-r--r-- | docs/configuration.md | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/SecurityManager.scala b/core/src/main/scala/org/apache/spark/SecurityManager.scala index f72c7ded5e..a6550b6ca8 100644 --- a/core/src/main/scala/org/apache/spark/SecurityManager.scala +++ b/core/src/main/scala/org/apache/spark/SecurityManager.scala @@ -282,7 +282,10 @@ private[spark] class SecurityManager(sparkConf: SparkConf) }: TrustManager }) - val sslContext = SSLContext.getInstance(fileServerSSLOptions.protocol.getOrElse("Default")) + require(fileServerSSLOptions.protocol.isDefined, + "spark.ssl.protocol is required when enabling SSL connections.") + + val sslContext = SSLContext.getInstance(fileServerSSLOptions.protocol.get) sslContext.init(null, trustStoreManagers.getOrElse(credulousTrustStoreManagers), null) val hostVerifier = new HostnameVerifier { diff --git a/docs/configuration.md b/docs/configuration.md index 96e8c6d08a..4bda464b98 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1472,6 +1472,9 @@ Apart from these, the following properties are also available, and may be useful <td> <p>Whether to enable SSL connections on all supported protocols.</p> + <p>When <code>spark.ssl.enabled</code> is configured, <code>spark.ssl.protocol</code> + is required.</p> + <p>All the SSL settings like <code>spark.ssl.xxx</code> where <code>xxx</code> is a particular configuration property, denote the global configuration for all the supported protocols. In order to override the global configuration for the particular protocol, |