fix: preflight complete archives before mutation

Plan and validate every internal ZIP, Zip4j, and SevenZipJBinding entry and final conflict target before any archive output mutates the filesystem. Preserve raw RAR list entry whitespace for strict validation and keep any non-matching package owner marker immutable while direct scoped outputs continue without marker reissuance.
This commit is contained in:
Sucukdeluxe
2026-08-22 15:53:33 +02:00
parent 6724b3605c
commit 1859aaf539
17 changed files with 252 additions and 58 deletions
@@ -259,10 +259,24 @@ public final class JBindExtractorMain {
encrypted = encrypted || header.isEncrypted();
totalUnits += safeSize(header.getUncompressedSize());
}
ProgressTracker progress = new ProgressTracker(totalUnits);
progress.emitStart();
Set<String> reserved = new HashSet<String>();
ProgressTracker progress = new ProgressTracker(totalUnits);
progress.emitStart();
Set<String> preflightReserved = new HashSet<String>();
for (FileHeader header : fileHeaders) {
if (header == null) {
continue;
}
String entryName = normalizeEntryName(header.getFileName(), "file");
if (header.isDirectory()) {
File dir = resolveDirectory(request.targetDir, entryName);
preflightReserved.add(pathKey(dir));
} else {
resolveOutputFile(request.targetDir, entryName, request.conflictMode, preflightReserved);
}
}
Set<String> reserved = new HashSet<String>();
for (FileHeader header : fileHeaders) {
if (header == null) {
continue;
@@ -382,6 +396,7 @@ public final class JBindExtractorMain {
List<Long> fileSizes = new ArrayList<Long>();
List<String> entryNames = new ArrayList<String>();
List<String> dispositions = new ArrayList<String>();
List<File> outputDirectories = new ArrayList<File>();
Set<String> reserved = new HashSet<String>();
for (int i = 0; i < itemCount; i++) {
@@ -391,9 +406,8 @@ public final class JBindExtractorMain {
if (Boolean.TRUE.equals(isFolder)) {
File dir = resolveDirectory(request.targetDir, entryName);
ensureDirectory(dir);
rejectLinkedPath(request.targetDir, dir);
reserved.add(pathKey(dir));
outputDirectories.add(dir);
reserved.add(pathKey(dir));
continue;
}
@@ -418,7 +432,12 @@ public final class JBindExtractorMain {
fileSizes.add(itemSize);
entryNames.add(entryName);
dispositions.add(outputTarget.disposition);
}
}
for (File directory : outputDirectories) {
ensureDirectory(directory);
rejectLinkedPath(request.targetDir, directory);
}
if (fileIndices.isEmpty()) {
@@ -605,7 +624,7 @@ public final class JBindExtractorMain {
if (conflictMode == ConflictMode.OVERWRITE) {
if (base.exists()) {
if (!base.isFile() || !base.delete()) {
if (!base.isFile()) {
throw new IOException("Konnte Datei nicht uberschreiben: " + base.getAbsolutePath());
}
}