Skip to content
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

Jump to bottom

CVE-2023-22899 CVE-2018-1002202 CVE-2022-24615 Bump net.lingala.zip4j 2.11.5 #43

Merged
merged 1 commit into from
Jun 25, 2024
Merged

CVE-2023-22899 CVE-2018-1002202 CVE-2022-24615 Bump net.lingala.zip4j 2.11.5 #43

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...dm-maintenance/src/main/java/org/forgerock/openidm/maintenance/upgrade/UpdateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public interface UpdateManager {
* Get the contents of an archive file as a string
* @param archive
* @param file
* @return
* @return JsonValue
* @throws UpdateException
*/
JsonValue getArchiveFile(Path archive, Path file) throws UpdateException;
Expand Down
6 changes: 3 additions & 3 deletions ...aintenance/src/main/java/org/forgerock/openidm/maintenance/upgrade/UpdateManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

import difflib.DiffUtils;
import difflib.Patch;
import net.lingala.zip4j.core.ZipFile;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.exception.ZipException;
import org.apache.commons.io.FileUtils;
import org.forgerock.commons.launcher.OSGiFrameworkService;
Expand Down Expand Up @@ -805,7 +805,7 @@ public JsonValue getLicense(Path archiveFile) throws UpdateException {
} catch (IOException e) {
throw new UpdateException("Unable to load license file.", e);
}
} catch (IOException | ZipException e) {
} catch (IOException e) {
return json(object());
}
}
Expand Down Expand Up @@ -1429,7 +1429,7 @@ Path extractFileToDirectory(File zipFile, Path fileToExtract) throws UpdateExcep
Path tmpDir = Files.createTempDirectory(UUID.randomUUID().toString());
zip.extractFile(fileToExtract.toString(), tmpDir.toString());
return tmpDir.resolve(fileToExtract).getParent();
} catch (IOException | ZipException e) {
} catch (IOException e) {
throw new UpdateException("Unable to load " + fileToExtract + ".", e);
}
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
<version>1.3.2</version>
<version>2.11.5</version>
</dependency>

<dependency>
Expand Down