Improve canonical path handling in DecompressFile

Author: bchapuis

baremaps-core/src/main/java/org/apache/baremaps/tasks/DecompressFile.java

@@ -162,6 +162,9 @@ public static void decompressTar(Path target, TarArchiveInputStream tarInputStre
       File destination = target.resolve(entry.getName()).normalize().toFile();
       String canonicalDestinationPath = destination.getCanonicalPath();
       String canonicalTargetPath = target.toFile().getCanonicalPath();
+      if (!canonicalTargetPath.endsWith(File.separator)) {
+        canonicalTargetPath += File.separator;
+      }
       if (canonicalDestinationPath.startsWith(canonicalTargetPath)) {
         if (entry.isDirectory()) {
           Files.createDirectories(destination.toPath());
@@ -196,7 +199,9 @@ protected static void decompressZip(Path source, Path target) throws IOException
         File destination = target.resolve(entry.getName()).normalize().toFile();
         String canonicalDestinationPath = destination.getCanonicalPath();
         String canonicalTargetPath = target.toFile().getCanonicalPath();
-
+        if (!canonicalTargetPath.endsWith(File.separator)) {
+          canonicalTargetPath += File.separator;
+        }
         if (canonicalDestinationPath.startsWith(canonicalTargetPath)) {
           if (entry.isDirectory()) {
             Files.createDirectories(destination.toPath());