You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/03/23 14:08:24 UTC
[GitHub] [spark] srowen commented on a change in pull request #35946: [SPARK-38631][CORE] Uses Java-based implementation for un-tarring at Utils.unpack
srowen commented on a change in pull request #35946:
URL: https://github.com/apache/spark/pull/35946#discussion_r833312071
##########
File path: core/src/main/scala/org/apache/spark/util/Utils.scala
##########
@@ -600,10 +600,30 @@ private[spark] object Utils extends Logging {
if (lowerSrc.endsWith(".jar")) {
RunJar.unJar(source, dest, RunJar.MATCH_ANY)
} else if (lowerSrc.endsWith(".zip")) {
+ // TODO(SPARK-37677): should keep file permissions. Java implementation doesn't.
FileUtil.unZip(source, dest)
- } else if (
- lowerSrc.endsWith(".tar.gz") || lowerSrc.endsWith(".tgz") || lowerSrc.endsWith(".tar")) {
+ } else if (lowerSrc.endsWith(".tar.gz") || lowerSrc.endsWith(".tgz")) {
FileUtil.unTar(source, dest)
+ } else if (lowerSrc.endsWith(".tar")) {
Review comment:
FWIW I added lines 596-598 to mitigate some of this. Can we update Hadoop to fix this too? I suppose inlining is a bit more code but more robust in this regard.
##########
File path: core/src/main/scala/org/apache/spark/util/Utils.scala
##########
@@ -600,10 +600,30 @@ private[spark] object Utils extends Logging {
if (lowerSrc.endsWith(".jar")) {
RunJar.unJar(source, dest, RunJar.MATCH_ANY)
} else if (lowerSrc.endsWith(".zip")) {
+ // TODO(SPARK-37677): should keep file permissions. Java implementation doesn't.
FileUtil.unZip(source, dest)
- } else if (
- lowerSrc.endsWith(".tar.gz") || lowerSrc.endsWith(".tgz") || lowerSrc.endsWith(".tar")) {
+ } else if (lowerSrc.endsWith(".tar.gz") || lowerSrc.endsWith(".tgz")) {
FileUtil.unTar(source, dest)
+ } else if (lowerSrc.endsWith(".tar")) {
+ // The codes below was copied from `FileUtil.unTar` but uses Java-based implementation
+ // to work around a security issue, see also SPARK-38631.
+ // TODO(SPARK-38632): should keep file permissions. Java implementation doesn't.
+ if (!dest.mkdirs && !dest.isDirectory) {
Review comment:
Only nit is then - maybe make this a private method for symmetry with the existing FileUtil.untar?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org