feat: track direct extraction outputs

Replace package staging assumptions with validated per-generation output records for internal ZIP and both JVM backends. Persist resume v2 using relative archive identities, complete member fingerprints, and concrete verified outputs so basename collisions, changed members, missing outputs, and unknown versions fail closed.
2026-08-22 13:37:19 +02:00
parent afa7da11da
commit 9049489e87
17 changed files with 1227 additions and 234 deletions
@@ -274,11 +274,13 @@ public final class JBindExtractorMain {
                }

                long itemUnits = safeSize(header.getUncompressedSize());
-                File output = resolveOutputFile(request.targetDir, entryName, request.conflictMode, reserved);
-                if (output == null) {
-                    progress.advance(itemUnits);
-                    continue;
-                }
+                OutputTarget outputTarget = resolveOutputFile(request.targetDir, entryName, request.conflictMode, reserved);
+                File output = outputTarget.file;
+                if (output == null) {
+                    emitOutput(request.archiveFile, entryName, outputTarget.reportedFile, "complete", outputTarget.disposition);
+                    progress.advance(itemUnits);
+                    continue;
+                }

                ensureDirectory(output.getParentFile());
                rejectSymlink(output);
@@ -319,17 +321,21 @@ public final class JBindExtractorMain {
                        progress.advance(remaining[0]);
                    }
                    long modified = header.getLastModifiedTimeEpoch();
-                    if (modified > 0) {
-                        output.setLastModified(modified);
-                    }
-                    extractionSuccess = true;
-                } catch (ZipException error) {
+                    if (modified > 0) {
+                        output.setLastModified(modified);
+                    }
+                    extractionSuccess = true;
+                    emitOutput(request.archiveFile, entryName, output, "complete", outputTarget.disposition);
+                } catch (ZipException error) {
                    if (isWrongPassword(error, encrypted)) {
                        throw new WrongPasswordException(error);
                    }
                    throw error;
-                } finally {
-                    if (!extractionSuccess && output.exists()) {
+                } finally {
+                    if (!extractionSuccess && output.exists()) {
+                        emitOutput(request.archiveFile, entryName, output, "partial", outputTarget.disposition);
+                    }
+                    if (!extractionSuccess && output.exists()) {
                        try {
                            output.delete();
                        } catch (Throwable ignored) {
@@ -368,9 +374,11 @@ public final class JBindExtractorMain {

            long totalUnits = 0;
            boolean encrypted = false;
-            List<Integer> fileIndices = new ArrayList<Integer>();
-            List<File> outputFiles = new ArrayList<File>();
-            List<Long> fileSizes = new ArrayList<Long>();
+            List<Integer> fileIndices = new ArrayList<Integer>();
+            List<File> outputFiles = new ArrayList<File>();
+            List<Long> fileSizes = new ArrayList<Long>();
+            List<String> entryNames = new ArrayList<String>();
+            List<String> dispositions = new ArrayList<String>();
            Set<String> reserved = new HashSet<String>();

            for (int i = 0; i < itemCount; i++) {
@@ -396,10 +404,16 @@ public final class JBindExtractorMain {
                long itemSize = safeSize(rawSize);
                totalUnits += itemSize;

-                File output = resolveOutputFile(request.targetDir, entryName, request.conflictMode, reserved);
-                fileIndices.add(i);
-                outputFiles.add(output);
-                fileSizes.add(itemSize);
+                OutputTarget outputTarget = resolveOutputFile(request.targetDir, entryName, request.conflictMode, reserved);
+                File output = outputTarget.file;
+                if (output == null) {
+                    emitOutput(request.archiveFile, entryName, outputTarget.reportedFile, "complete", outputTarget.disposition);
+                }
+                fileIndices.add(i);
+                outputFiles.add(output);
+                fileSizes.add(itemSize);
+                entryNames.add(entryName);
+                dispositions.add(outputTarget.disposition);
            }

            if (fileIndices.isEmpty()) {
@@ -434,7 +448,7 @@ public final class JBindExtractorMain {

            try {
                archive.extract(indices, false, new BulkExtractCallback(
-                    archive, indexToPos, fileIndices, outputFiles, fileSizes,
+                    archive, request.archiveFile, indexToPos, fileIndices, outputFiles, fileSizes, entryNames, dispositions,
                    progress, encryptedFinal, effectivePassword, currentOutput,
                    currentStream, currentSuccess, currentRemaining, currentPos, firstError
                ));
@@ -566,26 +580,26 @@ public final class JBindExtractorMain {
        return directory;
    }

-    private static File resolveOutputFile(File targetDir, String entryName, ConflictMode conflictMode, Set<String> reserved) throws IOException {
-        File base = secureResolve(targetDir, entryName);
+    private static OutputTarget resolveOutputFile(File targetDir, String entryName, ConflictMode conflictMode, Set<String> reserved) throws IOException {
+        File base = secureResolve(targetDir, entryName);
        String key = pathKey(base);
        boolean exists = base.exists() || reserved.contains(key);

-        if (!exists) {
-            reserved.add(key);
-            return base;
-        }
-
-        if (conflictMode == ConflictMode.SKIP) {
-            return null;
-        }
+        if (!exists) {
+            reserved.add(key);
+            return new OutputTarget(base, base, "written");
+        }
+
+        if (conflictMode == ConflictMode.SKIP) {
+            return new OutputTarget(null, base, "skipped");
+        }

        if (conflictMode == ConflictMode.OVERWRITE) {
            if (base.exists()) {
                deleteRecursively(base);
-            }
-            reserved.add(key);
-            return base;
+            }
+            reserved.add(key);
+            return new OutputTarget(base, base, "overwritten");
        }

        File parent = base.getParentFile();
@@ -600,8 +614,8 @@ public final class JBindExtractorMain {
            File candidate = new File(parent, candidateName);
            String candidateKey = pathKey(candidate);
            if (!candidate.exists() && !reserved.contains(candidateKey)) {
-                reserved.add(candidateKey);
-                return candidate;
+                reserved.add(candidateKey);
+                return new OutputTarget(candidate, candidate, "renamed");
            }
            counter += 1;
        }
@@ -816,9 +830,23 @@ public final class JBindExtractorMain {
        System.out.println("RD_DONE");
    }

-    private static void emitError(String message) {
-        System.err.println("RD_ERROR " + message);
-    }
+    private static void emitError(String message) {
+        System.err.println("RD_ERROR " + message);
+    }
+
+    private static String encodeField(String value) {
+        return Base64.getEncoder().encodeToString((value == null ? "" : value).getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static void emitOutput(File archiveFile, String entryPath, File outputFile, String state, String disposition) {
+        if (archiveFile == null || outputFile == null) {
+            return;
+        }
+        System.out.println("RD_OUTPUT 1 " + state + " " + disposition + " "
+                + encodeField(archiveFile.getAbsolutePath()) + " "
+                + encodeField(entryPath == null ? "" : entryPath.replace('\\', '/')) + " "
+                + encodeField(outputFile.getAbsolutePath()));
+    }

    private enum Backend {
        AUTO("auto"),
@@ -866,20 +894,35 @@ public final class JBindExtractorMain {
        }
    }

-    private static final class ExtractionRequest {
+    private static final class ExtractionRequest {
        private File archiveFile;
        private File targetDir;
        private ConflictMode conflictMode = ConflictMode.SKIP;
        private Backend backend = Backend.AUTO;
        private final List<String> passwords = new ArrayList<String>();
-    }
+    }
+
+    private static final class OutputTarget {
+        private final File file;
+        private final File reportedFile;
+        private final String disposition;
+
+        OutputTarget(File file, File reportedFile, String disposition) {
+            this.file = file;
+            this.reportedFile = reportedFile;
+            this.disposition = disposition;
+        }
+    }

    private static final class BulkExtractCallback implements IArchiveExtractCallback, ICryptoGetTextPassword {
-        private final IInArchive archive;
+        private final IInArchive archive;
+        private final File archiveFile;
        private final Map<Integer, Integer> indexToPos;
        private final List<Integer> fileIndices;
        private final List<File> outputFiles;
-        private final List<Long> fileSizes;
+        private final List<Long> fileSizes;
+        private final List<String> entryNames;
+        private final List<String> dispositions;
        private final ProgressTracker progress;
        private final boolean encrypted;
        private final String password;
@@ -890,17 +933,21 @@ public final class JBindExtractorMain {
        private final int[] currentPos;
        private final Throwable[] firstError;

-        BulkExtractCallback(IInArchive archive, Map<Integer, Integer> indexToPos,
-                List<Integer> fileIndices, List<File> outputFiles, List<Long> fileSizes,
+        BulkExtractCallback(IInArchive archive, File archiveFile, Map<Integer, Integer> indexToPos,
+                List<Integer> fileIndices, List<File> outputFiles, List<Long> fileSizes,
+                List<String> entryNames, List<String> dispositions,
                ProgressTracker progress, boolean encrypted, String password,
                File[] currentOutput, FileOutputStream[] currentStream,
                boolean[] currentSuccess, long[] currentRemaining, int[] currentPos,
                Throwable[] firstError) {
-            this.archive = archive;
+            this.archive = archive;
+            this.archiveFile = archiveFile;
            this.indexToPos = indexToPos;
            this.fileIndices = fileIndices;
            this.outputFiles = outputFiles;
-            this.fileSizes = fileSizes;
+            this.fileSizes = fileSizes;
+            this.entryNames = entryNames;
+            this.dispositions = dispositions;
            this.progress = progress;
            this.encrypted = encrypted;
            this.password = password;
@@ -992,21 +1039,23 @@ public final class JBindExtractorMain {
            if (result == ExtractOperationResult.OK) {
                currentSuccess[0] = true;
                closeCurrentStream();
-                if (currentPos[0] >= 0 && currentOutput[0] != null) {
+                if (currentPos[0] >= 0 && currentOutput[0] != null) {
                    try {
                        int archiveIndex = fileIndices.get(currentPos[0]);
                        java.util.Date modified = (java.util.Date) archive.getProperty(archiveIndex, PropID.LAST_MODIFICATION_TIME);
                        if (modified != null) {
                            currentOutput[0].setLastModified(modified.getTime());
                        }
-                    } catch (Throwable ignored) {
-
-                    }
-                }
-            } else {
-                closeCurrentStream();
-                if (currentOutput[0] != null && currentOutput[0].exists()) {
-                    try {
+                    } catch (Throwable ignored) {
+
+                    }
+                    emitOutput(archiveFile, entryNames.get(currentPos[0]), currentOutput[0], "complete", dispositions.get(currentPos[0]));
+                }
+            } else {
+                closeCurrentStream();
+                if (currentOutput[0] != null && currentOutput[0].exists()) {
+                    emitOutput(archiveFile, entryNames.get(currentPos[0]), currentOutput[0], "partial", dispositions.get(currentPos[0]));
+                    try {
                        currentOutput[0].delete();
                    } catch (Throwable ignored) {
                    }