Skip to content

Commit b0b226e

Browse files
committed
[SPARK-38631][CORE] Uses Java-based implementation for un-tarring at Utils.unpack
### What changes were proposed in this pull request? This PR proposes to use `FileUtil.unTarUsingJava` that is a Java implementation for un-tar `.tar` files. `unTarUsingJava` is not public but it exists in all Hadoop versions from 2.1+, see HADOOP-9264. The security issue reproduction requires a non-Windows platform, and a non-gzipped TAR archive file name (contents don't matter). ### Why are the changes needed? There is a risk for arbitrary shell command injection via `Utils.unpack` when the filename is controlled by a malicious user. This is due to an issue in Hadoop's `unTar`, that is not properly escaping the filename before passing to a shell command:https://github.com/apache/hadoop/blob/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java#L904 ### Does this PR introduce _any_ user-facing change? Yes, it prevents a security issue that, previously, allowed users to execute arbitrary shall command. ### How was this patch tested? Manually tested in local, and existing test cases should cover. Closes #35946 from HyukjinKwon/SPARK-38631. Authored-by: Hyukjin Kwon <gurwls223@apache.org> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org> (cherry picked from commit 057c051) Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
1 parent 43c6b91 commit b0b226e

File tree

1 file changed

+28
-2
lines changed

1 file changed

+28
-2
lines changed

core/src/main/scala/org/apache/spark/util/Utils.scala

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,16 +584,42 @@ private[spark] object Utils extends Logging {
584584
if (lowerSrc.endsWith(".jar")) {
585585
RunJar.unJar(source, dest, RunJar.MATCH_ANY)
586586
} else if (lowerSrc.endsWith(".zip")) {
587+
// TODO(SPARK-37677): should keep file permissions. Java implementation doesn't.
587588
FileUtil.unZip(source, dest)
588-
} else if (
589-
lowerSrc.endsWith(".tar.gz") || lowerSrc.endsWith(".tgz") || lowerSrc.endsWith(".tar")) {
589+
} else if (lowerSrc.endsWith(".tar.gz") || lowerSrc.endsWith(".tgz")) {
590590
FileUtil.unTar(source, dest)
591+
} else if (lowerSrc.endsWith(".tar")) {
592+
// TODO(SPARK-38632): should keep file permissions. Java implementation doesn't.
593+
unTarUsingJava(source, dest)
591594
} else {
592595
logWarning(s"Cannot unpack $source, just copying it to $dest.")
593596
copyRecursive(source, dest)
594597
}
595598
}
596599

600+
/**
601+
* The method below was copied from `FileUtil.unTar` but uses Java-based implementation
602+
* to work around a security issue, see also SPARK-38631.
603+
*/
604+
private def unTarUsingJava(source: File, dest: File): Unit = {
605+
if (!dest.mkdirs && !dest.isDirectory) {
606+
throw new IOException(s"Mkdirs failed to create $dest")
607+
} else {
608+
try {
609+
// Should not fail because all Hadoop 2.1+ (from HADOOP-9264)
610+
// have 'unTarUsingJava'.
611+
val mth = classOf[FileUtil].getDeclaredMethod(
612+
"unTarUsingJava", classOf[File], classOf[File], classOf[Boolean])
613+
mth.setAccessible(true)
614+
mth.invoke(null, source, dest, java.lang.Boolean.FALSE)
615+
} catch {
616+
// Re-throw the original exception.
617+
case e: java.lang.reflect.InvocationTargetException if e.getCause != null =>
618+
throw e.getCause
619+
}
620+
}
621+
}
622+
597623
/** Records the duration of running `body`. */
598624
def timeTakenMs[T](body: => T): (T, Long) = {
599625
val startTime = System.nanoTime()

0 commit comments

Comments
 (0)