Skip to content

Make sure unzipped directories are owner-executable #387

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 7, 2025
Merged

Make sure unzipped directories are owner-executable #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f82fafc
Make sure unzipped directories are owner-executable
kiendang May 7, 2025
506d797
Skip test on windows
kiendang May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions os/src/ZipOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,10 @@ object unzip {
} else null

if (zipEntry.isDirectory) {
os.makeDir.all(newFile, perms = perms)
if (perms != null && os.perms(newFile) != perms) {
// because of umask
os.perms.set(newFile, perms)
os.makeDir.all(newFile)
if (perms != null) {
// make sure directories at least have OWNER_EXECUTE
os.perms.set(newFile, perms + PosixFilePermission.OWNER_EXECUTE)
}
} else if (isSymLink) {
val target = scala.io.Source.fromInputStream(zipInputStream).mkString
Expand Down
21 changes: 21 additions & 0 deletions os/test/src/ZipOpTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import test.os.TestUtil.prep
import utest._

import java.io.{ByteArrayInputStream, ByteArrayOutputStream, PrintStream}
import java.nio.file.attribute.PosixFilePermission
import java.util.zip.{ZipEntry, ZipOutputStream}

object ZipOpTests extends TestSuite {
Expand Down Expand Up @@ -537,5 +538,25 @@ object ZipOpTests extends TestSuite {
assert(file2Content == "Content of file2")
}

test("unzipDirectoryEnsureExecutablePermission") - prep { wd =>
if (!scala.util.Properties.isWin) {
val zipFileName = "zipDirExecutable"
val source = wd / "folder1"
val dir = source / "dir"

os.makeDir(dir)
val perms = os.perms(dir)
os.perms.set(dir, perms - PosixFilePermission.OWNER_EXECUTE)

val zipped = os.zip(
dest = wd / s"$zipFileName.zip",
sources = Seq(source)
)

val unzipped = os.unzip(zipped, dest = wd / zipFileName)
assert(os.perms(unzipped / "dir").contains(PosixFilePermission.OWNER_EXECUTE))
assert(os.perms(unzipped / "dir") == perms)
}
}
}
}
Loading