Don't follow symlinks for directory copies

ME1312 · Jan 14, 2019 · 118ac28 · 118ac28
1 parent 622ef32
commit 118ac28
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 115 deletions.
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java
@@ -6,6 +6,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -267,7 +268,7 @@ public static void deleteDirectory(File folder) {
      * @param to Destination
      */
     public static void copyDirectory(File from, File to) {
-        if (from.isDirectory()) {
+        if (from.isDirectory() && !Files.isSymbolicLink(from.toPath())) {
             if (!to.exists()) {
                 to.mkdirs();
             }
@@ -281,37 +282,10 @@ public static void copyDirectory(File from, File to) {
                 copyDirectory(srcFile, destFile);
             }
         } else {
-            if (to.exists()) {
-                to.delete();
-            }
-            InputStream in = null;
-            OutputStream out = null;
-
             try {
-                in = new FileInputStream(from);
-                out = new FileOutputStream(to, false);
-
-                byte[] buffer = new byte[1024];
-
-                int length;
-                while ((length = in.read(buffer)) > 0) {
-                    out.write(buffer, 0, length);
-                }
-
-                in.close();
-                out.close();
+                Files.copy(from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS);
             } catch (Exception e) {
-                try {
-                    if (in != null) in.close();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                }
-
-                try {
-                    if (out != null) out.close();
-                } catch (IOException e2) {
-                    e2.printStackTrace();
-                }
+                e.printStackTrace();
             }
         }
     }

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Util.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Util.java
@@ -6,6 +6,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.util.*;
 
 /**
@@ -264,7 +265,7 @@ public static void deleteDirectory(File folder) {
      * @param to Destination
      */
     public static void copyDirectory(File from, File to) {
-        if (from.isDirectory()) {
+        if (from.isDirectory() && !Files.isSymbolicLink(from.toPath())) {
             if (!to.exists()) {
                 to.mkdirs();
             }
@@ -278,34 +279,10 @@ public static void copyDirectory(File from, File to) {
                 copyDirectory(srcFile, destFile);
             }
         } else {
-            InputStream in = null;
-            OutputStream out = null;
-
             try {
-                in = new FileInputStream(from);
-                out = new FileOutputStream(to);
-
-                byte[] buffer = new byte[1024];
-
-                int length;
-                while ((length = in.read(buffer)) > 0) {
-                    out.write(buffer, 0, length);
-                }
-
-                in.close();
-                out.close();
+                Files.copy(from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS);
             } catch (Exception e) {
-                try {
-                    if (in != null) in.close();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                }
-
-                try {
-                    if (out != null) out.close();
-                } catch (IOException e2) {
-                    e2.printStackTrace();
-                }
+                e.printStackTrace();
             }
         }
     }

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Util.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Util.java
@@ -6,6 +6,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.util.*;
 
 /**
@@ -264,7 +265,7 @@ public static void deleteDirectory(File folder) {
      * @param to Destination
      */
     public static void copyDirectory(File from, File to) {
-        if (from.isDirectory()) {
+        if (from.isDirectory() && !Files.isSymbolicLink(from.toPath())) {
             if (!to.exists()) {
                 to.mkdirs();
             }
@@ -278,34 +279,10 @@ public static void copyDirectory(File from, File to) {
                 copyDirectory(srcFile, destFile);
             }
         } else {
-            InputStream in = null;
-            OutputStream out = null;
-
             try {
-                in = new FileInputStream(from);
-                out = new FileOutputStream(to);
-
-                byte[] buffer = new byte[1024];
-
-                int length;
-                while ((length = in.read(buffer)) > 0) {
-                    out.write(buffer, 0, length);
-                }
-
-                in.close();
-                out.close();
+                Files.copy(from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS);
             } catch (Exception e) {
-                try {
-                    if (in != null) in.close();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                }
-
-                try {
-                    if (out != null) out.close();
-                } catch (IOException e2) {
-                    e2.printStackTrace();
-                }
+                e.printStackTrace();
             }
         }
     }

diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>19w03a</version>
+            <version>19w03b</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Util.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Util.java
@@ -6,6 +6,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.util.*;
 
 /**
@@ -264,48 +265,22 @@ public static void deleteDirectory(File folder) {
      * @param to Destination
      */
     public static void copyDirectory(File from, File to) {
-        if (from.isDirectory()) {
+        if (from.isDirectory() && !Files.isSymbolicLink(from.toPath())) {
             if (!to.exists()) {
                 to.mkdirs();
             }
 
-            String files[] = from.list();
-
-            for (String file : files) {
+            for (String file : from.list()) {
                 File srcFile = new File(from, file);
                 File destFile = new File(to, file);
 
                 copyDirectory(srcFile, destFile);
             }
         } else {
-            InputStream in = null;
-            OutputStream out = null;
-
             try {
-                in = new FileInputStream(from);
-                out = new FileOutputStream(to);
-
-                byte[] buffer = new byte[1024];
-
-                int length;
-                while ((length = in.read(buffer)) > 0) {
-                    out.write(buffer, 0, length);
-                }
-
-                in.close();
-                out.close();
+                Files.copy(from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS);
             } catch (Exception e) {
-                try {
-                    if (in != null) in.close();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                }
-
-                try {
-                    if (out != null) out.close();
-                } catch (IOException e2) {
-                    e2.printStackTrace();
-                }
+                e.printStackTrace();
             }
         }
     }