Skip to content

Fix Fortify security scanning #1066

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

Open
iroqueta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Fortify security scanning #1066

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
17 changes: 17 additions & 0 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 @@ -588,6 +588,9 @@ private static void decompressZip(File archive, String directory) throws IOExcep
ZipEntry zipEntry;
while ((zipEntry = zis.getNextEntry()) != null) {
File newFile = new File(directory, zipEntry.getName());
if (HasZipSlipVulnerability(newFile, directory)) {
throw new IOException("Bad tar entry: " + zipEntry.getName());
}
if (zipEntry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
Expand All @@ -614,6 +617,9 @@ private static void decompress7z(File archive, String directory) throws IOExcept
SevenZArchiveEntry entry;
while ((entry = sevenZFile.getNextEntry()) != null) {
File newFile = new File(directory, entry.getName());
if (HasZipSlipVulnerability(newFile, directory)) {
throw new IOException("Bad tar entry: " + entry.getName());
}
if (entry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
Expand All @@ -640,6 +646,9 @@ private static void decompressTar(File archive, String directory) throws IOExcep
TarArchiveEntry entry;
while ((entry = tis.getNextEntry()) != null) {
File newFile = new File(directory, entry.getName());
if (HasZipSlipVulnerability(newFile, directory)) {
throw new IOException("Bad tar entry: " + entry.getName());
}
if (entry.isDirectory()) {
if (!newFile.isDirectory() && !newFile.mkdirs()) {
throw new IOException("Failed to create directory " + newFile);
Expand Down Expand Up @@ -787,4 +796,12 @@ private static void decompressJar(File archive, String directory) throws IOExcep
}
}
}

// Check for Zip Slip vulnerability: ensure extracted file remains within target directory
// Use Path.normalize() and Path.startsWith()
private static boolean HasZipSlipVulnerability(File file, String directory) {
java.nio.file.Path destDirPath = new File(directory).toPath().toAbsolutePath().normalize();
java.nio.file.Path newFilePath = file.toPath().toAbsolutePath().normalize();
return !newFilePath.startsWith(destDirPath);
}
}
Loading