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

Fix modular jar final permissions #333

Merged
merged 4 commits into from
May 8, 2024
Merged

Fix modular jar final permissions #333

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61607d6
Fix modular jar final permissions
laurentgo Apr 27, 2024
6bd83e1
Copy mjar permissions when fixing modification times
laurentgo May 1, 2024
7723068
Clean temporary file if an error occurs
laurentgo May 1, 2024
b6a1450
Do not follow symlink when reading jar attributes
laurentgo May 7, 2024
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
53 changes: 39 additions & 14 deletions src/main/java/org/codehaus/plexus/archiver/jar/JarToolModularJarArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@
import java.io.PrintStream;
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.FileAttribute;
import java.nio.file.attribute.FileTime;
import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.PosixFileAttributes;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Enumeration;
Expand Down Expand Up @@ -147,23 +152,43 @@ protected void postCreateArchive() throws ArchiverException {
private void fixLastModifiedTimeZipEntries() throws IOException {
long timeMillis = getLastModifiedTime().toMillis();
Path destFile = getDestFile().toPath();
Path tmpZip = Files.createTempFile(destFile.getParent(), null, null);
try (ZipFile zipFile = new ZipFile(getDestFile());
ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(tmpZip))) {
Enumeration<? extends ZipEntry> entries = zipFile.entries();
while (entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
// Not using setLastModifiedTime(FileTime) as it sets the extended timestamp
// which is not compatible with the jar tool output.
entry.setTime(timeMillis);
out.putNextEntry(entry);
if (!entry.isDirectory()) {
IOUtil.copy(zipFile.getInputStream(entry), out);
PosixFileAttributes posixFileAttributes = Files.getFileAttributeView(
destFile, PosixFileAttributeView.class, LinkOption.NOFOLLOW_LINKS)
.readAttributes();
FileAttribute<?>[] attributes;
if (posixFileAttributes != null) {
attributes = new FileAttribute<?>[1];
attributes[0] = PosixFilePermissions.asFileAttribute(posixFileAttributes.permissions());
} else {
attributes = new FileAttribute<?>[0];
}
Path tmpZip = Files.createTempFile(destFile.getParent(), null, null, attributes);
try {
try (ZipFile zipFile = new ZipFile(getDestFile());
ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(tmpZip))) {
Enumeration<? extends ZipEntry> entries = zipFile.entries();
while (entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
// Not using setLastModifiedTime(FileTime) as it sets the extended timestamp
// which is not compatible with the jar tool output.
entry.setTime(timeMillis);
out.putNextEntry(entry);
if (!entry.isDirectory()) {
IOUtil.copy(zipFile.getInputStream(entry), out);
}
out.closeEntry();
}
out.closeEntry();
}
Files.move(tmpZip, destFile, StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) {
// Clean up temporary file if an error occurs
try {
Files.delete(tmpZip);
} catch (IOException ioe) {
e.addSuppressed(ioe);
}
throw e;
}
Files.move(tmpZip, destFile, StandardCopyOption.REPLACE_EXISTING);
}

/**
Expand Down