Handle symlinks in extractArchive()

Author: idodeclare

opengrok-indexer/pom.xml

@@ -19,7 +19,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 CDDL HEADER END
 
 Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
-Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -51,6 +51,11 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
             <artifactId>commons-lang3</artifactId>
             <version>${apache-commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.19</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-core</artifactId>

opengrok-indexer/src/test/java/org/opengrok/indexer/util/FileUtilities.java

@@ -19,6 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.util;
 
@@ -27,10 +28,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.index.IgnoredNames;
 
@@ -46,12 +49,26 @@ public class FileUtilities {
     public static void extractArchive(File sourceBundle, File root) throws IOException {
         ZipFile zipfile = new ZipFile(sourceBundle);
 
-        Enumeration<? extends ZipEntry> e = zipfile.entries();
+        Enumeration<ZipArchiveEntry> e = zipfile.getEntries();
 
         while (e.hasMoreElements()) {
-            ZipEntry ze = e.nextElement();
+            ZipArchiveEntry ze = e.nextElement();
             File file = new File(root, ze.getName());
-            if (ze.isDirectory()) {
+            if (ze.isUnixSymlink()) {
+                File target = new File(file.getParent(), zipfile.getUnixSymlink(ze));
+                /*
+                 * A weirdness is that an object may already have been exploded
+                 * before the symlink entry is reached in the ZipFile. So
+                 * unlink any existing entry to avoid an exception on creating
+                 * the symlink.
+                 */
+                if (file.isDirectory()) {
+                    removeDirs(file);
+                } else if (file.exists()) {
+                    file.delete();
+                }
+                Files.createSymbolicLink(file.toPath(), target.toPath());
+            } else if (ze.isDirectory()) {
                 file.mkdirs();
             } else {
                 try (InputStream in = zipfile.getInputStream(ze); OutputStream out = new FileOutputStream(file)) {