-
Notifications
You must be signed in to change notification settings - Fork 28.9k
[SPARK-5682][Core] Add encrypted shuffle in spark #8880
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2734870
[SPARK-5682] Add spark encrypted shuffle in spark
kellyzly 66e29b2
Update patch using new Config APIs and simplify SerializerManager int…
2156514
Fix code style issues
61702dc
Update patch addressing further comments
beb4526
Rename test
9f958a4
Avoid external use for encryption and compression stream
a9a05c5
Fix some further comments
a811bf4
Update test cases
928a59b
Address further comments
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 109 additions & 0 deletions
109
core/src/main/scala/org/apache/spark/security/CryptoStreamUtils.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * 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.security | ||
|
|
||
| import java.io.{InputStream, OutputStream} | ||
| import java.util.Properties | ||
| import javax.crypto.spec.{IvParameterSpec, SecretKeySpec} | ||
|
|
||
| import org.apache.commons.crypto.random._ | ||
| import org.apache.commons.crypto.stream._ | ||
| import org.apache.hadoop.io.Text | ||
|
|
||
| import org.apache.spark.SparkConf | ||
| import org.apache.spark.deploy.SparkHadoopUtil | ||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.internal.config._ | ||
|
|
||
| /** | ||
| * A util class for manipulating IO encryption and decryption streams. | ||
| */ | ||
| private[spark] object CryptoStreamUtils extends Logging { | ||
| /** | ||
| * Constants and variables for spark IO encryption | ||
| */ | ||
| val SPARK_IO_TOKEN = new Text("SPARK_IO_TOKEN") | ||
|
|
||
| // The initialization vector length in bytes. | ||
| val IV_LENGTH_IN_BYTES = 16 | ||
| // The prefix of IO encryption related configurations in Spark configuration. | ||
| val SPARK_IO_ENCRYPTION_COMMONS_CONFIG_PREFIX = "spark.io.encryption.commons.config." | ||
| // The prefix for the configurations passing to Apache Commons Crypto library. | ||
| val COMMONS_CRYPTO_CONF_PREFIX = "commons.crypto." | ||
|
|
||
| /** | ||
| * Helper method to wrap [[OutputStream]] with [[CryptoOutputStream]] for encryption. | ||
| */ | ||
| def createCryptoOutputStream( | ||
| os: OutputStream, | ||
| sparkConf: SparkConf): OutputStream = { | ||
| val properties = toCryptoConf(sparkConf) | ||
| val iv = createInitializationVector(properties) | ||
| os.write(iv) | ||
| val credentials = SparkHadoopUtil.get.getCurrentUserCredentials() | ||
| val key = credentials.getSecretKey(SPARK_IO_TOKEN) | ||
| val transformationStr = sparkConf.get(IO_CRYPTO_CIPHER_TRANSFORMATION) | ||
| new CryptoOutputStream(transformationStr, properties, os, | ||
| new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)) | ||
| } | ||
|
|
||
| /** | ||
| * Helper method to wrap [[InputStream]] with [[CryptoInputStream]] for decryption. | ||
| */ | ||
| def createCryptoInputStream( | ||
| is: InputStream, | ||
| sparkConf: SparkConf): InputStream = { | ||
| val properties = toCryptoConf(sparkConf) | ||
| val iv = new Array[Byte](IV_LENGTH_IN_BYTES) | ||
| is.read(iv, 0, iv.length) | ||
| val credentials = SparkHadoopUtil.get.getCurrentUserCredentials() | ||
| val key = credentials.getSecretKey(SPARK_IO_TOKEN) | ||
| val transformationStr = sparkConf.get(IO_CRYPTO_CIPHER_TRANSFORMATION) | ||
| new CryptoInputStream(transformationStr, properties, is, | ||
| new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)) | ||
| } | ||
|
|
||
| /** | ||
| * Get Commons-crypto configurations from Spark configurations identified by prefix. | ||
| */ | ||
| def toCryptoConf(conf: SparkConf): Properties = { | ||
| val props = new Properties() | ||
| conf.getAll.foreach { case (k, v) => | ||
| if (k.startsWith(SPARK_IO_ENCRYPTION_COMMONS_CONFIG_PREFIX)) { | ||
| props.put(COMMONS_CRYPTO_CONF_PREFIX + k.substring( | ||
| SPARK_IO_ENCRYPTION_COMMONS_CONFIG_PREFIX.length()), v) | ||
| } | ||
| } | ||
| props | ||
| } | ||
|
|
||
| /** | ||
| * This method to generate an IV (Initialization Vector) using secure random. | ||
| */ | ||
| private[this] def createInitializationVector(properties: Properties): Array[Byte] = { | ||
| val iv = new Array[Byte](IV_LENGTH_IN_BYTES) | ||
| val initialIVStart = System.currentTimeMillis() | ||
| CryptoRandomFactory.getCryptoRandom(properties).nextBytes(iv) | ||
| val initialIVFinish = System.currentTimeMillis() | ||
| val initialIVTime = initialIVFinish - initialIVStart | ||
| if (initialIVTime > 2000) { | ||
| logWarning(s"It costs ${initialIVTime} milliseconds to create the Initialization Vector " + | ||
| s"used by CryptoStream") | ||
| } | ||
| iv | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: could you add a warning log to log how long it takes when this line is too slow (e.g., more than 2 seconds)? Sometimes, it may take several seconds to collect enough entropy.