The permissions of scripts getting changed #48

xonixx · Sep 11, 2024 · b94a238 · b94a238
1 parent bc4e7d1
commit b94a238
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/src/main/java/com/cmlteam/serv/TarUtil.java b/src/main/java/com/cmlteam/serv/TarUtil.java
@@ -1,15 +1,17 @@
 package com.cmlteam.serv;
 
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
-import org.apache.commons.io.IOUtils;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
+import org.apache.commons.io.IOUtils;
 
 class TarUtil {
 
@@ -61,7 +63,9 @@ private static void addToArchiveCompression(
 
     String entry = dir + File.separator + file.getName();
     if (file.isFile()) {
-      out.putArchiveEntry(new TarArchiveEntry(file, entry));
+      TarArchiveEntry archiveEntry = new TarArchiveEntry(file, entry);
+      archiveEntry.setMode(calcPermissions(file));
+      out.putArchiveEntry(archiveEntry);
       try (FileInputStream in = new FileInputStream(file)) {
         IOUtils.copy(in, out);
       }
@@ -77,4 +81,30 @@ private static void addToArchiveCompression(
       System.err.println("warning: not supported (symlink?): " + file);
     }
   }
+
+  private static final Map<PosixFilePermission, Integer> permToShift =
+      Map.ofEntries(
+          Map.entry(PosixFilePermission.OWNER_READ, 8),
+          Map.entry(PosixFilePermission.OWNER_WRITE, 7),
+          Map.entry(PosixFilePermission.OWNER_EXECUTE, 6),
+          Map.entry(PosixFilePermission.GROUP_READ, 5),
+          Map.entry(PosixFilePermission.GROUP_WRITE, 4),
+          Map.entry(PosixFilePermission.GROUP_EXECUTE, 3),
+          Map.entry(PosixFilePermission.OTHERS_READ, 2),
+          Map.entry(PosixFilePermission.OTHERS_WRITE, 1),
+          Map.entry(PosixFilePermission.OTHERS_EXECUTE, 0));
+
+  static int calcPermissions(File file) throws IOException {
+    Set<String> availableAttributeViews =
+        file.toPath().getFileSystem().supportedFileAttributeViews();
+    int res = TarArchiveEntry.DEFAULT_FILE_MODE;
+    if (availableAttributeViews.contains("posix")) {
+      Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(file.toPath());
+      res = 0100000;
+      for (PosixFilePermission permission : permissions) {
+        res |= 1 << permToShift.get(permission);
+      }
+    }
+    return res;
+  }
 }
diff --git a/src/test/java/com/cmlteam/serv/FileExtractUtils.java b/src/test/java/com/cmlteam/serv/FileExtractUtils.java
@@ -19,7 +19,7 @@ public static void extractTarOrTgz(File tarOrTgzFile, File outDir) {
     try (InputStream inputStream = _inputStream;
         TarArchiveInputStream tarIs = new TarArchiveInputStream(inputStream)) {
       TarArchiveEntry entry;
-      while ((entry = (TarArchiveEntry) tarIs.getNextEntry()) != null) {
+      while ((entry = tarIs.getNextEntry()) != null) {
         String name = entry.getName();
         if (entry.isDirectory()) {
           mkDirs(outDir, name);

diff --git a/src/test/java/com/cmlteam/serv/SharingTests.java b/src/test/java/com/cmlteam/serv/SharingTests.java
@@ -185,6 +185,7 @@ void testPreserveScriptsPermissions_issue48(@TempDir Path tempDir) throws IOExce
     Path file1 = createTestFile(inputFolder, fname1, "#!/bin/sh\necho 123\n");
 
     assertEquals(0, TestsUtil.exec("chmod", "+x", file1.toFile().getAbsolutePath()));
+    assertEquals(0, TestsUtil.exec("ls", "-l", file1.toFile().getAbsolutePath())); // show perms
 //    assertEquals(0, TestsUtil.exec(file1.toFile().getAbsolutePath()));
 
     serv =
@@ -211,6 +212,7 @@ void testPreserveScriptsPermissions_issue48(@TempDir Path tempDir) throws IOExce
 
     Path file1Res = resultExtractedFolder.resolve(fname1);
     assertFilesEqual(file1, file1Res);
+    assertEquals(0, TestsUtil.exec("tar", "-tvf", resultFile.getAbsolutePath())); // show perms in tar
     assertEquals(0, TestsUtil.exec("ls", "-l", file1Res.toFile().getAbsolutePath())); // show perms
     assertEquals(0, TestsUtil.exec(file1Res.toFile().getAbsolutePath())); // is still executable
   }