Github user jacek-lewandowski commented on a diff in the pull request:
https://github.com/apache/spark/pull/2739#discussion_r19244643
--- Diff: core/src/main/scala/org/apache/spark/SecurityManager.scala ---
@@ -192,6 +196,44 @@ private[spark] class SecurityManager(sparkConf:
SparkConf) extends Logging {
)
}
+ private[spark] val sslOptions = SSLOptions.parse(ns = "ssl", conf =
sparkConf)
+
+ private[spark] val (sslSocketFactory, hostnameVerifier) = if
(sslOptions.enabled) {
+ val trustStoreManagers =
+ for (trustStore <- sslOptions.trustStore) yield {
+ val ks = KeyStore.getInstance(KeyStore.getDefaultType)
+ ks.load(FileUtils.openInputStream(sslOptions.trustStore.get),
+ sslOptions.trustStorePassword.get.toCharArray)
+
+ val tmf =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm)
+ tmf.init(ks)
+ tmf.getTrustManagers
+ }
+
+ lazy val credulousTrustStoreManagers = Array({
+ logWarning("Using 'accept-all' trust manager for SSL connections.")
+ new X509TrustManager {
+ override def getAcceptedIssuers: Array[X509Certificate] = null
+
+ override def checkClientTrusted(x509Certificates:
Array[X509Certificate], s: String) {}
+
+ override def checkServerTrusted(x509Certificates:
Array[X509Certificate], s: String) {}
+ }: TrustManager
+ })
+
+ val sslContext =
SSLContext.getInstance(sslOptions.protocol.getOrElse("Default"))
+ sslContext.init(null, trustStoreManagers getOrElse
credulousTrustStoreManagers, null)
+
+ val hostVerifier = new HostnameVerifier {
+ override def verify(s: String, sslSession: SSLSession): Boolean =
true
+ }
+
+ (Some(sslContext.getSocketFactory), Some(hostVerifier))
+ } else {
+ val sslContext = SSLContext.getDefault
--- End diff --
Good catch, I accidentally left it there
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
