From 23eee86bd59e5d399c59280b24a746be8318b111 Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 04:20:40 +0800 Subject: [PATCH] refactor(domain): move the Mach-O load command and binary plist readers into src/domain/apple (#11415) --- scripts/lib/module-layers.baseline.json | 6 ++-- scripts/verify/baselines/raw-buffer-read.json | 8 ++--- src/application/AppBundleExecutable.ts | 4 +-- src/artifacts/MachOSliceArtifactReader.ts | 5 ++- .../ReleaseExposureReader.invariant.test.ts | 35 +++++++++++-------- src/artifacts/ReleaseExposureReader.ts | 2 +- src/artifacts/apple/DylibFileAccess.ts | 2 +- .../apple/InterfaceBuilderAnalysis.ts | 6 ++-- .../InterfaceBuilderDecodeBudget.test.ts | 2 +- .../apple/InterfaceBuilderHostLimit.test.ts | 11 +++--- .../apple/KeyedArchiveReader.test.ts | 2 +- src/artifacts/apple/KeyedArchiveReader.ts | 6 ++-- .../apple/MachoEncryptionReader.test.ts | 4 +-- .../apple/MachoLoadCommandReader.test.ts | 2 +- .../apple/PlistDecodeInvariant.test.ts | 33 +++++++++-------- .../apple/PropertyListDecodeBudget.test.ts | 2 +- src/artifacts/apple/machoContainer.test.ts | 2 +- src/artifacts/deno/DenoStandaloneLocation.ts | 2 +- .../apple/binaryPlistLayout.ts} | 2 +- .../apple/binaryPlistMaterializer.test.ts} | 16 ++++----- .../apple/binaryPlistMaterializer.ts} | 16 ++++----- .../apple/machoEncryptionReader.ts} | 12 +++---- .../apple/machoLoadCommandReader.ts} | 22 ++++++------ .../apple/plistScalars.test.ts} | 10 +++--- .../apple/plistScalars.ts} | 13 +++---- .../apple/propertyListDecodeBudget.ts} | 12 +++---- src/electron/ElectronFuseReader.ts | 4 +-- src/kuna/KunaInventoryPlacement.ts | 2 +- src/native/AppleMachoSelection.test.ts | 2 +- src/native/NativeMacOSProvider.ts | 4 +-- src/native/apple/AppleIpsMachOJoin.ts | 2 +- src/native/apple/AppleIpsProvider.test.ts | 2 +- src/native/hardening/MachoHardening.ts | 4 +-- src/native/parsers/plist.invariant.test.ts | 4 +-- src/native/parsers/plist.test.ts | 4 +-- src/native/parsers/plist.ts | 6 ++-- .../filesystem/appleXmlDeclarations.test.ts | 2 +- tests/fixtures/binaryPlistScalarAlias.ts | 2 +- 38 files changed, 144 insertions(+), 131 deletions(-) rename src/{artifacts/apple/BinaryPlistLayout.ts => domain/apple/binaryPlistLayout.ts} (97%) rename src/{artifacts/apple/BinaryPlistMaterializer.test.ts => domain/apple/binaryPlistMaterializer.test.ts} (95%) rename src/{artifacts/apple/BinaryPlistMaterializer.ts => domain/apple/binaryPlistMaterializer.ts} (95%) rename src/{artifacts/apple/MachoEncryptionReader.ts => domain/apple/machoEncryptionReader.ts} (97%) rename src/{artifacts/apple/MachoLoadCommandReader.ts => domain/apple/machoLoadCommandReader.ts} (98%) rename src/{artifacts/apple/PlistScalars.test.ts => domain/apple/plistScalars.test.ts} (98%) rename src/{artifacts/apple/PlistScalars.ts => domain/apple/plistScalars.ts} (98%) rename src/{artifacts/apple/PropertyListDecodeBudget.ts => domain/apple/propertyListDecodeBudget.ts} (98%) diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index 2a06142734..233bc24180 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -29,7 +29,6 @@ "captures -> pcap": 2, "desktop -> browser": 1, "desktop -> electron": 1, - "electron -> artifacts": 2, "flutter -> artifacts": 1, "go -> native": 2, "gpu -> artifacts": 2, @@ -37,14 +36,13 @@ "il2cpp -> ghidra": 1, "il2cpp -> native": 5, "inspector -> browser": 2, - "kuna -> artifacts": 1, "kuna -> native": 2, "model -> artifacts": 1, - "native -> artifacts": 13, + "native -> artifacts": 5, "rust -> native": 2 }, "entry": { - "application -> artifacts": 11, + "application -> artifacts": 9, "application -> browser": 2, "application -> desktop": 41, "application -> frida": 2, diff --git a/scripts/verify/baselines/raw-buffer-read.json b/scripts/verify/baselines/raw-buffer-read.json index 8000f2b6da..b6b4a04bb1 100644 --- a/scripts/verify/baselines/raw-buffer-read.json +++ b/scripts/verify/baselines/raw-buffer-read.json @@ -8,11 +8,7 @@ "src/artifacts/GodotPckArtifactReader.ts": 6, "src/artifacts/UnityFsStructures.ts": 8, "src/artifacts/WxapkgStructures.ts": 3, - "src/artifacts/apple/MachoEncryptionReader.ts": 1, - "src/artifacts/apple/MachoLoadCommandReader.ts": 12, "src/artifacts/apple/NibArchive.ts": 8, - "src/artifacts/apple/PlistScalars.ts": 6, - "src/artifacts/apple/PropertyListDecodeBudget.ts": 2, "src/artifacts/bun/BunModuleGraphLayout.ts": 22, "src/artifacts/deno/DenoSectionLayout.ts": 2, "src/artifacts/deno/DenoStandaloneLocation.ts": 3, @@ -33,9 +29,13 @@ "src/domain/apple/jvmClassFile.ts": 2, "src/domain/apple/machoContainer.ts": 13, "src/domain/apple/machoDylibCommand.ts": 4, + "src/domain/apple/machoEncryptionReader.ts": 1, + "src/domain/apple/machoLoadCommandReader.ts": 12, "src/domain/apple/machoLoadCommands.ts": 8, "src/domain/apple/machoSectionHeader.ts": 8, "src/domain/apple/machoSegmentHeader.ts": 5, + "src/domain/apple/plistScalars.ts": 6, + "src/domain/apple/propertyListDecodeBudget.ts": 2, "src/domain/binaryTarget.ts": 10, "src/domain/desktop/elfDependencies.ts": 4, "src/domain/desktop/openPgpKeys.ts": 2, diff --git a/src/application/AppBundleExecutable.ts b/src/application/AppBundleExecutable.ts index f171cc86cd..5115644d26 100644 --- a/src/application/AppBundleExecutable.ts +++ b/src/application/AppBundleExecutable.ts @@ -3,8 +3,8 @@ import { extname, join, sep } from "node:path"; import { z } from "zod"; -import { preflightPropertyListDecode } from "../artifacts/apple/PropertyListDecodeBudget.js"; -import { decodeBinaryPropertyList } from "../artifacts/apple/BinaryPlistMaterializer.js"; +import { preflightPropertyListDecode } from "../domain/apple/propertyListDecodeBudget.js"; +import { decodeBinaryPropertyList } from "../domain/apple/binaryPlistMaterializer.js"; import { BinaryTargetError } from "../domain/configurationErrors.js"; import { isPathWithinRoot } from "../domain/localPath.js"; import { parseXmlPropertyList } from "../domain/propertyListKeys.js"; diff --git a/src/artifacts/MachOSliceArtifactReader.ts b/src/artifacts/MachOSliceArtifactReader.ts index 83cc67988d..d19835a4c7 100644 --- a/src/artifacts/MachOSliceArtifactReader.ts +++ b/src/artifacts/MachOSliceArtifactReader.ts @@ -27,7 +27,10 @@ import { machoCpuSubtypeBase, machoKnownArm32Subtype, } from "../domain/apple/machoCpuIdentity.js"; -import { readMachoImage, type ReadAt } from "./apple/MachoLoadCommandReader.js"; +import { + readMachoImage, + type ReadAt, +} from "../domain/apple/machoLoadCommandReader.js"; import { streamChunkToBuffer, readArtifactFileChunks, diff --git a/src/artifacts/ReleaseExposureReader.invariant.test.ts b/src/artifacts/ReleaseExposureReader.invariant.test.ts index 8df5ea9318..64af87baee 100644 --- a/src/artifacts/ReleaseExposureReader.invariant.test.ts +++ b/src/artifacts/ReleaseExposureReader.invariant.test.ts @@ -18,20 +18,27 @@ import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory */ const decoder = vi.hoisted(() => ({ broken: false })); -vi.mock("./apple/BinaryPlistMaterializer.js", async (importOriginal) => { - const actual = - await importOriginal(); - return { - ...actual, - decodeBinaryPlistText: ( - ...args: Parameters - ) => { - if (decoder.broken) - throw invariantViolation("binary plist decoder copy lost its trailer"); - return actual.decodeBinaryPlistText(...args); - }, - }; -}); +vi.mock( + "../domain/apple/binaryPlistMaterializer.js", + async (importOriginal) => { + const actual = + await importOriginal< + typeof import("../domain/apple/binaryPlistMaterializer.js") + >(); + return { + ...actual, + decodeBinaryPlistText: ( + ...args: Parameters + ) => { + if (decoder.broken) + throw invariantViolation( + "binary plist decoder copy lost its trailer", + ); + return actual.decodeBinaryPlistText(...args); + }, + }; + }, +); afterEach(() => { decoder.broken = false; diff --git a/src/artifacts/ReleaseExposureReader.ts b/src/artifacts/ReleaseExposureReader.ts index 03ee0ff587..388d304991 100644 --- a/src/artifacts/ReleaseExposureReader.ts +++ b/src/artifacts/ReleaseExposureReader.ts @@ -33,7 +33,7 @@ import { projectStableArtifactFailure, readerIntegrityFailure, } from "../resources/index.js"; -import { decodeBinaryPlistText } from "./apple/BinaryPlistMaterializer.js"; +import { decodeBinaryPlistText } from "../domain/apple/binaryPlistMaterializer.js"; import { InternalInvariantError, invariantViolation, diff --git a/src/artifacts/apple/DylibFileAccess.ts b/src/artifacts/apple/DylibFileAccess.ts index fe56f7ef92..763ae89401 100644 --- a/src/artifacts/apple/DylibFileAccess.ts +++ b/src/artifacts/apple/DylibFileAccess.ts @@ -20,7 +20,7 @@ import { import type { ArtifactIntegrityCheck } from "../../domain/artifactOperationError.js"; import { readArtifactFileChunks } from "../../resources/index.js"; import { hasMachoMagic } from "../../domain/apple/machoContainer.js"; -import { readMachoImage } from "./MachoLoadCommandReader.js"; +import { readMachoImage } from "../../domain/apple/machoLoadCommandReader.js"; import { readFileHandleRange } from "../../filesystem/readFileHandleRange.js"; /** One owner for dyld descriptor admission, physical identity and finalization. */ diff --git a/src/artifacts/apple/InterfaceBuilderAnalysis.ts b/src/artifacts/apple/InterfaceBuilderAnalysis.ts index 636322863f..a68d1d0a41 100644 --- a/src/artifacts/apple/InterfaceBuilderAnalysis.ts +++ b/src/artifacts/apple/InterfaceBuilderAnalysis.ts @@ -5,7 +5,7 @@ import { } from "../../domain/parseFailure.js"; import { InternalInvariantError } from "../../domain/internalInvariant.js"; -import { decodeBinaryPropertyList } from "./BinaryPlistMaterializer.js"; +import { decodeBinaryPropertyList } from "../../domain/apple/binaryPlistMaterializer.js"; import { plistDuplicateKeyLimitations, type PlistDuplicateKeys, @@ -46,7 +46,7 @@ import { import { preflightPropertyListDecode, type PlistDecodePreflight, -} from "./PropertyListDecodeBudget.js"; +} from "../../domain/apple/propertyListDecodeBudget.js"; import { InterfaceBuilderDecodeBudget, interfaceBuilderDecodeBudgetExceeded, @@ -65,7 +65,7 @@ import { decodeXmlPlistText } from "../../domain/propertyListXmlText.js"; import { scanBinaryPlistScalars, UnsupportedBinaryPlistUidError, -} from "./PlistScalars.js"; +} from "../../domain/apple/plistScalars.js"; import type { PlistNumberLiterals } from "../../domain/apple/plistNumbers.js"; import { hasBinaryPlistSignature, diff --git a/src/artifacts/apple/InterfaceBuilderDecodeBudget.test.ts b/src/artifacts/apple/InterfaceBuilderDecodeBudget.test.ts index d4b65c43ba..56936788e4 100644 --- a/src/artifacts/apple/InterfaceBuilderDecodeBudget.test.ts +++ b/src/artifacts/apple/InterfaceBuilderDecodeBudget.test.ts @@ -6,7 +6,7 @@ import { buildBinary } from "plist"; import { describe, expect, it } from "vitest"; import { analyzeInterfaceBuilderBundle } from "./InterfaceBuilderAnalysis.js"; -import { preflightPropertyListDecode } from "./PropertyListDecodeBudget.js"; +import { preflightPropertyListDecode } from "../../domain/apple/propertyListDecodeBudget.js"; import { parseXmlPropertyList } from "../../domain/propertyListKeys.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { diff --git a/src/artifacts/apple/InterfaceBuilderHostLimit.test.ts b/src/artifacts/apple/InterfaceBuilderHostLimit.test.ts index f4523d5404..ebe74ef6b4 100644 --- a/src/artifacts/apple/InterfaceBuilderHostLimit.test.ts +++ b/src/artifacts/apple/InterfaceBuilderHostLimit.test.ts @@ -19,10 +19,13 @@ vi.mock("../../domain/propertyListKeys.js", async (importOriginal) => ({ ...(await importOriginal()), parseXmlPropertyList: stackOverflow, })); -vi.mock("./BinaryPlistMaterializer.js", async (importOriginal) => ({ - ...(await importOriginal()), - decodeBinaryPropertyList: stackOverflow, -})); +vi.mock( + "../../domain/apple/binaryPlistMaterializer.js", + async (importOriginal) => ({ + ...(await importOriginal()), + decodeBinaryPropertyList: stackOverflow, + }), +); it.each([ ["XML", Buffer.from('')], diff --git a/src/artifacts/apple/KeyedArchiveReader.test.ts b/src/artifacts/apple/KeyedArchiveReader.test.ts index eddd6c4706..64600b68d4 100644 --- a/src/artifacts/apple/KeyedArchiveReader.test.ts +++ b/src/artifacts/apple/KeyedArchiveReader.test.ts @@ -5,7 +5,7 @@ import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { build, buildBinary, type PlistValue } from "plist"; -import { estimateBinaryPlistExpansion } from "./PropertyListDecodeBudget.js"; +import { estimateBinaryPlistExpansion } from "../../domain/apple/propertyListDecodeBudget.js"; import { decodeKeyedArchiveBytes, inspectBundleKeyedArchive, diff --git a/src/artifacts/apple/KeyedArchiveReader.ts b/src/artifacts/apple/KeyedArchiveReader.ts index 4fd10cc4ea..456446be3e 100644 --- a/src/artifacts/apple/KeyedArchiveReader.ts +++ b/src/artifacts/apple/KeyedArchiveReader.ts @@ -23,7 +23,7 @@ import { import { ARTIFACT_GRAPH_PROVIDER } from "../../domain/investigationProviders.js"; import { z } from "zod"; -import { decodeBinaryPropertyList } from "./BinaryPlistMaterializer.js"; +import { decodeBinaryPropertyList } from "../../domain/apple/binaryPlistMaterializer.js"; import { plistDuplicateKeyLimitations } from "../../domain/apple/plistDuplicateKeys.js"; import { AnalysisAccessDeniedError, @@ -42,7 +42,7 @@ import { createPlistNumberProjection } from "../../domain/apple/plistNumbers.js" import { scanBinaryPlistScalars, UnsupportedBinaryPlistUidError, -} from "./PlistScalars.js"; +} from "../../domain/apple/plistScalars.js"; import { parseXmlPropertyList } from "../../domain/propertyListKeys.js"; import { KeyedArchiveKindError, @@ -64,7 +64,7 @@ import { hasBinaryPlistSignature, hasNibArchiveSignature, } from "../../domain/apple/appleArchiveFormat.js"; -import { estimateBinaryPlistExpansion } from "./PropertyListDecodeBudget.js"; +import { estimateBinaryPlistExpansion } from "../../domain/apple/propertyListDecodeBudget.js"; const MAX_BYTES = 64 * 1024 * 1024; /** Decoded representation budget, the same 8:1 ratio Interface Builder uses. */ diff --git a/src/artifacts/apple/MachoEncryptionReader.test.ts b/src/artifacts/apple/MachoEncryptionReader.test.ts index ca23de2110..97e5af914a 100644 --- a/src/artifacts/apple/MachoEncryptionReader.test.ts +++ b/src/artifacts/apple/MachoEncryptionReader.test.ts @@ -1,11 +1,11 @@ import { describe, expect, it } from "vitest"; import { CPU, fatImage, machoImage, readerOf } from "./MachoImage.fixture.js"; -import { readMachoEncryption } from "./MachoEncryptionReader.js"; +import { readMachoEncryption } from "../../domain/apple/machoEncryptionReader.js"; import { MAX_LOAD_COMMAND_BYTES, readMachoImage, -} from "./MachoLoadCommandReader.js"; +} from "../../domain/apple/machoLoadCommandReader.js"; const LC_SEGMENT = 0x1; const LC_SEGMENT_64 = 0x19; diff --git a/src/artifacts/apple/MachoLoadCommandReader.test.ts b/src/artifacts/apple/MachoLoadCommandReader.test.ts index d18cbdd47e..ca7012f810 100644 --- a/src/artifacts/apple/MachoLoadCommandReader.test.ts +++ b/src/artifacts/apple/MachoLoadCommandReader.test.ts @@ -26,7 +26,7 @@ import { import { MAX_LOAD_COMMAND_BYTES, readMachoImage, -} from "./MachoLoadCommandReader.js"; +} from "../../domain/apple/machoLoadCommandReader.js"; import { hasMachoMagic } from "../../domain/apple/machoContainer.js"; import { traceDylibResolution } from "./DylibResolutionReader.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; diff --git a/src/artifacts/apple/PlistDecodeInvariant.test.ts b/src/artifacts/apple/PlistDecodeInvariant.test.ts index c991ea094b..3e40307494 100644 --- a/src/artifacts/apple/PlistDecodeInvariant.test.ts +++ b/src/artifacts/apple/PlistDecodeInvariant.test.ts @@ -21,20 +21,25 @@ import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirect */ const decoder = vi.hoisted(() => ({ broken: false })); -vi.mock("./BinaryPlistMaterializer.js", async (importOriginal) => { - const actual = - await importOriginal(); - return { - ...actual, - decodeBinaryPropertyList: ( - ...args: Parameters - ) => { - if (decoder.broken) - throw invariantViolation("Binary plist source plan is missing"); - return actual.decodeBinaryPropertyList(...args); - }, - }; -}); +vi.mock( + "../../domain/apple/binaryPlistMaterializer.js", + async (importOriginal) => { + const actual = + await importOriginal< + typeof import("../../domain/apple/binaryPlistMaterializer.js") + >(); + return { + ...actual, + decodeBinaryPropertyList: ( + ...args: Parameters + ) => { + if (decoder.broken) + throw invariantViolation("Binary plist source plan is missing"); + return actual.decodeBinaryPropertyList(...args); + }, + }; + }, +); afterEach(() => { decoder.broken = false; diff --git a/src/artifacts/apple/PropertyListDecodeBudget.test.ts b/src/artifacts/apple/PropertyListDecodeBudget.test.ts index 12206f0c36..53699caa74 100644 --- a/src/artifacts/apple/PropertyListDecodeBudget.test.ts +++ b/src/artifacts/apple/PropertyListDecodeBudget.test.ts @@ -2,7 +2,7 @@ import { expect, it } from "vitest"; import { AnalysisResourceConstraintError } from "../../domain/analysisErrorCore.js"; import { parsePlistXmlSource } from "../../native/parsers/plist.js"; -import { preflightPropertyListDecode } from "./PropertyListDecodeBudget.js"; +import { preflightPropertyListDecode } from "../../domain/apple/propertyListDecodeBudget.js"; const xmlPlist = (body: string): Buffer => Buffer.from( diff --git a/src/artifacts/apple/machoContainer.test.ts b/src/artifacts/apple/machoContainer.test.ts index 8683a3e778..a85ef9eff6 100644 --- a/src/artifacts/apple/machoContainer.test.ts +++ b/src/artifacts/apple/machoContainer.test.ts @@ -7,7 +7,7 @@ import { machoImage, readerOf, } from "./MachoImage.fixture.js"; -import { readMachoImage } from "./MachoLoadCommandReader.js"; +import { readMachoImage } from "../../domain/apple/machoLoadCommandReader.js"; import { javaClassFile } from "../../../tests/fixtures/javaClassFile.js"; import { classifyArtifactBytes } from "../inventory/ArtifactGraphConstruction.js"; import { createArtifactClassificationProbe } from "../ArtifactClassificationProbe.js"; diff --git a/src/artifacts/deno/DenoStandaloneLocation.ts b/src/artifacts/deno/DenoStandaloneLocation.ts index 4fd340c0e3..60bb9a58fc 100644 --- a/src/artifacts/deno/DenoStandaloneLocation.ts +++ b/src/artifacts/deno/DenoStandaloneLocation.ts @@ -38,7 +38,7 @@ import { readMachoContainer, readSliceCommandTable, type ReadAt, -} from "../apple/MachoLoadCommandReader.js"; +} from "../../domain/apple/machoLoadCommandReader.js"; import { abortIfNeeded } from "../ArtifactHash.js"; import { ArtifactReaderFailure } from "../../resources/index.js"; import { locatePeResourcePayloads } from "../pe/PeResourceLayout.js"; diff --git a/src/artifacts/apple/BinaryPlistLayout.ts b/src/domain/apple/binaryPlistLayout.ts similarity index 97% rename from src/artifacts/apple/BinaryPlistLayout.ts rename to src/domain/apple/binaryPlistLayout.ts index 1c9bf330a9..8962c02260 100644 --- a/src/artifacts/apple/BinaryPlistLayout.ts +++ b/src/domain/apple/binaryPlistLayout.ts @@ -1,4 +1,4 @@ -import { err, ok, type Result } from "../../domain/result.js"; +import { err, ok, type Result } from "../result.js"; /** * Preserve REA's source integer interpretation, including uint64 diff --git a/src/artifacts/apple/BinaryPlistMaterializer.test.ts b/src/domain/apple/binaryPlistMaterializer.test.ts similarity index 95% rename from src/artifacts/apple/BinaryPlistMaterializer.test.ts rename to src/domain/apple/binaryPlistMaterializer.test.ts index fd9b8bd1de..924001ef9f 100644 --- a/src/artifacts/apple/BinaryPlistMaterializer.test.ts +++ b/src/domain/apple/binaryPlistMaterializer.test.ts @@ -1,16 +1,16 @@ import { expect, it, vi } from "vitest"; import { binaryPlistObjectTable } from "../../../tests/fixtures/binaryPlistObjectTable.js"; -import { createPlistNumberProjection } from "../../domain/apple/plistNumbers.js"; -import { projectPlistValue } from "../../domain/apple/plistValue.js"; -import { scanBinaryPlistScalars } from "./PlistScalars.js"; -import { plistUidValue } from "../../domain/apple/plistUid.js"; +import { createPlistNumberProjection } from "./plistNumbers.js"; +import { projectPlistValue } from "./plistValue.js"; +import { scanBinaryPlistScalars } from "./plistScalars.js"; +import { plistUidValue } from "./plistUid.js"; import { decodeBinaryPlistText, decodeBinaryPlistValue, -} from "./BinaryPlistMaterializer.js"; -import { estimateBinaryPlistExpansion } from "./PropertyListDecodeBudget.js"; -import { parseXmlPropertyList } from "../../domain/propertyListKeys.js"; -import { InternalInvariantError } from "../../domain/internalInvariant.js"; +} from "./binaryPlistMaterializer.js"; +import { estimateBinaryPlistExpansion } from "./propertyListDecodeBudget.js"; +import { parseXmlPropertyList } from "../propertyListKeys.js"; +import { InternalInvariantError } from "../internalInvariant.js"; const source = (objects: readonly Buffer[]): Buffer => { const table = diff --git a/src/artifacts/apple/BinaryPlistMaterializer.ts b/src/domain/apple/binaryPlistMaterializer.ts similarity index 95% rename from src/artifacts/apple/BinaryPlistMaterializer.ts rename to src/domain/apple/binaryPlistMaterializer.ts index 7ac6a306ce..fca6fa4538 100644 --- a/src/artifacts/apple/BinaryPlistMaterializer.ts +++ b/src/domain/apple/binaryPlistMaterializer.ts @@ -1,23 +1,23 @@ -import { invariantViolation } from "../../domain/internalInvariant.js"; -import { readBinaryPlistLayout } from "./BinaryPlistLayout.js"; +import { invariantViolation } from "../internalInvariant.js"; +import { readBinaryPlistLayout } from "./binaryPlistLayout.js"; import { parseBinary } from "plist"; -import { markPlistDictionary } from "../../domain/apple/plistUid.js"; +import { markPlistDictionary } from "./plistUid.js"; import { createPlistDuplicateKeyCollector, type PlistDuplicateKeys, -} from "../../domain/apple/plistDuplicateKeys.js"; -import { byteOrderMarkEncoding } from "../../domain/textByteOrderMark.js"; -import type { ParsedPropertyList } from "../../domain/propertyListKeys.js"; +} from "./plistDuplicateKeys.js"; +import { byteOrderMarkEncoding } from "../textByteOrderMark.js"; +import type { ParsedPropertyList } from "../propertyListKeys.js"; import { binaryPlistObjectEnd, decodeBinaryPlistScalars, scanBinaryPlistScalars, type BinaryPlistScalarMetadata, -} from "./PlistScalars.js"; +} from "./plistScalars.js"; import { preflightPropertyListDecode, type PlistDecodePreflight, -} from "./PropertyListDecodeBudget.js"; +} from "./propertyListDecodeBudget.js"; /** Build one array of source scalar references; upstream never constructs a dictionary. */ const scalarArrayInput = ( diff --git a/src/artifacts/apple/MachoEncryptionReader.ts b/src/domain/apple/machoEncryptionReader.ts similarity index 97% rename from src/artifacts/apple/MachoEncryptionReader.ts rename to src/domain/apple/machoEncryptionReader.ts index 37bfa62d76..3b0e31c550 100644 --- a/src/artifacts/apple/MachoEncryptionReader.ts +++ b/src/domain/apple/machoEncryptionReader.ts @@ -1,13 +1,13 @@ -import { LC } from "../../domain/apple/machoLoadCommandCodes.js"; +import { LC } from "./machoLoadCommandCodes.js"; import type { MachoEncryptedRange, MachoEncryptionCommand, MachoEncryptionFacts, MachoSliceEncryption, -} from "../../domain/apple/machoEncryption.js"; -import { validateFatSliceIdentity } from "../../domain/apple/machoContainer.js"; -import { readMachoSectionHeader } from "../../domain/apple/machoSectionHeader.js"; -import { readMachoSegmentHeader } from "../../domain/apple/machoSegmentHeader.js"; +} from "./machoEncryption.js"; +import { validateFatSliceIdentity } from "./machoContainer.js"; +import { readMachoSectionHeader } from "./machoSectionHeader.js"; +import { readMachoSegmentHeader } from "./machoSegmentHeader.js"; import { frameLoadCommands, readMachoContainer, @@ -16,7 +16,7 @@ import { type MachoReadIssue, type MachoSliceHeader, type ReadAt, -} from "./MachoLoadCommandReader.js"; +} from "./machoLoadCommandReader.js"; // loader.h: encryption_info_command is five 32-bit words; the 64-bit form adds `pad`. const ENCRYPTION_COMMAND_SIZE = { 32: 20, 64: 24 } as const; diff --git a/src/artifacts/apple/MachoLoadCommandReader.ts b/src/domain/apple/machoLoadCommandReader.ts similarity index 98% rename from src/artifacts/apple/MachoLoadCommandReader.ts rename to src/domain/apple/machoLoadCommandReader.ts index 79ffa1929e..b10d81a4d7 100644 --- a/src/artifacts/apple/MachoLoadCommandReader.ts +++ b/src/domain/apple/machoLoadCommandReader.ts @@ -1,35 +1,35 @@ -import { LC } from "../../domain/apple/machoLoadCommandCodes.js"; +import { LC } from "./machoLoadCommandCodes.js"; import { malformedInput, ParseFailureError, unsupportedInput, -} from "../../domain/parseFailure.js"; +} from "../parseFailure.js"; import { machoDependencyCommand, readMachoDylibCommandFacts, -} from "../../domain/apple/machoDylibCommand.js"; -import { readMachoSegmentHeader } from "../../domain/apple/machoSegmentHeader.js"; +} from "./machoDylibCommand.js"; +import { readMachoSegmentHeader } from "./machoSegmentHeader.js"; import { MachoLoadCommandCursor, readMachoHeaderDeclarations, readMachoCommandStringBytes, readMachoLinkeditDataCommand, type MachoCommandStringFailure, -} from "../../domain/apple/machoLoadCommands.js"; +} from "./machoLoadCommands.js"; import { MAX_JVM_CLASS_IDENTITY_BYTES, JVM_CLASS_IDENTITY_LIMIT_REASON, -} from "../../domain/apple/jvmClassFile.js"; +} from "./jvmClassFile.js"; import type { MachoDependency, MachoImageFacts, MachoSlice, -} from "../../domain/apple/dylibResolution.js"; -import { machoArchitectureName } from "../../domain/apple/machoCpuIdentity.js"; +} from "./dylibResolution.js"; +import { machoArchitectureName } from "./machoCpuIdentity.js"; import { MACHO_VERSION_MIN_PLATFORMS, legacyMachoPlatform, -} from "../../domain/apple/machoPlatform.js"; +} from "./machoPlatform.js"; import { classifyFatContainerIdentity, fatSliceOverlapReason, @@ -44,8 +44,8 @@ import { type FatContainerHeader, type FatSliceDeclaration, type FatSliceRangeIssue, -} from "../../domain/apple/machoContainer.js"; -import { strictUtf8Decoder } from "../../domain/strictUtf8.js"; +} from "./machoContainer.js"; +import { strictUtf8Decoder } from "../strictUtf8.js"; /** Read `length` bytes at `offset`; shorter results mean end of file. */ export type ReadAt = (offset: number, length: number) => Promise; diff --git a/src/artifacts/apple/PlistScalars.test.ts b/src/domain/apple/plistScalars.test.ts similarity index 98% rename from src/artifacts/apple/PlistScalars.test.ts rename to src/domain/apple/plistScalars.test.ts index aa7ed79f72..c8762a3614 100644 --- a/src/artifacts/apple/PlistScalars.test.ts +++ b/src/domain/apple/plistScalars.test.ts @@ -2,18 +2,18 @@ import { binaryPlistObjectTable } from "../../../tests/fixtures/binaryPlistObjec import { describe, expect, it } from "vitest"; import { parseBinary } from "plist"; -import { createPlistNumberProjection } from "../../domain/apple/plistNumbers.js"; -import { projectPlistValue } from "../../domain/apple/plistValue.js"; -import { readBinaryPlistLayout } from "./BinaryPlistLayout.js"; +import { createPlistNumberProjection } from "./plistNumbers.js"; +import { projectPlistValue } from "./plistValue.js"; +import { readBinaryPlistLayout } from "./binaryPlistLayout.js"; import { binaryDateRequiresExactSeconds, decodeBinaryPlistScalars, scanBinaryPlistScalars, -} from "./PlistScalars.js"; +} from "./plistScalars.js"; import { estimateBinaryPlistExpansion, isPlistDecodeBudgetFailure, -} from "./PropertyListDecodeBudget.js"; +} from "./propertyListDecodeBudget.js"; const dataObjectWithUnusedOverlappingInteger = (): Buffer => { const bytes = Buffer.alloc(66); diff --git a/src/artifacts/apple/PlistScalars.ts b/src/domain/apple/plistScalars.ts similarity index 98% rename from src/artifacts/apple/PlistScalars.ts rename to src/domain/apple/plistScalars.ts index fe093cc8c6..d5d047ea68 100644 --- a/src/artifacts/apple/PlistScalars.ts +++ b/src/domain/apple/plistScalars.ts @@ -1,18 +1,15 @@ -import { - ParseFailureError, - unsupportedInput, -} from "../../domain/parseFailure.js"; -import { invariantViolation } from "../../domain/internalInvariant.js"; +import { ParseFailureError, unsupportedInput } from "../parseFailure.js"; +import { invariantViolation } from "../internalInvariant.js"; import { readBinaryPlistLayout, readBinaryPlistUnsigned64, type BinaryPlistLayout, -} from "./BinaryPlistLayout.js"; +} from "./binaryPlistLayout.js"; import { createPlistNumberCollector, type PlistNumberLiterals, -} from "../../domain/apple/plistNumbers.js"; -import { hasBinaryPlistSignature } from "../../domain/apple/appleArchiveFormat.js"; +} from "./plistNumbers.js"; +import { hasBinaryPlistSignature } from "./appleArchiveFormat.js"; export interface BinaryPlistScalarMetadata { readonly literals: PlistNumberLiterals; diff --git a/src/artifacts/apple/PropertyListDecodeBudget.ts b/src/domain/apple/propertyListDecodeBudget.ts similarity index 98% rename from src/artifacts/apple/PropertyListDecodeBudget.ts rename to src/domain/apple/propertyListDecodeBudget.ts index 53df121cce..e423253166 100644 --- a/src/artifacts/apple/PropertyListDecodeBudget.ts +++ b/src/domain/apple/propertyListDecodeBudget.ts @@ -1,23 +1,23 @@ import { readBinaryPlistLayout, readBinaryPlistUnsigned64, -} from "./BinaryPlistLayout.js"; -import { decodeXmlPlistText } from "../../domain/propertyListXmlText.js"; -import { hasBinaryPlistSignature } from "../../domain/apple/appleArchiveFormat.js"; -import { PlistNestingLimitError } from "../../domain/apple/plistValue.js"; +} from "./binaryPlistLayout.js"; +import { decodeXmlPlistText } from "../propertyListXmlText.js"; +import { hasBinaryPlistSignature } from "./appleArchiveFormat.js"; +import { PlistNestingLimitError } from "./plistValue.js"; import { decodeLimit, malformedInput, ParseFailureError, truncatedInput, unsupportedInput, -} from "../../domain/parseFailure.js"; +} from "../parseFailure.js"; import { binaryPlistCloneOffsetWidth, binaryDateRequiresExactSeconds, binaryPlistObjectEnd, binaryPlistUidNormalizationWidth, -} from "./PlistScalars.js"; +} from "./plistScalars.js"; /** Preflight the representation created by the pinned plist decoder. */ export const preflightPropertyListDecode = ( diff --git a/src/electron/ElectronFuseReader.ts b/src/electron/ElectronFuseReader.ts index 45ba6655e0..36123b04e9 100644 --- a/src/electron/ElectronFuseReader.ts +++ b/src/electron/ElectronFuseReader.ts @@ -7,13 +7,13 @@ import type { ResolvedElectronFuseFile } from "./ElectronFusePath.js"; import { createHash } from "node:crypto"; import { lstat, type FileHandle } from "node:fs/promises"; -import { readMachoImage } from "../artifacts/apple/MachoLoadCommandReader.js"; +import { readMachoImage } from "../domain/apple/machoLoadCommandReader.js"; import { readFileHandleRange } from "../filesystem/readFileHandleRange.js"; import { hasMachoMagic, readFatHeaderPrefix, } from "../domain/apple/machoContainer.js"; -import type { ReadAt } from "../artifacts/apple/MachoLoadCommandReader.js"; +import type { ReadAt } from "../domain/apple/machoLoadCommandReader.js"; import { electronFuseName, electronFuseState, diff --git a/src/kuna/KunaInventoryPlacement.ts b/src/kuna/KunaInventoryPlacement.ts index 1ef807a305..630943b2f9 100644 --- a/src/kuna/KunaInventoryPlacement.ts +++ b/src/kuna/KunaInventoryPlacement.ts @@ -1,4 +1,4 @@ -import { MAX_LOAD_COMMAND_BYTES } from "../artifacts/apple/MachoLoadCommandReader.js"; +import { MAX_LOAD_COMMAND_BYTES } from "../domain/apple/machoLoadCommandReader.js"; import { readMachoHeaderDeclarations, readMachoLoadCommandTableHeader, diff --git a/src/native/AppleMachoSelection.test.ts b/src/native/AppleMachoSelection.test.ts index ab50e51a47..ffd3cd8053 100644 --- a/src/native/AppleMachoSelection.test.ts +++ b/src/native/AppleMachoSelection.test.ts @@ -16,7 +16,7 @@ import { machoImage, machoImageWithUnknownCommand, } from "../artifacts/apple/MachoImage.fixture.js"; -import { readMachoImage } from "../artifacts/apple/MachoLoadCommandReader.js"; +import { readMachoImage } from "../domain/apple/machoLoadCommandReader.js"; import { readMachoImage as readMachoMetadataImage } from "./metadata/MachoImage.js"; import { BinaryFormatFailure } from "../domain/binaryContainer.js"; import { layoutFor, MachoSliceRefused } from "./AppleMachoSelection.fixture.js"; diff --git a/src/native/NativeMacOSProvider.ts b/src/native/NativeMacOSProvider.ts index f76127aabe..7ac7f669b3 100644 --- a/src/native/NativeMacOSProvider.ts +++ b/src/native/NativeMacOSProvider.ts @@ -28,7 +28,7 @@ import { type NativePlistSelection, resolveBundleResourcePlistSelection, } from "./NativePlistSource.js"; -import { readMachoEncryption } from "../artifacts/apple/MachoEncryptionReader.js"; +import { readMachoEncryption } from "../domain/apple/machoEncryptionReader.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { APPLE_DISPATCH_METADATA_ANALYSIS_PROFILE, @@ -171,7 +171,7 @@ import { } from "./NativeUiHelperRuntime.js"; import { NativeUiInterruptionControl } from "./NativeUiInterruptionControl.js"; import type { ResolvedAppBundleResourceRoot } from "../domain/apple/bundleResourceRoot.js"; -import { UnsupportedBinaryPlistUidError } from "../artifacts/apple/PlistScalars.js"; +import { UnsupportedBinaryPlistUidError } from "../domain/apple/plistScalars.js"; type SignatureRuntimeRootFactory = () => Promise< Pick diff --git a/src/native/apple/AppleIpsMachOJoin.ts b/src/native/apple/AppleIpsMachOJoin.ts index 2b5f9f3ddd..c9c6f1eeb3 100644 --- a/src/native/apple/AppleIpsMachOJoin.ts +++ b/src/native/apple/AppleIpsMachOJoin.ts @@ -1,5 +1,5 @@ import { LC } from "../../domain/apple/machoLoadCommandCodes.js"; -import { readMachoContainer } from "../../artifacts/apple/MachoLoadCommandReader.js"; +import { readMachoContainer } from "../../domain/apple/machoLoadCommandReader.js"; import { readUniversalMachoSlice } from "../../domain/apple/machoImageSelection.js"; import { readMachoLoadCommandTableHeader, diff --git a/src/native/apple/AppleIpsProvider.test.ts b/src/native/apple/AppleIpsProvider.test.ts index ab85f132b0..aafc1b04e6 100644 --- a/src/native/apple/AppleIpsProvider.test.ts +++ b/src/native/apple/AppleIpsProvider.test.ts @@ -2,7 +2,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it, vi } from "vitest"; -import * as machoReader from "../../artifacts/apple/MachoLoadCommandReader.js"; +import * as machoReader from "../../domain/apple/machoLoadCommandReader.js"; import { inspectAppleIpsInputSchema } from "../../domain/native/appleIps.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { appleIpsBytes } from "../../../tests/fixtures/binaryDiagnostics/appleIps.js"; diff --git a/src/native/hardening/MachoHardening.ts b/src/native/hardening/MachoHardening.ts index 3bef48869c..29531c2f94 100644 --- a/src/native/hardening/MachoHardening.ts +++ b/src/native/hardening/MachoHardening.ts @@ -35,7 +35,7 @@ import { } from "../../domain/native/binaryHardening.js"; import { assertArtifactReadActive } from "../../resources/index.js"; import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; -import { readMachoEncryption } from "../../artifacts/apple/MachoEncryptionReader.js"; +import { readMachoEncryption } from "../../domain/apple/machoEncryptionReader.js"; import { frameLoadCommands, readMachoContainer, @@ -43,7 +43,7 @@ import { type MachoLoadCommand, type MachoSliceHeader, type ReadAt, -} from "../../artifacts/apple/MachoLoadCommandReader.js"; +} from "../../domain/apple/machoLoadCommandReader.js"; const MH_EXECUTE = 0x2; const MH_DYLIB = 0x6; diff --git a/src/native/parsers/plist.invariant.test.ts b/src/native/parsers/plist.invariant.test.ts index 5c72dc12dc..c963565400 100644 --- a/src/native/parsers/plist.invariant.test.ts +++ b/src/native/parsers/plist.invariant.test.ts @@ -14,11 +14,11 @@ import { parsePlistBinary } from "./plist.js"; const decoder = vi.hoisted(() => ({ broken: false })); vi.mock( - "../../artifacts/apple/BinaryPlistMaterializer.js", + "../../domain/apple/binaryPlistMaterializer.js", async (importOriginal) => { const actual = await importOriginal< - typeof import("../../artifacts/apple/BinaryPlistMaterializer.js") + typeof import("../../domain/apple/binaryPlistMaterializer.js") >(); return { ...actual, diff --git a/src/native/parsers/plist.test.ts b/src/native/parsers/plist.test.ts index 87c73dbd1f..12d4478920 100644 --- a/src/native/parsers/plist.test.ts +++ b/src/native/parsers/plist.test.ts @@ -10,7 +10,7 @@ import { decodeBinaryPlistScalars, scanBinaryPlistScalars, UnsupportedBinaryPlistUidError, -} from "../../artifacts/apple/PlistScalars.js"; +} from "../../domain/apple/plistScalars.js"; import { plistDuplicateKeyLimitations } from "../../domain/apple/plistDuplicateKeys.js"; import { @@ -19,7 +19,7 @@ import { parsePlistXml, parsePlistXmlSource, } from "./plist.js"; -import { estimateBinaryPlistExpansion } from "../../artifacts/apple/PropertyListDecodeBudget.js"; +import { estimateBinaryPlistExpansion } from "../../domain/apple/propertyListDecodeBudget.js"; import { binaryPlistObjectTable, binaryPlistWithOverlappingDateAndData, diff --git a/src/native/parsers/plist.ts b/src/native/parsers/plist.ts index 5898ee5318..abf25c1ba0 100644 --- a/src/native/parsers/plist.ts +++ b/src/native/parsers/plist.ts @@ -1,4 +1,4 @@ -import { decodeBinaryPropertyList } from "../../artifacts/apple/BinaryPlistMaterializer.js"; +import { decodeBinaryPropertyList } from "../../domain/apple/binaryPlistMaterializer.js"; import { plistDuplicateKeyLimitations, type PlistDuplicateKeys, @@ -33,12 +33,12 @@ import { resolvePlistNumberSource, type PlistNumberLiterals, } from "../../domain/apple/plistNumbers.js"; -import { UnsupportedBinaryPlistUidError } from "../../artifacts/apple/PlistScalars.js"; +import { UnsupportedBinaryPlistUidError } from "../../domain/apple/plistScalars.js"; import { estimateBinaryPlistExpansion, isPlistDecodeBudgetFailure, preflightPropertyListDecode, -} from "../../artifacts/apple/PropertyListDecodeBudget.js"; +} from "../../domain/apple/propertyListDecodeBudget.js"; import { hasBinaryPlistSignature } from "../../domain/apple/appleArchiveFormat.js"; import { decodeXmlPlistText, diff --git a/tests/boundary/filesystem/appleXmlDeclarations.test.ts b/tests/boundary/filesystem/appleXmlDeclarations.test.ts index b829dcbb9e..8a562c7a06 100644 --- a/tests/boundary/filesystem/appleXmlDeclarations.test.ts +++ b/tests/boundary/filesystem/appleXmlDeclarations.test.ts @@ -18,7 +18,7 @@ const archive = build({ it("preflights repeated unterminated quoted declarations without suffix rescans", async () => { const preflightUrl = new URL( - "../../../dist/artifacts/apple/PropertyListDecodeBudget.js", + "../../../dist/domain/apple/propertyListDecodeBudget.js", import.meta.url, ).href; const { stdout } = await promisify(execFile)( diff --git a/tests/fixtures/binaryPlistScalarAlias.ts b/tests/fixtures/binaryPlistScalarAlias.ts index 9610cb592f..127d9b3f66 100644 --- a/tests/fixtures/binaryPlistScalarAlias.ts +++ b/tests/fixtures/binaryPlistScalarAlias.ts @@ -1,4 +1,4 @@ -import { scanBinaryPlistScalars } from "../../src/artifacts/apple/PlistScalars.js"; +import { scanBinaryPlistScalars } from "../../src/domain/apple/plistScalars.js"; import { readBinaryPlistObjectOffset, readBinaryPlistObjectTableLayout,