Reverse engineer anything with agents, from app behavior down to native binaries.
TypeScript agent-skillsai-agentsbinary-analysisclaude-codeclicodexcordisdecompilerdeveloper-toolsdshdsh-pluginghidrahopperllmmcpmodel-context-protocolreareverse-engineeringstatic-analysistouhou
fix(artifacts): refuse thin Mach-O extraction before inventory (#6152)
Vinícius Andradeaf7395140523
diff --git a/src/artifacts/extraction/ArtifactExtraction.ts b/src/artifacts/extraction/ArtifactExtraction.tsindex 2130a47ec..3a39ebb99 100644--- a/src/artifacts/extraction/ArtifactExtraction.ts+++ b/src/artifacts/extraction/ArtifactExtraction.ts@@ -39,10 +39,7 @@ import type {ArtifactResourceOwner,ArtifactResourceScope,} from "../ArtifactResourceScope.js";-import {- isMachOFormat,- type BinaryTarget,-} from "../../domain/binaryTargetTypes.js";+import type { BinaryTarget } from "../../domain/binaryTargetTypes.js";import type { ArtifactInventorySnapshot } from "../../domain/artifactInventorySnapshot.js";import { scanArtifactInventoryInScope } from "../inventory/ArtifactInventory.js";import type { ArtifactIntegrityPolicyName } from "../../domain/artifactIntegrityPolicy.js";@@ -439,11 +436,14 @@ const requireExtractableFormat = async (): Promise<boolean> => {const format = input.inputFormat;const directory = (await lstat(path)).isDirectory();+ // A thin Mach-O has no child entries of its own: inventory lists only its+ // root unless it carries an embedded pack, so it takes the same pack probe+ // as ELF and PE while only the universal container has a slice reader.if (!directory &&format !== "asar" &&format !== "godot-pck" &&- !isMachOFormat(format) &&+ format !== "mach-o-universal" &&!isZipPackageFormat(format)) {const pack = await withArtifactRegularFile(@@ -453,7 +453,8 @@ const requireExtractableFormat = async (async (handle) => {const size = (await handle.stat()).size;if (await locateGodotPck(handle, size, signal)) return true;- if (format !== "elf" && format !== "pe") return false;+ if (format !== "elf" && format !== "pe" && format !== "mach-o")+ return false;abortIfNeeded(signal);const packaged = await containsPyInstallerArchive(handle, size, signal);abortIfNeeded(signal);diff --git a/tests/boundary/providers/native/artifactProvider.extractionFormat.test.ts b/tests/boundary/providers/native/artifactProvider.extractionFormat.test.tsindex e4accd098..417eb8ca1 100644--- a/tests/boundary/providers/native/artifactProvider.extractionFormat.test.ts+++ b/tests/boundary/providers/native/artifactProvider.extractionFormat.test.ts@@ -7,6 +7,11 @@ import { writeOrderedZip } from "../../../fixtures/artifactEntryOrder.js";import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js";import { ArtifactProvider } from "../../../../src/artifacts/ArtifactProvider.js";+import {+ CPU,+ machoImage,+} from "../../../../src/artifacts/apple/MachoImage.fixture.js";+import { cArchiveExecutable } from "../../../../src/artifacts/pyinstaller/CArchive.fixture.js";import { artifactExtractionExecutionSchema } from "../../../../src/contracts/artifactToolContracts.js";import { artifactExtractionResultSchema } from "../../../../src/domain/artifactGraph.js";import type { BinaryTarget } from "../../../../src/domain/binaryTargetTypes.js";@@ -45,6 +50,67 @@ describe("artifact extraction format support", () => {await expect(access(output)).rejects.toThrow();});+ it("refuses a thin Mach-O that inventory lists as root-only", async () => {+ const root = await createTestTempDirectory("rea-extract-thin-macho-");+ const binary = join(root, "thin");+ await writeFile(binary, machoImage({ cpu: CPU.arm64e }));+ const output = join(root, "output");+ expect(+ await new ArtifactProvider(process.env)+ .createClient(thinMachOTarget(binary))+ .execute(+ "extract_artifact",+ artifactExtractionExecutionSchema.parse({ output_root: output }),+ ),+ ).toMatchObject({+ ok: false,+ error: {+ _tag: "AnalysisUnsupportedTargetError",+ operation: "extract_artifact",+ path: binary,+ reason: "Artifact format has no extraction reader: mach-o",+ },+ });+ await expect(access(output)).rejects.toThrow();+ });++ it("keeps a thin Mach-O PyInstaller onefile extractable", async () => {+ const root = await createTestTempDirectory("rea-extract-thin-macho-pyi-");+ const binary = join(root, "hello");+ await writeFile(+ binary,+ Buffer.concat([+ machoImage({ cpu: CPU.arm64 }),+ cArchiveExecutable({+ layout: "2.1",+ pythonVersion: 314,+ pythonLibrary: "libpython3.14.dylib",+ members: [+ {+ name: "hello",+ typeCode: "s",+ payload: Buffer.from("print('hi')"),+ compress: true,+ },+ ],+ }),+ ]),+ );+ const result = await new ArtifactProvider(process.env)+ .createClient(thinMachOTarget(binary))+ .execute(+ "extract_artifact",+ artifactExtractionExecutionSchema.parse({+ output_root: join(root, "output"),+ }),+ );+ if (!result.ok) throw result.error;+ const extracted = artifactExtractionResultSchema.parse(result.value.result);+ expect(+ extracted.artifacts.map(({ relative_path }) => relative_path),+ ).toContain("hello");+ });+it.each(["zip", "hap", "hsp", "app-pack"] as const)("extracts the ZIP-backed %s package family that inventory already supports",async (format) => {@@ -83,3 +149,13 @@ const archiveTarget = (kind: "archive",format,});++const thinMachOTarget = (path: string): BinaryTarget => ({+ path,+ sourcePath: path,+ sha256: "0".repeat(64),+ kind: "executable",+ format: "mach-o",+ architecture: "arm64",+ availableArchitectures: ["arm64"],+});