romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: format archive extraction changes

Browse Source
This commit is contained in:
MaxMiksa 2026-01-28 23:20:36 -05:00
parent 34e9448d08
commit ecb5120ece
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/infra/archive.test.ts
View File

@ -60,9 +60,9 @@ describe("archive utils", () => {
await fs.writeFile(archivePath, await zip.generateAsync({ type: "nodebuffer" })); await fs.writeFile(archivePath, await zip.generateAsync({ type: "nodebuffer" }));
await fs.mkdir(extractDir, { recursive: true }); await fs.mkdir(extractDir, { recursive: true });
await expect(extractArchive({ archivePath, destDir: extractDir, timeoutMs: 5_000 })).rejects.toThrow( await expect(
/escapes destination/i, extractArchive({ archivePath, destDir: extractDir, timeoutMs: 5_000 }),
); ).rejects.toThrow(/escapes destination/i);
await expect(fs.stat(path.join(siblingDir, "pwned.txt"))).rejects.toThrow(); await expect(fs.stat(path.join(siblingDir, "pwned.txt"))).rejects.toThrow();
}); });

8
src/infra/archive.ts
View File

@ -65,7 +65,9 @@ function ensureTrailingSep(filePath: string): string {
return filePath.endsWith(path.sep) ? filePath : `${filePath}${path.sep}`; return filePath.endsWith(path.sep) ? filePath : `${filePath}${path.sep}`;
} }
async function normalizeDestRoot(destDir: string): Promise<{ destRoot: string; destRootLower?: string }> { async function normalizeDestRoot(
destDir: string,
): Promise<{ destRoot: string; destRootLower?: string }> {
await fs.mkdir(destDir, { recursive: true }); await fs.mkdir(destDir, { recursive: true });
const destReal = await fs.realpath(destDir); const destReal = await fs.realpath(destDir);
const destRoot = ensureTrailingSep(destReal); const destRoot = ensureTrailingSep(destReal);
@ -77,7 +79,9 @@ async function normalizeDestRoot(destDir: string): Promise<{ destRoot: string; d
async function extractZip(params: { archivePath: string; destDir: string }): Promise<void> { async function extractZip(params: { archivePath: string; destDir: string }): Promise<void> {
const { destRoot, destRootLower } = await normalizeDestRoot(params.destDir); const { destRoot, destRootLower } = await normalizeDestRoot(params.destDir);
const startsWithDest = (targetPath: string): boolean => const startsWithDest = (targetPath: string): boolean =>
destRootLower ? targetPath.toLowerCase().startsWith(destRootLower) : targetPath.startsWith(destRoot); destRootLower
? targetPath.toLowerCase().startsWith(destRootLower)
: targetPath.startsWith(destRoot);
const buffer = await fs.readFile(params.archivePath); const buffer = await fs.readFile(params.archivePath);
const zip = await JSZip.loadAsync(buffer); const zip = await JSZip.loadAsync(buffer);