Fix symlinks handling #45

xonixx · Sep 15, 2024 · b14f713 · b14f713
1 parent 18a00f4
commit b14f713
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/main/java/com/cmlteam/serv/TarUtil.java b/src/main/java/com/cmlteam/serv/TarUtil.java
@@ -13,6 +13,7 @@
 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.archivers.tar.TarConstants;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
 import org.apache.commons.io.IOUtils;
 
@@ -65,7 +66,13 @@ private static void addToArchiveCompression(
     }
 
     String entry = dir + File.separator + file.getName();
-    if (file.isFile()) {
+    if (Files.isSymbolicLink(file.toPath())) {
+      TarArchiveEntry archiveEntry = new TarArchiveEntry(entry, TarConstants.LF_SYMLINK);
+      archiveEntry.setLinkName(Files.readSymbolicLink(file.toPath()).toString());
+      archiveEntry.setMode(calcPermissions(file));
+      out.putArchiveEntry(archiveEntry);
+      out.closeArchiveEntry();
+    } else if (file.isFile()) {
       TarArchiveEntry archiveEntry = new TarArchiveEntry(file, entry);
       archiveEntry.setMode(calcPermissions(file));
       out.putArchiveEntry(archiveEntry);
@@ -81,7 +88,8 @@ private static void addToArchiveCompression(
         }
       }
     } else {
-      System.err.println("warning: not supported (symlink?): " + file);
+      // TODO this could be due to absent permission
+      System.err.println("warning: not supported: " + file);
     }
   }
 

diff --git a/src/test/java/com/cmlteam/serv/SharingTests.java b/src/test/java/com/cmlteam/serv/SharingTests.java
@@ -10,8 +10,6 @@
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.regex.Pattern;
-
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -275,7 +273,7 @@ void testHandleSymlinks_issue45(@TempDir Path tempDir) throws IOException {
     Files.createSymbolicLink(symLink, Path.of("./",fname1));
 
     assertEquals(0, exec("ls", "-l", inputFolder.toFile().getAbsolutePath())); // show symlink
-    
+
 
     serv = new Serv("-p", testPort, inputFolder.toFile().getAbsolutePath());
 
@@ -291,16 +289,26 @@ void testHandleSymlinks_issue45(@TempDir Path tempDir) throws IOException {
     // THEN
     Path resultExtractedFolder = createTestFolder(tempDir, "result_folder");
 
-    FileExtractUtils.extractTarOrTgz(resultFile, resultExtractedFolder.toFile());
+    assertEquals(
+        0,
+        exec(
+            "tar",
+            "-C",
+            resultExtractedFolder.toAbsolutePath().toString(),
+            "-xvf",
+            resultFile.getAbsolutePath()));
 
     Path file1Res = resultExtractedFolder.resolve(fname1);
 
     assertFilesEqual(file1, file1Res);
+    System.out.println("tar content:");
+    assertEquals(0, exec("tar", "-tvf", resultFile.getAbsolutePath())); // show tar content
+    System.out.println("dir listing:");
     assertEquals(0, exec("ls", "-l", resultExtractedFolder.toFile().getAbsolutePath())); // show extracted files
 
     Path symLinkRes = resultExtractedFolder.resolve(symLinkName);
 
     assertTrue(Files.isSymbolicLink(symLinkRes));
-    assertEquals(file1Res.toAbsolutePath(), Files.readSymbolicLink(symLinkRes).toAbsolutePath());
+    assertTrue(Files.isSameFile(file1Res, resultExtractedFolder.resolve(Files.readSymbolicLink(symLinkRes))));
   }
 }