Skip to content

Clean up some warnings #1159

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

Merged
labkey-jeckels merged 4 commits into from
Aug 28, 2025
Merged

Clean up some warnings #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2d9465
Clean up some warnings
labkey-jeckels Aug 27, 2025
f033fd2
Merge branch 'develop' into fb_warningCleanup
labkey-jeckels Aug 27, 2025
d4f84d4
Remove duplicate check
labkey-jeckels Aug 27, 2025
8794932
Merge remote-tracking branch 'origin/fb_warningCleanup' into fb_warni…
labkey-jeckels Aug 27, 2025
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
28 changes: 16 additions & 12 deletions server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,8 @@ public class ModuleArchive
protected static final FileComparator _fileComparator = new FileComparator();

private final File _file;
private final long _modified;
private final String _moduleName;
private final SimpleLogger _log;
private final boolean _hasJavaCode;


private String stripToNull(String s)
{
Expand Down Expand Up @@ -122,11 +119,9 @@ public ModuleArchive(File file, SimpleLogger log) throws IOException
{
_file = file;
assert _file.exists() && _file.isFile();
_modified = _file.lastModified();
_log = log;

String moduleName = null;
boolean hasJavaCode = false;

/* try to find moduleName in archive */
try (JarFile jar = new JarFile(getFile()))
Expand Down Expand Up @@ -156,14 +151,10 @@ public ModuleArchive(File file, SimpleLogger log) throws IOException
moduleName = name.toLowerCase();
}
}

if (entryName.endsWith(".class") || entryName.endsWith(".jar"))
hasJavaCode = true;
}
}

_moduleName = moduleName;
_hasJavaCode = hasJavaCode;
}

public File getFile()
Expand All @@ -181,8 +172,7 @@ public String getModuleName()
if (null == _moduleName)
{
String fileName = getFile().getName();
String baseName = fileName.substring(0, fileName.length() - FILE_EXTENSION.length());
return baseName;
return fileName.substring(0, fileName.length() - FILE_EXTENSION.length());
}
return _moduleName;
}
Expand Down Expand Up @@ -262,9 +252,23 @@ public void extractAll(File targetDirectory) throws IOException
_log.info("Done extracting module " + archiveFile.getName() + ". Processed " + fileCount + " file(s) in " + (System.currentTimeMillis() - startTime) + "ms.");
}


public static void ensureChild(File parent, File child) throws IOException
{
// Prevent Zip Slip: though we should always only deploy trusted modules, it's wise to always unzip safely
java.nio.file.Path targetDirPath = parent.toPath().toAbsolutePath().normalize();
java.nio.file.Path destFilePath = child.toPath().toAbsolutePath().normalize();
if (!destFilePath.startsWith(targetDirPath))
{
throw new IOException("Entry '" + child.getName() + "' is outside of the target directory");
}
}


public File extractEntry(JarFile jar, JarEntry entry, File targetDirectory) throws IOException
{
File destFile = new File(targetDirectory, entry.getName());
@SuppressWarnings("SSBasedInspection") File destFile = new File(targetDirectory, entry.getName());
ensureChild(targetDirectory, destFile);

File entryParent = destFile.getParentFile();
if (!entryParent.isDirectory())
Expand Down
3 changes: 3 additions & 0 deletions server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.bootstrap.ConfigException;
import org.labkey.bootstrap.ModuleArchive;

import java.io.BufferedOutputStream;
import java.io.File;
Expand All @@ -21,6 +22,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

@SuppressWarnings("SSBasedInspection") // Disable warnings intended for webapp code
public class EmbeddedExtractor
{
private static final Logger LOG = LogManager.getLogger(EmbeddedExtractor.class);
Expand Down Expand Up @@ -351,6 +353,7 @@ private void extractDistributionZip(InputStream zipInputStream, File destDir) th
? entry.getName()
: entry.getName().replaceFirst("^" + LABKEYWEBAPP, labkeyWebappDirName);
File filePath = new File(destDir, entryName);
ModuleArchive.ensureChild(destDir, filePath);
if (!entry.isDirectory())
{
// if the entry is a file, extracts it
Expand Down