-
Notifications
You must be signed in to change notification settings - Fork 461
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GLUTEN-8455][VL] Port encrypted file checks to shim layer (#8501)
- Loading branch information
1 parent
ddf7e32
commit 67ebbc8
Showing
8 changed files
with
293 additions
and
36 deletions.
There are no files selected for viewing
This file contains 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
175 changes: 175 additions & 0 deletions
175
backends-velox/src/test/scala/org/apache/gluten/utils/ParquetEncryptionDetectionSuite.scala
This file contains 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,175 @@ | ||
| /* | ||
| * 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.gluten.utils | ||
|
|
||
| import org.apache.gluten.sql.shims.SparkShimLoader | ||
|
|
||
| import org.apache.spark.sql.{GlutenQueryTest, SparkSession} | ||
|
|
||
| import org.apache.hadoop.conf.Configuration | ||
| import org.apache.hadoop.fs.{FileSystem, LocatedFileStatus, Path} | ||
| import org.apache.parquet.crypto.{ColumnEncryptionProperties, FileEncryptionProperties} | ||
| import org.apache.parquet.example.data.simple.SimpleGroup | ||
| import org.apache.parquet.hadoop.example.ExampleParquetWriter | ||
| import org.apache.parquet.hadoop.metadata.ColumnPath | ||
| import org.apache.parquet.schema.{MessageType, PrimitiveType, Type, Types} | ||
| import org.junit.Assert._ | ||
|
|
||
| import java.nio.charset.StandardCharsets | ||
| import java.util.Base64 | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| /** | ||
| * This suite attempt to test parquet encryption for fallback of scan operator. Will check the | ||
| * following: | ||
| * 1. Plain Parquet File: | ||
| * - Writes a Parquet file with no encryption. | ||
| * - Asserts that parquet is not encrypted | ||
| * | ||
| * 2. Encrypted Parquet File (with encrypted footer): | ||
| * - Writes a Parquet file with column-level encryption and an encrypted footer. | ||
| * - Asserts that the file is encrypted. | ||
| * | ||
| * 3. Encrypted Parquet File (with plaintext footer): | ||
| * - Writes a Parquet file with column-level encryption but a plaintext (unencrypted) footer. | ||
| * - Ensures the file is still detected as encrypted despite the plaintext footer. | ||
| */ | ||
|
|
||
| class ParquetEncryptionDetectionSuite extends GlutenQueryTest { | ||
|
|
||
| private val masterKey = | ||
| Base64.getEncoder.encodeToString("0123456789012345".getBytes(StandardCharsets.UTF_8)) | ||
| private val columnKey = | ||
| Base64.getEncoder.encodeToString("1234567890123456".getBytes(StandardCharsets.UTF_8)) | ||
|
|
||
| private val schema: MessageType = Types | ||
| .buildMessage() | ||
| .addField( | ||
| Types.primitive(PrimitiveType.PrimitiveTypeName.INT32, Type.Repetition.REQUIRED).named("id")) | ||
| .addField( | ||
| Types | ||
| .primitive(PrimitiveType.PrimitiveTypeName.BINARY, Type.Repetition.REQUIRED) | ||
| .named("name")) | ||
| .named("TestSchema") | ||
|
|
||
| private var _spark: SparkSession = _ | ||
|
|
||
| override protected def spark: SparkSession = _spark | ||
|
|
||
| private def writeParquet( | ||
| path: String, | ||
| encryptionProperties: Option[FileEncryptionProperties], | ||
| data: Seq[Map[String, Any]] | ||
| ): Unit = { | ||
| val configuration = new Configuration() | ||
| val writerBuilder = ExampleParquetWriter | ||
| .builder(new Path(path)) | ||
| .withConf(configuration) | ||
| .withType(schema) | ||
| .withWriteMode(org.apache.parquet.hadoop.ParquetFileWriter.Mode.OVERWRITE) | ||
|
|
||
| encryptionProperties.foreach(writerBuilder.withEncryption) | ||
|
|
||
| val writer = writerBuilder.build() | ||
| try { | ||
| data.foreach { | ||
| row => | ||
| val group = new SimpleGroup(schema) | ||
| row.foreach { | ||
| case (key, value) => | ||
| value match { | ||
| case i: Int => group.add(key, i) | ||
| case s: String => group.add(key, s) | ||
| } | ||
| } | ||
| writer.write(group) | ||
| } | ||
| } finally { | ||
| writer.close() | ||
| } | ||
| } | ||
|
|
||
| private def getLocatedFileStatus(path: String): LocatedFileStatus = { | ||
| val conf = new Configuration() | ||
| val fs = FileSystem.get(conf) | ||
| fs.listFiles(new Path(path), false).next() | ||
| } | ||
|
|
||
| testWithSpecifiedSparkVersion( | ||
| "Detect encrypted Parquet with encrypted footer", | ||
| Array("3.2", "3.3", "3.4")) { | ||
| withTempDir { | ||
| tempDir => | ||
| val filePath = s"${tempDir.getAbsolutePath}/encrypted_footer.parquet" | ||
| val encryptionProps = FileEncryptionProperties | ||
| .builder(Base64.getDecoder.decode(masterKey)) | ||
| .withEncryptedColumns( | ||
| Map( | ||
| ColumnPath.get("name") -> ColumnEncryptionProperties | ||
| .builder(ColumnPath.get("name")) | ||
| .withKey(Base64.getDecoder.decode(columnKey)) | ||
| .build()).asJava) | ||
| .build() | ||
|
|
||
| writeParquet(filePath, Some(encryptionProps), Seq(Map("id" -> 1, "name" -> "Alice"))) | ||
| val fileStatus = getLocatedFileStatus(filePath) | ||
|
|
||
| assertTrue( | ||
| SparkShimLoader.getSparkShims.isParquetFileEncrypted(fileStatus, new Configuration())) | ||
| } | ||
| } | ||
|
|
||
| testWithSpecifiedSparkVersion( | ||
| "Detect encrypted Parquet without encrypted footer (plaintext footer)", | ||
| Array("3.2", "3.3", "3.4")) { | ||
| withTempDir { | ||
| tempDir => | ||
| val filePath = s"${tempDir.getAbsolutePath}/plaintext_footer.parquet" | ||
| val encryptionProps = FileEncryptionProperties | ||
| .builder(Base64.getDecoder.decode(masterKey)) | ||
| .withEncryptedColumns( | ||
| Map( | ||
| ColumnPath.get("name") -> ColumnEncryptionProperties | ||
| .builder(ColumnPath.get("name")) | ||
| .withKey(Base64.getDecoder.decode(columnKey)) | ||
| .build()).asJava) | ||
| .withPlaintextFooter() | ||
| .build() | ||
|
|
||
| writeParquet(filePath, Some(encryptionProps), Seq(Map("id" -> 1, "name" -> "Bob"))) | ||
| val fileStatus = getLocatedFileStatus(filePath) | ||
| assertTrue( | ||
| SparkShimLoader.getSparkShims.isParquetFileEncrypted(fileStatus, new Configuration())) | ||
| } | ||
| } | ||
|
|
||
| testWithSpecifiedSparkVersion( | ||
| "Detect plain (unencrypted) Parquet file", | ||
| Array("3.2", "3.3", "3.4")) { | ||
| withTempDir { | ||
| tempDir => | ||
| val filePath = s"${tempDir.getAbsolutePath}/plain.parquet" | ||
|
|
||
| writeParquet(filePath, None, Seq(Map("id" -> 1, "name" -> "Charlie"))) | ||
| val fileStatus = getLocatedFileStatus(filePath) | ||
|
|
||
| assertFalse( | ||
| SparkShimLoader.getSparkShims.isParquetFileEncrypted(fileStatus, new Configuration())) | ||
| } | ||
| } | ||
| } |
This file contains 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
43 changes: 43 additions & 0 deletions
43
shims/common/src/main/scala/org/apache/gluten/utils/ExceptionUtils.scala
This file contains 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,43 @@ | ||
| /* | ||
| * 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.gluten.utils | ||
|
|
||
| object ExceptionUtils { | ||
|
|
||
| /** | ||
| * Utility to check the exception for the specified type. | ||
| * | ||
| * @param throwable | ||
| * Exception to check | ||
| * @param causeType | ||
| * Class of the cause to look for | ||
| * @tparam T | ||
| * Type of the cause | ||
| * @return | ||
| * True if the cause is found; false otherwise | ||
| */ | ||
| def hasCause[T <: Throwable](throwable: Throwable, causeType: Class[T]): Boolean = { | ||
| var current = throwable | ||
| while (current != null) { | ||
| if (causeType.isInstance(current)) { | ||
| return true | ||
| } | ||
| current = current.getCause | ||
| } | ||
| false | ||
| } | ||
| } |
This file contains 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 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.