Skip to content

Fix codeql findings on gxcompressor #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sgrampone wants to merge 1 commit into from
Closed

Fix codeql findings on gxcompressor #1064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 66 additions & 42 deletions gxcompress/src/main/java/com/genexus/compression/GXCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
Expand Down Expand Up @@ -584,23 +586,31 @@ private static void compressToJar(File[] files, String outputPath) throws IOExce

private static void decompressZip(File archive, String directory) throws IOException {
byte[] buffer = new byte[BUFFER_SIZE];
final Path targetDir = Paths.get(directory).toAbsolutePath().normalize();
try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(archive.toPath()))) {
ZipEntry zipEntry;
while ((zipEntry = zis.getNextEntry()) != null) {
File newFile = new File(directory, zipEntry.getName());
if (zipEntry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
}
} else {
File parent = newFile.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("Failed to create directory " + parent);
}
try (FileOutputStream fos = new FileOutputStream(newFile)) {
int len;
while ((len = zis.read(buffer)) > 0) {
fos.write(buffer, 0, len);
Path entryPath = targetDir.resolve(zipEntry.getName()).normalize();
if(!entryPath.startsWith(targetDir))
{
log.error(DIRECTORY_ATTACK + "{}", zipEntry.getName());
return;
}else {
File newFile = entryPath.toFile();
if (zipEntry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
}
} else {
File parent = newFile.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("Failed to create directory " + parent);
}
try (FileOutputStream fos = new FileOutputStream(newFile)) {
int len;
while ((len = zis.read(buffer)) > 0) {
fos.write(buffer, 0, len);
}
}
}
}
Expand All @@ -610,23 +620,30 @@ private static void decompressZip(File archive, String directory) throws IOExcep

private static void decompress7z(File archive, String directory) throws IOException {
byte[] buffer = new byte[BUFFER_SIZE];
final Path targetDir = Paths.get(directory).toAbsolutePath().normalize();
try (SevenZFile sevenZFile = new SevenZFile(archive)) {
SevenZArchiveEntry entry;
while ((entry = sevenZFile.getNextEntry()) != null) {
File newFile = new File(directory, entry.getName());
if (entry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
}
} else {
File parent = newFile.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("Failed to create directory " + parent);
}
try (OutputStream out = Files.newOutputStream(newFile.toPath())) {
int bytesRead;
while ((bytesRead = sevenZFile.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
Path entryPath = targetDir.resolve(entry.getName()).normalize();
if(!entryPath.startsWith(targetDir)) {
log.error(DIRECTORY_ATTACK + "{}", entry.getName());
return;
}else {
File newFile = entryPath.toFile();
if (entry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
}
} else {
File parent = newFile.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("Failed to create directory " + parent);
}
try (OutputStream out = Files.newOutputStream(newFile.toPath())) {
int bytesRead;
while ((bytesRead = sevenZFile.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
}
}
}
}
Expand All @@ -636,23 +653,30 @@ private static void decompress7z(File archive, String directory) throws IOExcept

private static void decompressTar(File archive, String directory) throws IOException {
byte[] buffer = new byte[BUFFER_SIZE];
final Path targetDir = Paths.get(directory).toAbsolutePath().normalize();
try (TarArchiveInputStream tis = new TarArchiveInputStream(Files.newInputStream(archive.toPath()))) {
TarArchiveEntry entry;
while ((entry = tis.getNextEntry()) != null) {
File newFile = new File(directory, entry.getName());
if (entry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
}
} else {
File parent = newFile.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("Failed to create directory " + parent);
}
try (OutputStream out = Files.newOutputStream(newFile.toPath())) {
int len;
while ((len = tis.read(buffer)) != -1) {
out.write(buffer, 0, len);
Path entryPath = targetDir.resolve(entry.getName()).normalize();
if(!entryPath.startsWith(targetDir)) {
log.error(DIRECTORY_ATTACK + "{}", entry.getName());
return;
}else {
File newFile = entryPath.toFile();
if (entry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
}
} else {
File parent = newFile.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("Failed to create directory " + parent);
}
try (OutputStream out = Files.newOutputStream(newFile.toPath())) {
int len;
while ((len = tis.read(buffer)) != -1) {
out.write(buffer, 0, len);
}
}
}
}
Expand Down
Loading