Github user vanzin commented on a diff in the pull request:
https://github.com/apache/spark/pull/3571#discussion_r22813518
--- Diff: core/src/main/scala/org/apache/spark/SSLOptions.scala ---
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark
+
+import java.io.File
+
+import com.typesafe.config.{Config, ConfigFactory, ConfigValueFactory}
+import org.eclipse.jetty.util.ssl.SslContextFactory
+
+import scala.util.Try
+
+private[spark] case class SSLOptions(enabled: Boolean = false,
+ keyStore: Option[File] = None,
+ keyStorePassword: Option[String] =
None,
+ keyPassword: Option[String] = None,
+ trustStore: Option[File] = None,
+ trustStorePassword: Option[String] =
None,
+ protocol: Option[String] = None,
+ enabledAlgorithms: Set[String] =
Set.empty) {
+
+ /**
+ * Creates a Jetty SSL context factory according to the SSL settings
represented by this object.
+ */
+ def createJettySslContextFactory(): Option[SslContextFactory] = {
+ if (enabled) {
+ val sslContextFactory = new SslContextFactory()
+
+ keyStore.foreach(file =>
sslContextFactory.setKeyStorePath(file.getAbsolutePath))
+ trustStore.foreach(file =>
sslContextFactory.setTrustStore(file.getAbsolutePath))
+ keyStorePassword.foreach(sslContextFactory.setKeyStorePassword)
+ trustStorePassword.foreach(sslContextFactory.setTrustStorePassword)
+ keyPassword.foreach(sslContextFactory.setKeyManagerPassword)
+ protocol.foreach(sslContextFactory.setProtocol)
+ sslContextFactory.setIncludeCipherSuites(enabledAlgorithms.toSeq: _*)
+
+ Some(sslContextFactory)
+ } else {
+ None
+ }
+ }
+
+ /**
+ * Creates an Akka configuration object which contains all the SSL
settings represented by this
+ * object. It can be used then to compose the ultimate Akka
configuration.
+ */
+ def createAkkaConfig: Option[Config] = {
+ import scala.collection.JavaConversions._
+ if (enabled) {
+ Some(ConfigFactory.empty()
+ .withValue("akka.remote.netty.tcp.security.key-store",
+
ConfigValueFactory.fromAnyRef(keyStore.map(_.getAbsolutePath).getOrElse("")))
+ .withValue("akka.remote.netty.tcp.security.key-store-password",
+ ConfigValueFactory.fromAnyRef(keyStorePassword.getOrElse("")))
+ .withValue("akka.remote.netty.tcp.security.trust-store",
+
ConfigValueFactory.fromAnyRef(trustStore.map(_.getAbsolutePath).getOrElse("")))
+ .withValue("akka.remote.netty.tcp.security.trust-store-password",
+ ConfigValueFactory.fromAnyRef(trustStorePassword.getOrElse("")))
+ .withValue("akka.remote.netty.tcp.security.key-password",
+ ConfigValueFactory.fromAnyRef(keyPassword.getOrElse("")))
+
.withValue("akka.remote.netty.tcp.security.random-number-generator",
+ ConfigValueFactory.fromAnyRef(""))
+ .withValue("akka.remote.netty.tcp.security.protocol",
+ ConfigValueFactory.fromAnyRef(protocol.getOrElse("")))
+ .withValue("akka.remote.netty.tcp.security.enabled-algorithms",
+ ConfigValueFactory.fromIterable(enabledAlgorithms.toSeq))
+ .withValue("akka.remote.netty.tcp.enable-ssl",
+ ConfigValueFactory.fromAnyRef(true)))
+ } else {
+ None
+ }
+ }
+
+}
+
+object SSLOptions extends Logging {
+
+ /**
+ * Resolves SSLOptions settings from a given Spark configuration object
at a given namespace.
+ * The parent directory of that location is used as a base directory to
resolve relative paths
+ * to keystore and truststore.
+ */
+ def parse(conf: SparkConf, ns: String): SSLOptions = {
+ val enabled = conf.getBoolean(s"spark.ssl.enabled", defaultValue =
false)
+ val keyStore = Try(conf.get(s"$ns.keyStore")).toOption.map(new File(_))
+ val keyStorePassword = Try(conf.get(s"$ns.keyStorePassword")).toOption
+ val keyPassword = Try(conf.get(s"$ns.keyPassword")).toOption
+ val trustStore = Try(conf.get(s"$ns.trustStore")).toOption.map(new
File(_))
+ val trustStorePassword =
Try(conf.get(s"$ns.trustStorePassword")).toOption
+ val protocol = Try(conf.get(s"$ns.protocol")).toOption
+ val enabledAlgorithms =
Try(conf.get(s"$ns.enabledAlgorithms")).toOption
--- End diff --
nit: `toOption` is probably redundant here.
---
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]
