@openclaw/fs-safe 0.7.1 → 0.8.0

package/dist/archive-staging.js

@@ -5,11 +5,13 @@ import { ownExtractionDestinationMutation, } from "./archive-deadline.js";
 import { ArchiveSecurityError, } from "./archive-errors.js";
 import { FsSafeError } from "./errors.js";
 import { formatErrorDetail } from "./error-detail.js";
-import { resolveOpenedFileRealPathForHandle, root } from "./root.js";
+import { root } from "./root.js";
 import { isNotFoundPathError, isPathInside } from "./path.js";
-import { resolveReadOpenFlags } from "./read-open-flags.js";
 import { resolveSecureTempRoot } from "./secure-temp-dir.js";
 import { getFsSafeTestHooks } from "./test-hooks.js";
+import { mkdirPathComponentsWithGuards } from "./guarded-mkdir.js";
+import { expandRelativePathWithHome } from "./root-context.js";
+import { resolveRootPath } from "./root-path.js";
 const ERROR_ARCHIVE_ENTRY_TRAVERSES_SYMLINK = "archive entry traverses symlink in destination";
 const ARCHIVE_STAGING_MODE = 0o700;
 function checkExtractionDeadline(deadline) {
@@ -19,7 +21,7 @@ export { ArchiveSecurityError } from "./archive-errors.js";
 function symlinkTraversalError(originalPath) {
     return new ArchiveSecurityError("destination-symlink-traversal", `${ERROR_ARCHIVE_ENTRY_TRAVERSES_SYMLINK}: ${formatErrorDetail(originalPath)}`);
 }
-async function createDirectoryIdentityGuard(dir) {
+export async function createDirectoryIdentityGuard(dir) {
     try {
         return await createAsyncDirectoryGuard(dir);
     }
@@ -30,7 +32,7 @@ async function createDirectoryIdentityGuard(dir) {
         throw err;
     }
 }
-async function assertDirectoryIdentityGuard(guard) {
+export async function assertDirectoryIdentityGuard(guard) {
     try {
         await assertAsyncDirectoryGuard(guard);
     }
@@ -82,7 +84,7 @@ async function assertNoSymlinkTraversal(params) {
         }
     }
 }
-async function assertResolvedInsideDestination(params) {
+export async function assertResolvedInsideDestination(params) {
     let resolved;
     try {
         resolved = await fs.realpath(params.targetPath);
@@ -109,8 +111,39 @@ async function mkdirArchiveOutput(params) {
     }
 }
 export async function prepareArchiveOutputPath(params) {
+    await prepareOutputPath(params);
+}
+export async function preparePrivateArchiveOutputPath(params, assertGuards) {
+    await prepareOutputPath(params, assertGuards, true);
+}
+async function prepareOutputPath(params, assertGuards, privateWorkingMode = false) {
     checkExtractionDeadline(params.deadline);
-    const targetRoot = await root(params.destinationRealDir);
+    const targetRoot = privateWorkingMode ? {
+        async mkdir(relativePath) {
+            // Retain Root.mkdir's strict alias admission before the shared traversal,
+            // while selecting private creation modes without adding a public option.
+            const resolved = await resolveRootPath({
+                absolutePath: path.resolve(params.destinationRealDir, await expandRelativePathWithHome(relativePath)),
+                rootPath: params.destinationRealDir,
+                rootCanonicalPath: params.destinationRealDir,
+                boundaryLabel: "archive destination",
+                rejectSymlinks: true,
+            });
+            checkExtractionDeadline(params.deadline);
+            await mkdirPathComponentsWithGuards({
+                rootReal: params.destinationRealDir,
+                targetPath: resolved.canonicalPath,
+                mode: 0o700,
+                rejectSymlinks: true,
+                beforeComponent: async () => {
+                    await assertDirectoryIdentityGuard(destinationGuard);
+                    checkExtractionDeadline(params.deadline);
+                    await assertGuards?.();
+                    checkExtractionDeadline(params.deadline);
+                },
+            });
+        },
+    } : await root(params.destinationRealDir);
     checkExtractionDeadline(params.deadline);
     const destinationGuard = await createDirectoryIdentityGuard(params.destinationRealDir);
     checkExtractionDeadline(params.deadline);
@@ -127,6 +160,8 @@ export async function prepareArchiveOutputPath(params) {
         await ownExtractionDestinationMutation(params.deadline, async () => {
             await assertDirectoryIdentityGuard(destinationGuard);
             checkExtractionDeadline(params.deadline);
+            await assertGuards?.();
+            checkExtractionDeadline(params.deadline);
             await mkdirArchiveOutput({
                 targetRoot,
                 relativePath: relPath,
@@ -151,6 +186,8 @@ export async function prepareArchiveOutputPath(params) {
         await ownExtractionDestinationMutation(params.deadline, async () => {
             await assertDirectoryIdentityGuard(destinationGuard);
             checkExtractionDeadline(params.deadline);
+            await assertGuards?.();
+            checkExtractionDeadline(params.deadline);
             await mkdirArchiveOutput({
                 targetRoot,
                 relativePath: parentRel,
@@ -168,104 +205,6 @@ export async function prepareArchiveOutputPath(params) {
     });
     checkExtractionDeadline(params.deadline);
 }
-async function chmodInsideDestinationBestEffort(params) {
-    await getFsSafeTestHooks()?.beforeArchiveOutputMutation?.("chmod", params.destinationPath);
-    checkExtractionDeadline(params.deadline);
-    const destinationGuard = await createDirectoryIdentityGuard(params.destinationRealDir);
-    checkExtractionDeadline(params.deadline);
-    await assertDirectoryIdentityGuard(destinationGuard);
-    checkExtractionDeadline(params.deadline);
-    const handle = await fs
-        .open(params.destinationPath, resolveReadOpenFlags())
-        .catch(() => null);
-    checkExtractionDeadline(params.deadline);
-    if (!handle) {
-        const stat = await fs.lstat(params.destinationPath).catch(() => null);
-        checkExtractionDeadline(params.deadline);
-        if (stat?.isSymbolicLink()) {
-            throw symlinkTraversalError(params.originalPath);
-        }
-        return;
-    }
-    try {
-        const stat = await handle.stat();
-        checkExtractionDeadline(params.deadline);
-        if (!stat.isDirectory() && !stat.isFile()) {
-            return;
-        }
-        const realPath = await resolveOpenedFileRealPathForHandle(handle, params.destinationPath);
-        checkExtractionDeadline(params.deadline);
-        if (!isPathInside(params.destinationRealDir, realPath)) {
-            throw symlinkTraversalError(params.originalPath);
-        }
-        await ownExtractionDestinationMutation(params.deadline, async () => {
-            await handle.chmod(params.mode).catch(() => undefined);
-            checkExtractionDeadline(params.deadline);
-            await assertDirectoryIdentityGuard(destinationGuard);
-            checkExtractionDeadline(params.deadline);
-        });
-    }
-    finally {
-        await handle.close().catch(() => undefined);
-    }
-}
-async function applyStagedEntryMode(params) {
-    checkExtractionDeadline(params.deadline);
-    const destinationPath = path.join(params.destinationRealDir, params.relPath);
-    await assertResolvedInsideDestination({
-        destinationRealDir: params.destinationRealDir,
-        targetPath: destinationPath,
-        originalPath: params.originalPath,
-    });
-    checkExtractionDeadline(params.deadline);
-    if (params.mode !== 0) {
-        await chmodInsideDestinationBestEffort({
-            destinationRealDir: params.destinationRealDir,
-            destinationPath,
-            mode: params.mode,
-            originalPath: params.originalPath,
-            deadline: params.deadline,
-        });
-    }
-    checkExtractionDeadline(params.deadline);
-}
-async function assertExtractedFileHasNoHardlinkAlias(params) {
-    const destinationPath = path.join(params.destinationRealDir, params.relPath);
-    await assertResolvedInsideDestination({
-        destinationRealDir: params.destinationRealDir,
-        targetPath: destinationPath,
-        originalPath: params.originalPath,
-    });
-    const stat = await fs.lstat(destinationPath);
-    if (stat.isFile() && stat.nlink > 1) {
-        throw symlinkTraversalError(params.originalPath);
-    }
-}
-async function removeExtractedDestinationFile(params) {
-    const destinationPath = path.join(params.destinationRealDir, params.relPath);
-    let stat;
-    try {
-        stat = await fs.lstat(destinationPath);
-    }
-    catch {
-        return;
-    }
-    if (!stat.isFile()) {
-        return;
-    }
-    let resolved;
-    try {
-        resolved = await fs.realpath(destinationPath);
-    }
-    catch {
-        return;
-    }
-    if (!isPathInside(params.destinationRealDir, resolved)) {
-        return;
-    }
-    const targetRoot = await root(params.destinationRealDir);
-    await targetRoot.remove(params.relPath).catch(() => undefined);
-}
 function assertSafeArchiveStagingPrefix(prefix) {
     if (!prefix ||
         prefix === "." ||
@@ -305,94 +244,7 @@ export async function withStagedArchiveDestination(params) {
         }
     }
 }
-export async function mergeExtractedTreeIntoDestination(params) {
-    const targetRoot = await root(params.destinationRealDir);
-    const sourceRootGuard = await createDirectoryIdentityGuard(params.sourceDir);
-    const sourceRootReal = sourceRootGuard.realPath;
-    const walk = async (currentSourceDir) => {
-        await assertDirectoryIdentityGuard(sourceRootGuard);
-        const entries = await fs.readdir(currentSourceDir, { withFileTypes: true });
-        for (const entry of entries) {
-            await assertDirectoryIdentityGuard(sourceRootGuard);
-            const sourcePath = path.join(currentSourceDir, entry.name);
-            const relPath = path.relative(params.sourceDir, sourcePath);
-            const originalPath = relPath.split(path.sep).join("/");
-            const destinationPath = path.join(params.destinationDir, relPath);
-            const sourceStat = await fs.lstat(sourcePath);
-            if (sourceStat.isSymbolicLink()) {
-                throw symlinkTraversalError(originalPath);
-            }
-            const sourceReal = await fs.realpath(sourcePath);
-            if (!isPathInside(sourceRootReal, sourceReal)) {
-                throw symlinkTraversalError(originalPath);
-            }
-            if (sourceStat.isDirectory()) {
-                await prepareArchiveOutputPath({
-                    destinationDir: params.destinationDir,
-                    destinationRealDir: params.destinationRealDir,
-                    relPath,
-                    outPath: destinationPath,
-                    originalPath,
-                    isDirectory: true,
-                    deadline: params.deadline,
-                });
-                await walk(sourcePath);
-                await applyStagedEntryMode({
-                    destinationRealDir: params.destinationRealDir,
-                    relPath,
-                    mode: sourceStat.mode & 0o777,
-                    originalPath,
-                    deadline: params.deadline,
-                });
-                continue;
-            }
-            if (!sourceStat.isFile()) {
-                throw new Error(`archive staging contains unsupported entry: ${formatErrorDetail(originalPath)}`);
-            }
-            await prepareArchiveOutputPath({
-                destinationDir: params.destinationDir,
-                destinationRealDir: params.destinationRealDir,
-                relPath,
-                outPath: destinationPath,
-                originalPath,
-                isDirectory: false,
-                deadline: params.deadline,
-            });
-            await ownExtractionDestinationMutation(params.deadline, async () => {
-                try {
-                    await targetRoot.copyIn(relPath, sourcePath, { mkdir: true });
-                    checkExtractionDeadline(params.deadline);
-                    await assertExtractedFileHasNoHardlinkAlias({
-                        destinationRealDir: params.destinationRealDir,
-                        relPath,
-                        originalPath,
-                    });
-                    checkExtractionDeadline(params.deadline);
-                    await applyStagedEntryMode({
-                        destinationRealDir: params.destinationRealDir,
-                        relPath,
-                        mode: sourceStat.mode & 0o777,
-                        originalPath,
-                        deadline: params.deadline,
-                    });
-                    checkExtractionDeadline(params.deadline);
-                }
-                catch (err) {
-                    await removeExtractedDestinationFile({
-                        destinationRealDir: params.destinationRealDir,
-                        relPath,
-                    });
-                    if (err instanceof FsSafeError &&
-                        (err.code === "hardlink" || err.code === "path-alias")) {
-                        throw symlinkTraversalError(originalPath);
-                    }
-                    throw err;
-                }
-            });
-        }
-    };
-    await walk(params.sourceDir);
-}
+export { mergeExtractedTreeIntoDestination } from "./archive-merge.js";
 export function createArchiveSymlinkTraversalError(originalPath) {
     return symlinkTraversalError(originalPath);
 }

package/dist/archive-tar-meta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive-tar-meta.d.ts","sourceRoot":"","sources":["../src/archive-tar-meta.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAY,MAAM,aAAa,CAAC;AAIlD,OAAO,EAAqE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI7H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAWrD,qBAAa,gBAAiB,SAAQ,SAAS;IAYjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAX/E,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwB;IACnD,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,aAAa,CAAK;IAE1B,YAA6B,MAAM,EAAE,cAAc,EAAmB,QAAQ,CAAC,GAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,aAAA,EAM7G;IAED,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,SAAS;IA4BjB,OAAO,CAAC,YAAY;IA6EpB,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,KAAK;IAyCJ,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAc3H;IAEQ,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAM9D;CACF;AAaD,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CAC1C,GAAG,OAAO,CAAC,IAAI,CAAC,CAShB"}
+{"version":3,"file":"archive-tar-meta.d.ts","sourceRoot":"","sources":["../src/archive-tar-meta.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAY,MAAM,aAAa,CAAC;AAIlD,OAAO,EAAqE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI7H,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAWrD,qBAAa,gBAAiB,SAAQ,SAAS;IAYjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAkB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAX/E,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwB;IACnD,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,aAAa,CAAK;IAE1B,YAA6B,MAAM,EAAE,cAAc,EAAmB,QAAQ,CAAC,GAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,aAAA,EAM7G;IAED,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,SAAS;IA4BjB,OAAO,CAAC,YAAY;IA6EpB,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,KAAK;IAyCJ,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAc3H;IAEQ,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAM9D;CACF;AAaD,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CAC1C,GAAG,OAAO,CAAC,IAAI,CAAC,CAahB"}

package/dist/archive-tar-meta.js

@@ -261,13 +261,17 @@ async function isGzip(filePath) {
     }
 }
 export async function preflightTarMetadata(params) {
-    const input = fs.createReadStream(params.archivePath);
     const meter = new TarMetadataMeter(params.limits, params.onMember);
     const sink = new Writable({ write(_chunk, _encoding, callback) { callback(); } });
-    if (await isGzip(params.archivePath)) {
-        await pipeline(input, createGunzip(), meter, sink, { signal: params.signal });
+    const gzip = await isGzip(params.archivePath);
+    const decoder = gzip ? createGunzip() : undefined;
+    const input = fs.createReadStream(params.archivePath);
+    try {
+        await (decoder
+            ? pipeline(input, decoder, meter, sink, { signal: params.signal })
+            : pipeline(input, meter, sink, { signal: params.signal }));
     }
-    else {
-        await pipeline(input, meter, sink, { signal: params.signal });
+    finally {
+        input.destroy();
     }
 }

package/dist/archive-tar-runtime.d.ts

@@ -27,6 +27,7 @@ export type TarModule = {
         noChmod: true;
         preserveOwner: false;
         noMtime: true;
+        dmode: number;
         strict: true;
         maxMetaEntrySize: number;
         maxDecompressionRatio: number;

package/dist/archive-tar-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive-tar-runtime.d.ts","sourceRoot":"","sources":["../src/archive-tar-runtime.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,GAAG;IAC9C,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC1B,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,SAAS,CAAC;IAChF,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,SAAS,CAAC;IACzE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAC;IACnE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,SAAS,CAAC;IAChE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,CAAC;CACnD,CAAC;AAIF,eAAO,MAAM,uBAAuB,QAA2B,CAAC;AAEhE,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,KAAK,OAAO,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IAC/E,CAAC,CAAC,OAAO,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,aAAa,EAAE,KAAK,CAAC;QACrB,OAAO,EAAE,IAAI,CAAC;QACd,aAAa,EAAE,KAAK,CAAC;QACrB,OAAO,EAAE,IAAI,CAAC;QACd,MAAM,EAAE,IAAI,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAC;QACzB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,MAAM,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;QACrE,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;KAClD,GAAG,SAAS,CAAC;IACd,CAAC,CAAC,OAAO,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,IAAI,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAC;QACzB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG;YAAE,MAAM,IAAI,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC;KACvE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACtB,CAAC;AAEF,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,SAAS,CAAC,CAS5D;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAS/D"}
+{"version":3,"file":"archive-tar-runtime.d.ts","sourceRoot":"","sources":["../src/archive-tar-runtime.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,GAAG;IAC9C,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC1B,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,SAAS,CAAC;IAChF,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GAAG,SAAS,CAAC;IACzE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAC;IACnE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,SAAS,CAAC;IAChE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,SAAS,CAAC;CACnD,CAAC;AAIF,eAAO,MAAM,uBAAuB,QAA2B,CAAC;AAEhE,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,KAAK,OAAO,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IAC/E,CAAC,CAAC,OAAO,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,aAAa,EAAE,KAAK,CAAC;QACrB,OAAO,EAAE,IAAI,CAAC;QACd,aAAa,EAAE,KAAK,CAAC;QACrB,OAAO,EAAE,IAAI,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,IAAI,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAC;QACzB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,MAAM,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC;QACrE,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;KAClD,GAAG,SAAS,CAAC;IACd,CAAC,CAAC,OAAO,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,IAAI,CAAC;QACb,gBAAgB,EAAE,MAAM,CAAC;QACzB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG;YAAE,MAAM,IAAI,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC;KACvE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACtB,CAAC;AAEF,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,SAAS,CAAC,CAS5D;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAS/D"}

package/dist/archive-zip-admission.d.ts

@@ -1,7 +1,8 @@
 import type { ExtractionDeadline } from "./archive-deadline.js";
 import { type ResolvedArchiveExtractLimits } from "./archive-limits.js";
+import { type ZipDirectoryEntry } from "./archive-zip-directory.js";
 /** Admit physical records before a decoder can normalize or collapse names. */
 export declare function admitZipBuffer(input: Uint8Array, limits: ResolvedArchiveExtractLimits): number;
 /** The extraction input is already private and staged; read only bounded metadata. */
-export declare function admitZipFile(archivePath: string, limits: ResolvedArchiveExtractLimits, deadline: ExtractionDeadline): Promise<number>;
+export declare function admitZipFile(archivePath: string, limits: ResolvedArchiveExtractLimits, deadline: ExtractionDeadline, onEntry?: (entry: ZipDirectoryEntry) => void): Promise<number>;
 //# sourceMappingURL=archive-zip-admission.d.ts.map

package/dist/archive-zip-admission.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive-zip-admission.d.ts","sourceRoot":"","sources":["../src/archive-zip-admission.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAA+C,KAAK,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAYrH,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,4BAA4B,GAAG,MAAM,CAU9F;AAED,sFAAsF;AACtF,wBAAsB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,4BAA4B,EAAE,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CA+B3I"}
+{"version":3,"file":"archive-zip-admission.d.ts","sourceRoot":"","sources":["../src/archive-zip-admission.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAA+C,KAAK,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAErH,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAUtF,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,4BAA4B,GAAG,MAAM,CAU9F;AAED,sFAAsF;AACtF,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,4BAA4B,EAAE,QAAQ,EAAE,kBAAkB,EACvF,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,GAC3C,OAAO,CAAC,MAAM,CAAC,CA+BjB"}

package/dist/archive-zip-admission.js

@@ -24,7 +24,7 @@ export function admitZipBuffer(input, limits) {
     return step.value;
 }
 /** The extraction input is already private and staged; read only bounded metadata. */
-export async function admitZipFile(archivePath, limits, deadline) {
+export async function admitZipFile(archivePath, limits, deadline, onEntry) {
     deadline.check();
     const opened = await openRootFile({
         absolutePath: archivePath, rootPath: path.dirname(archivePath),
@@ -34,7 +34,7 @@ export async function admitZipFile(archivePath, limits, deadline) {
         throw opened.error ?? new Error("cannot open staged ZIP archive");
     try {
         checkSize(opened.stat.size, limits);
-        const scan = scanZipDirectory(opened.stat.size, limits);
+        const scan = scanZipDirectory(opened.stat.size, limits, onEntry);
         let step = scan.next();
         while (!step.done) {
             const { offset, length } = step.value;

package/dist/archive-zip-directory.d.ts

@@ -4,5 +4,12 @@ export type ZipRead = {
     length: number;
 };
 export type ZipScan = Generator<ZipRead, number, Buffer>;
-export declare function scanZipDirectory(size: number, limits: ResolvedArchiveExtractLimits): ZipScan;
+export type ZipDirectoryEntry = {
+    index: number;
+    creatorSystem: number;
+    externalAttributes: number;
+    size: number;
+    path?: string;
+};
+export declare function scanZipDirectory(size: number, limits: ResolvedArchiveExtractLimits, onEntry?: (entry: ZipDirectoryEntry) => void): ZipScan;
 //# sourceMappingURL=archive-zip-directory.d.ts.map

package/dist/archive-zip-directory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive-zip-directory.d.ts","sourceRoot":"","sources":["../src/archive-zip-directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAmIzD,wBAAiB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,4BAA4B,GAAG,OAAO,CA8D7F"}
+{"version":3,"file":"archive-zip-directory.d.ts","sourceRoot":"","sources":["../src/archive-zip-directory.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACzD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAmIF,wBAAiB,gBAAgB,CAC/B,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,4BAA4B,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,GAC/F,OAAO,CAkET"}

package/dist/archive-zip-directory.js

@@ -150,7 +150,7 @@ function* descriptorEnd(at, bound, crc, compressed, uncompressed, wide) {
         zipFormat("invalid or ambiguous data descriptor");
     return matches[0];
 }
-export function* scanZipDirectory(size, limits) {
+export function* scanZipDirectory(size, limits, onEntry) {
     const directory = yield* layout(size);
     assertArchiveEntryCountWithinLimit(directory.count, limits);
     const seen = new Set();
@@ -193,7 +193,7 @@ export function* scanZipDirectory(size, limits) {
         const localExtraLength = local.readUInt16LE(28);
         const localNames = yield* read(localAt + 30, localNameLength + localExtraLength, directory.start);
         const localExtra = zipExtraFields(localNames.subarray(localNameLength));
-        admitZipNames({ central: centralName, local: localNames.subarray(0, localNameLength), flags, centralExtra, localExtra, seen });
+        const entryPath = admitZipNames({ central: centralName, local: localNames.subarray(0, localNameLength), flags, centralExtra, localExtra, seen });
         const localValues = wideValues(local, localExtra, false);
         const crc = central.readUInt32LE(16);
         if (!(flags & 8) && (local.readUInt32LE(14) !== crc || localValues.compressed !== values.compressed || localValues.uncompressed !== values.uncompressed)) {
@@ -211,6 +211,10 @@ export function* scanZipDirectory(size, limits) {
         if (flags & 8)
             dataEnd = yield* descriptorEnd(dataEnd, directory.start, crc, values.compressed, values.uncompressed, values.wide || localValues.wide);
         spans.push({ start: localAt, end: dataEnd });
+        onEntry?.({
+            index: count - 1, creatorSystem: central[5], externalAttributes: central.readUInt32LE(38),
+            size: values.uncompressed, path: entryPath,
+        });
         at = next;
     }
     if (count !== directory.count)

package/dist/archive-zip-entry.d.ts

@@ -2,7 +2,7 @@ import { type ArchiveEntryModePolicy } from "./archive-policy.js";
 export type ZipEntry = {
     name: string;
     dir: boolean;
-    unixPermissions?: number;
+    unixPermissions?: number | null;
     _data?: {
         crc32?: number;
         uncompressedSize?: number;

package/dist/archive-zip-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive-zip-entry.d.ts","sourceRoot":"","sources":["../src/archive-zip-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7E,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC,cAAc,CAAC;IACzC,KAAK,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,QAAQ,GACd;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAI3D;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAGhE;AAKD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAK1D;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,sBAAsB,GAAG,SAAS,GACzC,MAAM,CAMR;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAE5D"}
+{"version":3,"file":"archive-zip-entry.d.ts","sourceRoot":"","sources":["../src/archive-zip-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,KAAK,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7E,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC,cAAc,CAAC;IACzC,KAAK,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,QAAQ,GACd;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAI3D;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAGhE;AAKD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAK1D;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,sBAAsB,GAAG,SAAS,GACzC,MAAM,CAMR;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAE5D"}

package/dist/archive-zip-names.d.ts

@@ -8,5 +8,5 @@ export declare function admitZipNames(params: {
     centralExtra: Map<number, Buffer>;
     localExtra: Map<number, Buffer>;
     seen: Set<string>;
-}): void;
+}): string | undefined;
 //# sourceMappingURL=archive-zip-names.d.ts.map

package/dist/archive-zip-names.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive-zip-names.d.ts","sourceRoot":"","sources":["../src/archive-zip-names.ts"],"names":[],"mappings":"AAIA,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAEhD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAcjE;AA6BD,wBAAgB,aAAa,CAAC,MAAM,EAAE;IACpC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAC9C,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnB,GAAG,IAAI,CA6BP"}
+{"version":3,"file":"archive-zip-names.d.ts","sourceRoot":"","sources":["../src/archive-zip-names.ts"],"names":[],"mappings":"AAIA,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAEhD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAcjE;AA6BD,wBAAgB,aAAa,CAAC,MAAM,EAAE;IACpC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAC9C,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnB,GAAG,MAAM,GAAG,SAAS,CA8BrB"}

package/dist/archive-zip-names.js

@@ -96,4 +96,5 @@ export function admitZipNames(params) {
     }
     for (const identity of identities)
         seen.add(identity);
+    return centralUnicode ?? centralUtf8 ?? (central.every((byte) => byte < 128) ? central.toString("ascii") : undefined);
 }

package/dist/archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"AA+DA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAElE,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACjF,YAAY,EACV,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EAChB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,6BAA6B,EAC7B,mBAAmB,EACnB,2BAA2B,EAC3B,uBAAuB,EACvB,4BAA4B,EAC5B,iCAAiC,EACjC,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EACL,kCAAkC,EAClC,iCAAiC,EACjC,4BAA4B,EAC5B,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EACjC,KAAK,mBAAmB,GACzB,MAAM,4BAA4B,CAAC;AAyNpC,wBAAsB,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6KjF"}
+{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../src/archive.ts"],"names":[],"mappings":"AA+DA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAElE,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACjF,YAAY,EACV,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EAChB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,6BAA6B,EAC7B,mBAAmB,EACnB,2BAA2B,EAC3B,uBAAuB,EACvB,4BAA4B,EAC5B,iCAAiC,EACjC,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EACL,kCAAkC,EAClC,iCAAiC,EACjC,4BAA4B,EAC5B,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EACjC,KAAK,mBAAmB,GACzB,MAAM,4BAA4B,CAAC;AA6MpC,wBAAsB,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqKjF"}

package/dist/archive.js

@@ -7,7 +7,8 @@ import { createArchiveOutputPathTracker, resolveArchiveOutputPath, stripArchiveP
 import { createPipelineTimeoutError, waitForDeadline, withExtractionDeadline, } from "./archive-deadline.js";
 import { assertArchiveEntryCountWithinLimit, assertArchiveEntryPathComponentsWithinLimit, createByteBudgetTracker, createExtractBudgetTransform, resolveExtractLimits, resolveTarMeterLimits, } from "./archive-limits.js";
 import { resolveArchiveKind } from "./archive-kind.js";
-import { mergeExtractedTreeIntoDestination, prepareArchiveDestinationDir, prepareArchiveOutputPath, withStagedArchiveDestination, } from "./archive-staging.js";
+import { prepareArchiveDestinationDir, preparePrivateArchiveOutputPath, withStagedArchiveDestination, } from "./archive-staging.js";
+import { mergePlannedArchiveIntoDestination } from "./archive-merge.js";
 import { createTarEntryPreflightChecker, readTarEntryInfo, } from "./archive-tar.js";
 import { loadZipArchiveWithPreflight } from "./archive-zip-preflight.js";
 import { isZipSymlinkEntry, zipEntryDeclaredSize, zipEntryMode, } from "./archive-zip-entry.js";
@@ -64,9 +65,6 @@ function resolveZipOutputPath(params) {
         }),
     };
 }
-async function prepareZipOutputPath(params) {
-    await prepareArchiveOutputPath(params);
-}
 async function writeZipFileEntry(params) {
     params.deadline.check();
     params.budget.startEntry();
@@ -78,9 +76,9 @@ async function writeZipFileEntry(params) {
         await writeSiblingTempFile({
             dir: path.dirname(destinationPath),
             chmodDir: false,
-            mode: params.mode,
+            mode: 0o600,
             writeTemp: async (tempPath) => {
-                tempHandle = await fs.open(tempPath, OPEN_WRITE_CREATE_FLAGS, 0o666);
+                tempHandle = await fs.open(tempPath, OPEN_WRITE_CREATE_FLAGS, 0o600);
                 const writable = tempHandle.createWriteStream();
                 writable.once("close", () => {
                     handleClosedByStream = true;
@@ -137,6 +135,7 @@ async function extractZip(params) {
             destinationRealDir,
             run: async (stagingDir) => {
                 const stagingRealDir = await fs.realpath(stagingDir);
+                const acceptedEntries = [];
                 for (const entry of entries) {
                     params.deadline.check();
                     const output = resolveZipOutputPath({
@@ -163,7 +162,8 @@ async function extractZip(params) {
                         throw new ArchiveSecurityError("entry-link", `zip entry is a link: ${entry.name}`);
                     }
                     const mode = zipEntryMode(entry, params.entryModes);
-                    await prepareZipOutputPath({
+                    acceptedEntries.push({ path: output.relPath, kind: entry.dir ? "directory" : "file", mode });
+                    await preparePrivateArchiveOutputPath({
                         destinationDir: stagingRealDir,
                         destinationRealDir: stagingRealDir,
                         relPath: output.relPath,
@@ -173,7 +173,6 @@ async function extractZip(params) {
                         deadline: params.deadline,
                     });
                     if (entry.dir) {
-                        await fs.chmod(output.outPath, mode);
                         continue;
                     }
                     await writeZipFileEntry({
@@ -181,11 +180,11 @@ async function extractZip(params) {
                         outPath: output.outPath,
                         budget,
                         deadline: params.deadline,
-                        mode,
                     });
                 }
                 params.deadline.check();
-                await mergeExtractedTreeIntoDestination({
+                await mergePlannedArchiveIntoDestination({
+                    entries: acceptedEntries,
                     sourceDir: stagingRealDir,
                     destinationDir: params.destDir,
                     destinationRealDir,
@@ -276,6 +275,7 @@ export async function extractArchive(params) {
                             noChmod: true,
                             preserveOwner: false,
                             noMtime: true,
+                            dmode: 0o700,
                             strict: true,
                             maxMetaEntrySize: tarLimits.maxMetaEntryBytes,
                             maxDecompressionRatio: NODE_TAR_RATIO_DISABLED,
@@ -286,18 +286,19 @@ export async function extractArchive(params) {
                                     if (!relPath) {
                                         return false;
                                     }
-                                    // Writes and the mode pass use the admitted output identity.
+                                    const kind = info.type === "Directory" || info.type === "GNUDumpDir" ? "directory" : "file";
+                                    // Keep archived modes before changing node-tar's creation mode.
                                     entry.path = relPath;
                                     acceptedEntries.push({
                                         path: relPath,
+                                        kind,
                                         mode: resolveArchiveEntryMode({
-                                            kind: info.type === "Directory" || info.type === "GNUDumpDir"
-                                                ? "directory"
-                                                : "file",
+                                            kind,
                                             archivedMode: info.mode,
                                             policy: params.entryModes,
                                         }),
                                     });
+                                    entry.mode = kind === "directory" ? 0o700 : 0o600;
                                     return true;
                                 }
                                 catch (error) {
@@ -329,18 +330,9 @@ export async function extractArchive(params) {
                             throw normalizeTarParserError(createPipelineTimeoutError(error, deadline));
                         }
                         admission.finish();
-                        for (const accepted of acceptedEntries) {
-                            deadline.check();
-                            const outputPath = resolveArchiveOutputPath({
-                                rootDir: stagingDir,
-                                relPath: accepted.path,
-                                originalPath: accepted.path,
-                            });
-                            await fs.chmod(outputPath, accepted.mode);
-                            deadline.check();
-                        }
                         deadline.check();
-                        await mergeExtractedTreeIntoDestination({
+                        await mergePlannedArchiveIntoDestination({
+                            entries: acceptedEntries,
                             sourceDir: stagingDir,
                             destinationDir: params.destDir,
                             destinationRealDir,

package/dist/directory-guard.d.ts

@@ -1,19 +1,31 @@
 import type { BigIntStats, Stats } from "node:fs";
-export type AsyncDirectoryGuard = {
+export type AsyncDirectoryGuard<T extends Stats | BigIntStats = Stats> = {
     dir: string;
     realPath: string;
-    stat: Stats;
+    stat: T;
 };
+export type AnyAsyncDirectoryGuard = AsyncDirectoryGuard<Stats | BigIntStats>;
 export type SyncDirectoryGuard = {
     dir: string;
     realPath: string;
     stat: Stats;
 };
-export declare function createAsyncDirectoryGuard(dir: string): Promise<AsyncDirectoryGuard>;
-export declare function assertAsyncDirectoryGuard(guard: AsyncDirectoryGuard): Promise<void>;
+export declare function createAsyncDirectoryGuard(dir: string, options: {
+    bigint: true;
+}): Promise<AsyncDirectoryGuard<BigIntStats>>;
+export declare function createAsyncDirectoryGuard(dir: string, options?: {
+    bigint?: false;
+}): Promise<AsyncDirectoryGuard>;
+export declare function createAsyncDirectoryGuard(dir: string, options: {
+    bigint: boolean;
+}): Promise<AnyAsyncDirectoryGuard>;
+export declare function assertAsyncDirectoryGuard(guard: AnyAsyncDirectoryGuard): Promise<void>;
 export declare function createSyncDirectoryGuard(dir: string): SyncDirectoryGuard;
 export declare function assertSyncDirectoryGuard(guard: SyncDirectoryGuard): void;
 export declare function createNearestExistingDirectoryGuard(rootReal: string, targetPath: string): Promise<AsyncDirectoryGuard>;
+export declare function createNearestExistingDirectoryGuard(rootReal: string, targetPath: string, options: {
+    bigint: boolean;
+}): Promise<AnyAsyncDirectoryGuard>;
 export declare function createNearestExistingSyncDirectoryGuard(rootReal: string, targetPath: string): SyncDirectoryGuard;
-export declare function inspectDirectoryIdentity(dir: string, expected?: BigIntStats): Promise<BigIntStats>;
+export declare function inspectDirectoryIdentity(dir: string, expected?: Pick<BigIntStats, "dev" | "ino">): Promise<BigIntStats>;
 //# sourceMappingURL=directory-guard.d.ts.map