Cherry pick branch 'genexuslabs:Compress' into beta

Author: tomas-sexenian

gxcompress/src/main/java/com/genexus/compression/CompressionUtils.java

@@ -22,6 +22,8 @@
 
 public class CompressionUtils {
 
+	private static final int BUFFER_SIZE = 8192;
+
 	/**
 	 * Counts the number of entries in an archive file.
 	 *
@@ -39,7 +41,7 @@ public static int countArchiveEntries(File archiveFile) throws IOException {
 					return zipFile.size();
 				}
 			case "7z":
-				try (SevenZFile sevenZFile = getSevenZFile(archiveFile.getAbsolutePath())) {
+				try (SevenZFile sevenZFile = getSevenZFile(archiveFile)) {
 					while (sevenZFile.getNextEntry() != null) {
 						count++;
 					}
@@ -81,21 +83,17 @@ public static boolean isArchiveSafe(File archiveFile, String targetDir) throws I
 					Enumeration<? extends ZipEntry> entries = zipFile.entries();
 					while (entries.hasMoreElements()) {
 						ZipEntry entry = entries.nextElement();
-						File destinationFile = new File(targetPath, entry.getName()).getCanonicalFile();
-						if (!destinationFile.getPath().startsWith(targetPath.getPath() + File.separator) &&
-							!destinationFile.getPath().equals(targetPath.getPath())) {
+						if (!isEntryPathSafe(targetPath, entry.getName())) {
 							return false;
 						}
 					}
 				}
 				return true;
 			case "7z":
-				try (SevenZFile sevenZFile = getSevenZFile(archiveFile.getAbsolutePath())) {
+				try (SevenZFile sevenZFile = getSevenZFile(archiveFile)) {
 					SevenZArchiveEntry entry;
 					while ((entry = sevenZFile.getNextEntry()) != null) {
-						File destinationFile = new File(targetPath, entry.getName()).getCanonicalFile();
-						if (!destinationFile.getPath().startsWith(targetPath.getPath() + File.separator) &&
-							!destinationFile.getPath().equals(targetPath.getPath())) {
+						if (!isEntryPathSafe(targetPath, entry.getName())) {
 							return false;
 						}
 					}
@@ -105,9 +103,7 @@ public static boolean isArchiveSafe(File archiveFile, String targetDir) throws I
 				try (TarArchiveInputStream tarStream = new TarArchiveInputStream(Files.newInputStream(archiveFile.toPath()))) {
 					TarArchiveEntry entry;
 					while ((entry = tarStream.getNextEntry()) != null) {
-						File destinationFile = new File(targetPath, entry.getName()).getCanonicalFile();
-						if (!destinationFile.getPath().startsWith(targetPath.getPath() + File.separator) &&
-							!destinationFile.getPath().equals(targetPath.getPath())) {
+						if (!isEntryPathSafe(targetPath, entry.getName())) {
 							return false;
 						}
 					}
@@ -117,19 +113,15 @@ public static boolean isArchiveSafe(File archiveFile, String targetDir) throws I
 				String fileName = archiveFile.getName();
 				if (fileName.endsWith(".gz") && fileName.length() > 3) {
 					String extractedName = fileName.substring(0, fileName.length() - 3);
-					File destinationFile = new File(targetPath, extractedName).getCanonicalFile();
-					return destinationFile.getPath().startsWith(targetPath.getPath() + File.separator) ||
-						destinationFile.getPath().equals(targetPath.getPath());
+					return isEntryPathSafe(targetPath, extractedName);
 				}
 				return true;
 			case "jar":
 				try (JarFile jarFile = new JarFile(archiveFile)) {
 					Enumeration<JarEntry> entries = jarFile.entries();
 					while (entries.hasMoreElements()) {
 						JarEntry entry = entries.nextElement();
-						File destinationFile = new File(targetPath, entry.getName()).getCanonicalFile();
-						if (!destinationFile.getPath().startsWith(targetPath.getPath() + File.separator) &&
-							!destinationFile.getPath().equals(targetPath.getPath())) {
+						if (!isEntryPathSafe(targetPath, entry.getName())) {
 							return false;
 						}
 					}
@@ -164,7 +156,7 @@ public static long getMaxFileSize(File archiveFile) throws IOException {
 				}
 				break;
 			case "7z":
-				try (SevenZFile sevenZFile = getSevenZFile(archiveFile.getAbsolutePath())) {
+				try (SevenZFile sevenZFile = getSevenZFile(archiveFile)) {
 					SevenZArchiveEntry entry;
 					while ((entry = sevenZFile.getNextEntry()) != null) {
 						if (!entry.isDirectory() && entry.getSize() > maxSize) {
@@ -185,7 +177,7 @@ public static long getMaxFileSize(File archiveFile) throws IOException {
 				break;
 			case "gz":
 				try (GZIPInputStream gzStream = new GZIPInputStream(Files.newInputStream(archiveFile.toPath()))) {
-					byte[] buffer = new byte[8192];
+					byte[] buffer = new byte[BUFFER_SIZE];
 					long size = 0;
 					int n;
 					while ((n = gzStream.read(buffer)) != -1) {
@@ -241,7 +233,7 @@ public static long estimateDecompressedSize(File archiveFile) throws IOException
 				}
 				break;
 			case "7z":
-				try (SevenZFile sevenZFile = getSevenZFile(archiveFile.getAbsolutePath())) {
+				try (SevenZFile sevenZFile = getSevenZFile(archiveFile)) {
 					SevenZArchiveEntry entry;
 					while ((entry = sevenZFile.getNextEntry()) != null) {
 						if (!entry.isDirectory()) {
@@ -304,7 +296,12 @@ public static long estimateDecompressedSize(File archiveFile) throws IOException
 		return totalSize;
 	}
 
-	private static SevenZFile getSevenZFile(final String specialPath) throws IOException {
-		return SevenZFile.builder().setFile(getFile(specialPath)).get();
+	private static SevenZFile getSevenZFile(File archiveFile) throws IOException {
+		return SevenZFile.builder().setFile(archiveFile).get();
+	}
+
+	private static boolean isEntryPathSafe(File targetPath, String entryName) throws IOException {
+		File destinationFile = new File(targetPath, entryName).getCanonicalFile();
+		return destinationFile.getPath().startsWith(targetPath.getPath() + File.separator) || destinationFile.getPath().equals(targetPath.getPath());
 	}
 }