rea-agents 6.0.0 → 6.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +23 -17
- package/bridge/android/ReaJadxBridge.java +14 -5
- package/bridge/ghidra/ReaGhidraBridge.java +173 -47
- package/bridge/hopper_bridge.py +310 -128
- package/bridge/mitmproxy/capture.py +0 -2
- package/bridge/native/rea_lldb_tracer.py +630 -94
- package/bridge/process/ProcessRunTokenReader.swift +39 -5
- package/bridge/pwntools/recorded_crash_impl.py +4 -0
- package/dist/android/JadxConfiguration.js +196 -33
- package/dist/android/JadxMcpTransport.js +4 -0
- package/dist/android/JadxProtocol.js +6 -0
- package/dist/android/JadxProvider.js +19 -2
- package/dist/android/JadxSession.js +23 -4
- package/dist/application/AnalysisContextQueries.js +8 -35
- package/dist/application/AnalysisDocument.js +32 -0
- package/dist/application/AppBundleExecutable.js +67 -21
- package/dist/application/CallPathTracing.js +19 -3
- package/dist/application/CapabilityInventory.js +6 -3
- package/dist/application/ClientConfigurationDocument.js +871 -6
- package/dist/application/ClientRegistrationIdentity.js +26 -5
- package/dist/application/ClientRegistrationStatus.js +29 -14
- package/dist/application/DirectAnalysis.js +27 -37
- package/dist/application/Doctor.js +4 -2
- package/dist/application/DoctorScope.js +25 -13
- package/dist/application/EnhancedLiteralTracing.js +22 -25
- package/dist/application/EnhancedTools.js +13 -11
- package/dist/application/EvidenceBundleFiles.js +23 -11
- package/dist/application/FunctionAnalysisEvidence.js +2 -3
- package/dist/application/InventoryProjectionEvidence.js +4 -3
- package/dist/application/InvestigationProviders.js +3 -2
- package/dist/application/JsonFiles.js +50 -28
- package/dist/application/ProcedureAddressResolution.js +11 -0
- package/dist/application/ReconstructionCoverageService.js +7 -4
- package/dist/application/ReconstructionObligationLedgerService.js +4 -3
- package/dist/application/Setup.js +13 -1
- package/dist/application/SetupClientConfiguration.js +10 -15
- package/dist/application/SetupHost.js +5 -2
- package/dist/application/SetupPlan.js +5 -3
- package/dist/application/SupportedClients.js +34 -1
- package/dist/application/Uninstall.js +4 -3
- package/dist/application/Update.js +18 -3
- package/dist/application/UpdateRuntime.js +46 -25
- package/dist/application/WebModuleTraceService.js +4 -2
- package/dist/application/WebNetworkCaptureService.js +4 -2
- package/dist/application/WebRuntimeService.js +5 -3
- package/dist/application/WebScriptExportService.js +2 -2
- package/dist/application/WebSourceLocationService.js +4 -2
- package/dist/application/WorkflowEvidence.js +82 -0
- package/dist/application/binary/AnalysisProviderEvaluation.js +21 -5
- package/dist/application/binary/AnalysisProviderRegistry.js +2 -0
- package/dist/application/binary/AnalysisSnapshotCache.js +3 -6
- package/dist/application/binary/BinarySession.js +95 -68
- package/dist/application/binary/BinarySessionOpen.js +3 -3
- package/dist/application/binary/BinarySessionRecords.js +25 -3
- package/dist/application/binary/BinarySessionStatus.js +17 -1
- package/dist/application/binary/CompositeProvider.js +13 -0
- package/dist/application/binary/LazyAnalysisProvider.js +3 -0
- package/dist/application/binaryDiagnostics/BinaryLayoutService.js +4 -2
- package/dist/application/binaryDiagnostics/RecordedCrashService.js +4 -2
- package/dist/application/evm/EvmInterfaceService.js +4 -2
- package/dist/application/investigation/EvidenceLedger.js +21 -7
- package/dist/application/investigation/InvestigationRecords.js +8 -0
- package/dist/application/javascript/JavaScriptAnalysisControl.js +34 -0
- package/dist/application/javascript/JavaScriptApplicationEvidence.js +24 -3
- package/dist/application/javascript/JavaScriptApplicationEvidenceGraph.js +19 -2
- package/dist/application/javascript/JavaScriptApplicationService.js +22 -15
- package/dist/application/javascript/JavaScriptApplicationWorkflowService.js +5 -5
- package/dist/application/javascript/JavaScriptArtifactAnalysis.js +5 -4
- package/dist/application/javascript/JavaScriptArtifactGraphBuilder.js +39 -7
- package/dist/application/javascript/JavaScriptArtifactPathResolution.js +6 -3
- package/dist/application/javascript/JavaScriptArtifactReconstruction.js +11 -3
- package/dist/application/javascript/JavaScriptModuleRelationships.js +37 -8
- package/dist/application/javascript/JavaScriptRecoveryService.js +4 -2
- package/dist/application/javascript/JavaScriptRuntimeObservationService.js +3 -1
- package/dist/application/javascript/JavaScriptRuntimeReconciliationService.js +3 -3
- package/dist/application/javascript/JavaScriptSemanticGraphBuilder.js +63 -61
- package/dist/application/javascript/JavaScriptSemanticGraphValueProjection.js +23 -1
- package/dist/application/managed/ManagedApplicationGraphService.js +4 -3
- package/dist/application/managed/ManagedMemberComparisonService.js +7 -4
- package/dist/application/managed/ManagedNativeVerificationService.js +4 -3
- package/dist/application/managed/ManagedReconstructionService.js +4 -3
- package/dist/application/process/ProcessCli.js +14 -6
- package/dist/application/process/ProcessEvidence.js +4 -3
- package/dist/application/workflowInputError.js +18 -0
- package/dist/artifacts/ArtifactProvider.js +12 -2
- package/dist/artifacts/MachOSliceArtifactReader.js +98 -14
- package/dist/artifacts/NativeDmgArtifactReader.js +13 -6
- package/dist/artifacts/apple/AppleAssetCatalogAnalysis.js +22 -3
- package/dist/artifacts/apple/InterfaceBuilderAnalysis.js +176 -56
- package/dist/artifacts/apple/InterfaceBuilderDecodeBudget.js +195 -0
- package/dist/artifacts/apple/KeyedArchiveReader.js +36 -22
- package/dist/artifacts/apple/MachoLoadCommandReader.js +92 -31
- package/dist/artifacts/apple/NibArchive.js +81 -14
- package/dist/artifacts/apple/NibViewHierarchy.js +10 -3
- package/dist/artifacts/apple/PlistNumberLiterals.js +164 -0
- package/dist/artifacts/inventory/ArtifactGraphConstruction.js +13 -8
- package/dist/artifacts/inventory/scanCanonical.js +11 -14
- package/dist/artifacts/javascript/JavaScriptArtifactFiles.js +6 -2
- package/dist/browser/CdpCaptureCompleteness.js +2 -0
- package/dist/browser/CdpCaptureEventHandlers.js +76 -11
- package/dist/browser/CdpCaptureEventTypes.js +5 -1
- package/dist/browser/CdpCaptureEvents.js +25 -0
- package/dist/browser/CdpConnection.js +30 -11
- package/dist/browser/CdpOptionalCommand.js +2 -3
- package/dist/browser/CdpPageCapture.js +23 -1
- package/dist/browser/PlaywrightElectronActiveActions.js +32 -23
- package/dist/browser/PlaywrightElectronActiveProjection.js +141 -0
- package/dist/browser/PlaywrightElectronActiveProvider.js +123 -124
- package/dist/browser/WebSourceMapFetcher.js +426 -72
- package/dist/browser/assets/LocalWebScriptArtifacts.js +2 -2
- package/dist/browser/history/CaptureFailures.js +37 -1
- package/dist/browser/history/CaptureRelease.js +5 -0
- package/dist/browser/history/HarCaptureAdapter.js +3 -3
- package/dist/browser/history/HarJson.js +3 -2
- package/dist/browser/history/HistoricalCaptureDecoder.js +4 -2
- package/dist/cli/analysisSelector.js +23 -0
- package/dist/cli/applicationCommands.js +2 -3
- package/dist/cli/coreBinaryCommands.js +70 -12
- package/dist/cli/electronCommands.js +7 -6
- package/dist/cli/javascriptApplicationAnalysis.js +7 -3
- package/dist/cli/jsonOutput.js +4 -99
- package/dist/cli/nativeCallCommands.js +2 -3
- package/dist/cli/webRuntimeCommands.js +8 -8
- package/dist/cli.js +2 -1
- package/dist/cliCommandNames.js +0 -1
- package/dist/cliJsonInput.js +9 -4
- package/dist/config/environment.js +4 -0
- package/dist/config/ghidraStartupTimeout.js +17 -0
- package/dist/config/mcpResponseBudget.js +22 -0
- package/dist/config/parseConfig.js +2 -1
- package/dist/contracts/enhancedInputs.js +5 -3
- package/dist/contracts/enhancedToolContracts.js +3 -3
- package/dist/contracts/hopperMemoryContracts.js +2 -5
- package/dist/contracts/javascript/electronToolContracts.js +1 -1
- package/dist/contracts/managed/managedToolContracts.js +2 -4
- package/dist/contracts/native/nativeToolContracts.js +4 -2
- package/dist/contracts/officialToolContracts.js +14 -15
- package/dist/contracts/promptContracts.js +3 -3
- package/dist/contracts/sessionLifecycleInputs.js +3 -7
- package/dist/contracts/sessionStatusContract.js +2 -4
- package/dist/contracts/sessionToolContracts.js +4 -6
- package/dist/contracts/sessionToolSchemas.js +2 -5
- package/dist/contracts/toolContractExamples.js +0 -1
- package/dist/contracts/toolContractHelpers.js +4 -1
- package/dist/contracts/toolEffects.js +0 -1
- package/dist/contracts/toolOutputSchemaGroups.js +28 -27
- package/dist/contracts/toolOutputSchemaPrimitives.js +18 -0
- package/dist/contracts/toolSchemaMetadata.js +69 -10
- package/dist/contracts/webNetworkCaptureToolContracts.js +1 -1
- package/dist/domain/analysisErrorBase.js +8 -3
- package/dist/domain/analysisErrorCore.js +3 -1
- package/dist/domain/analysisErrorPresentation.js +72 -17
- package/dist/domain/analysisErrorProjection.js +106 -27
- package/dist/domain/android/androidAnalysis.js +2 -4
- package/dist/domain/android/androidApplication.js +17 -9
- package/dist/domain/apple/appleApplication.js +41 -14
- package/dist/domain/apple/dyldEnvironment.js +73 -0
- package/dist/domain/apple/dylibResolution.js +120 -9
- package/dist/domain/apple/dylibResolutionFindings.js +9 -7
- package/dist/domain/apple/interfaceBuilderGraph.js +25 -13
- package/dist/domain/apple/interfaceBuilderKeyedArchive.js +13 -3
- package/dist/domain/apple/keyedArchive.js +9 -1
- package/dist/domain/apple/machoContainer.js +54 -0
- package/dist/domain/apple/plistNumbers.js +76 -0
- package/dist/domain/artifactIdentity.js +29 -0
- package/dist/domain/artifactInventoryEvidence.js +19 -24
- package/dist/domain/bridgeCandidateProjection.js +71 -0
- package/dist/domain/browserCompleteness.js +1 -0
- package/dist/domain/browserObservationError.js +24 -5
- package/dist/domain/browserScenarioValues.js +2 -6
- package/dist/domain/bundleComparison.js +3 -2
- package/dist/domain/canonicalJsonDigestSteps.js +133 -0
- package/dist/domain/canonicalOrdering.js +9 -5
- package/dist/domain/changedBehavior.js +6 -6
- package/dist/domain/comparisonSourceEvidence.js +40 -0
- package/dist/domain/configurationErrors.js +1 -1
- package/dist/domain/evidence.js +64 -9
- package/dist/domain/evidenceBundle.js +42 -1
- package/dist/domain/evidenceErrors.js +12 -1
- package/dist/domain/explicitSensitiveFailure.js +17 -1
- package/dist/domain/firmware/firmwareAnalysis.js +6 -7
- package/dist/domain/hopperErrors.js +23 -2
- package/dist/domain/hopperValues.js +51 -8
- package/dist/domain/immutableJson.js +114 -0
- package/dist/domain/inputIssueProjection.js +3 -0
- package/dist/domain/javascript/electronActiveObservation.js +30 -4
- package/dist/domain/javascript/electronStaticAnalysisValues.js +6 -12
- package/dist/domain/javascript/javascriptApplicationAnalysis.js +71 -23
- package/dist/domain/javascript/javascriptApplicationGraph.js +13 -0
- package/dist/domain/javascript/javascriptAstValues.js +20 -0
- package/dist/domain/javascript/javascriptRecovery.js +3 -8
- package/dist/domain/javascript/javascriptSemanticAnalysis.js +97 -2
- package/dist/domain/javascript/javascriptSemanticCoverage.js +6 -5
- package/dist/domain/javascript/javascriptSemanticDataEffectHelpers.js +9 -17
- package/dist/domain/javascript/javascriptSemanticDataEffects.js +22 -5
- package/dist/domain/javascript/javascriptSemanticGraph.js +13 -0
- package/dist/domain/javascript/javascriptSemanticGraphSchemas.js +1 -0
- package/dist/domain/javascript/javascriptSemanticPrimitives.js +25 -17
- package/dist/domain/javascript/javascriptSemanticQuerySchemas.js +8 -4
- package/dist/domain/javascript/javascriptSemanticResourceLimits.js +77 -0
- package/dist/domain/javascript/javascriptSemanticValues.js +83 -11
- package/dist/domain/javascript/javascriptSourceParser.js +6 -2
- package/dist/domain/javascript/javascriptStaticAnalysis.js +22 -17
- package/dist/domain/javascript/javascriptStaticAnalysisBundler.js +5 -3
- package/dist/domain/javascript/javascriptStaticAnalysisCalls.js +14 -4
- package/dist/domain/javascript/javascriptStaticAnalysisFindings.js +66 -7
- package/dist/domain/javascript/javascriptStaticAnalysisHelpers.js +28 -16
- package/dist/domain/javascript/javascriptStaticAnalysisState.js +3 -2
- package/dist/domain/jsonSerialization.js +109 -0
- package/dist/domain/jsonValue.js +90 -6
- package/dist/domain/localPath.js +6 -0
- package/dist/domain/managed/managedApplicationGraph.js +10 -10
- package/dist/domain/managed/managedInspectionEvidence.js +16 -0
- package/dist/domain/managed/managedMemberComparisonMatch.js +5 -9
- package/dist/domain/managed/managedNativeVerification.js +3 -9
- package/dist/domain/native/fileOffsetPartialObservation.js +1 -0
- package/dist/domain/native/nativeCallObservation.js +33 -11
- package/dist/domain/native/nativeCallPartialObservation.js +33 -0
- package/dist/domain/process/processCapture.js +8 -4
- package/dist/domain/process/processComparison.js +38 -4
- package/dist/domain/process/processScenario.js +11 -10
- package/dist/domain/propertyListKeys.js +1 -1
- package/dist/domain/propertyListXmlText.js +19 -0
- package/dist/domain/providerAdapterError.js +1 -1
- package/dist/domain/providerOperationHealth.js +54 -0
- package/dist/domain/reconstructionVerification.js +6 -43
- package/dist/domain/reconstructionVerificationSchemas.js +2 -2
- package/dist/domain/staticRuntimeCorrelation.js +6 -43
- package/dist/domain/webBundleAnalysis.js +20 -8
- package/dist/domain/webBundleAnalyzerInspection.js +13 -8
- package/dist/domain/webBundleAnalyzerResult.js +41 -2
- package/dist/domain/webRuntime.js +19 -5
- package/dist/domain/webSourceLocation.js +1 -0
- package/dist/firmware/FirmwareFiles.js +1 -1
- package/dist/generatedPackageMetadata.js +1 -1
- package/dist/ghidra/GhidraAnalysisProfile.js +5 -0
- package/dist/ghidra/GhidraClient.js +47 -14
- package/dist/ghidra/GhidraDiagnostics.js +7 -7
- package/dist/ghidra/GhidraFunctionValues.js +10 -7
- package/dist/ghidra/GhidraInstallation.js +18 -21
- package/dist/ghidra/GhidraInventoryValues.js +14 -4
- package/dist/ghidra/GhidraJavaLaunch.js +62 -0
- package/dist/ghidra/GhidraLauncher.js +33 -16
- package/dist/ghidra/GhidraProviderCapabilities.js +14 -2
- package/dist/ghidra/GhidraProviderClient.js +23 -12
- package/dist/ghidra/GhidraSessionError.js +11 -7
- package/dist/ghidra/GhidraTargetSnapshot.js +47 -12
- package/dist/ghidra/GhidraTransport.js +20 -0
- package/dist/hopper/BridgeLauncher.js +31 -11
- package/dist/hopper/HopperAnalysisProfile.js +62 -4
- package/dist/hopper/HopperCleanup.js +15 -3
- package/dist/hopper/HopperClient.js +222 -14
- package/dist/hopper/HopperFileOffset.js +237 -0
- package/dist/hopper/HopperMachOImage.js +196 -0
- package/dist/hopper/HopperOperationStage.js +6 -0
- package/dist/hopper/HopperProvider.js +63 -9
- package/dist/hopper/HopperProviderCapabilities.js +19 -1
- package/dist/hopper/HopperRegexSearch.js +137 -0
- package/dist/hopper/HopperRegexWorker.js +27 -0
- package/dist/hopper/HopperRequestQueue.js +68 -19
- package/dist/hopper/HopperTargetLease.js +3 -2
- package/dist/inspector/JavaScriptRuntimeScope.js +9 -1
- package/dist/inspector/V8InspectorCaptureProjection.js +8 -3
- package/dist/inspector/V8InspectorProvider.js +47 -11
- package/dist/javascript/sourceMaps/DecodedSourceMap.js +47 -0
- package/dist/javascript/sourceMaps/SourceMapCommand.js +16 -0
- package/dist/javascript/sourceMaps/SourceMapFormat.js +79 -31
- package/dist/javascript/sourceMaps/TraceSourceMap.js +14 -28
- package/dist/mcpDoctor.js +62 -2
- package/dist/native/AppleDispatchCoverage.js +47 -6
- package/dist/native/AppleDispatchDecodeFacts.js +6 -0
- package/dist/native/AppleDispatchMetadata.js +6 -3
- package/dist/native/AppleMachoFixups.js +48 -24
- package/dist/native/AppleMachoSelection.js +32 -16
- package/dist/native/AppleObjcCategories.js +6 -2
- package/dist/native/AppleObjcDispatchFacets.js +5 -2
- package/dist/native/AppleObjcProperties.js +2 -1
- package/dist/native/AppleSwiftDispatchFacets.js +27 -21
- package/dist/native/AppleSwiftVtables.js +21 -15
- package/dist/native/CommandRunner.js +81 -84
- package/dist/native/LldbCallTracer.js +365 -102
- package/dist/native/LldbRetainedObservations.js +178 -0
- package/dist/native/NativeCallObservation.js +62 -3
- package/dist/native/NativeMacOSProvider.js +98 -17
- package/dist/native/SignatureTargetBinding.js +155 -0
- package/dist/native/parsers/lipo.js +71 -1
- package/dist/native/pwndbg/PwndbgCoreContext.js +25 -5
- package/dist/native/pwntools/RecordedCrashStructureBindings.js +2 -0
- package/dist/process/DarwinProcessRunTokenReader.js +8 -9
- package/dist/process/ExecFileOutput.js +20 -0
- package/dist/process/OwnedCommand.js +7 -2
- package/dist/process/ProcessOwnership.js +203 -53
- package/dist/process/ProcessOwnershipObservation.js +49 -4
- package/dist/process/ProviderProcess.js +38 -7
- package/dist/process/capture/ProcessCaptureError.js +2 -2
- package/dist/process/capture/ProcessCaptureLifecycle.js +100 -34
- package/dist/server/EvidenceMcpServer.js +146 -0
- package/dist/server/createServer.js +15 -8
- package/dist/server/registerAndroidTools.js +2 -4
- package/dist/server/registerApplicationTools/helpers.js +2 -4
- package/dist/server/registerArtifactComparisonTool.js +11 -7
- package/dist/server/registerBinaryDiagnosticsTools.js +2 -4
- package/dist/server/registerBrowserScenarioTool.js +2 -4
- package/dist/server/registerBrowserTools.js +2 -4
- package/dist/server/registerBundleComparisonTool.js +2 -3
- package/dist/server/registerCloseLifecycleTool.js +8 -18
- package/dist/server/registerElectronTools.js +2 -4
- package/dist/server/registerEnhancedTools.js +18 -59
- package/dist/server/registerEvidenceTools.js +2 -4
- package/dist/server/registerEvmTools.js +2 -4
- package/dist/server/registerFirmwareTools.js +2 -4
- package/dist/server/registerFunctionComparisonTool.js +10 -6
- package/dist/server/registerInvestigationTools.js +7 -7
- package/dist/server/registerJavaScriptRecoveryTool.js +2 -4
- package/dist/server/registerJavaScriptRuntimeObservationTools.js +2 -4
- package/dist/server/registerManagedWorkflowTools/compareManagedMembers.js +2 -4
- package/dist/server/registerManagedWorkflowTools/importManagedReconstruction.js +2 -4
- package/dist/server/registerManagedWorkflowTools/projectManagedApplicationGraph.js +2 -4
- package/dist/server/registerManagedWorkflowTools/verifyManagedNativeBoundaries.js +2 -4
- package/dist/server/registerOfficialTools.js +2 -4
- package/dist/server/registerProcessComparisonTool.js +71 -45
- package/dist/server/registerRecordedCrashTools.js +2 -4
- package/dist/server/registerSessionRecordTools.js +5 -6
- package/dist/server/registerSessionStatusTool.js +17 -3
- package/dist/server/registerSessionTools.js +11 -3
- package/dist/server/registerWebModuleTool.js +2 -4
- package/dist/server/registerWebNetworkCaptureTool.js +2 -4
- package/dist/server/registerWebRuntimeTools.js +3 -7
- package/dist/server/registerWebScriptTool.js +2 -4
- package/dist/server/registerWebSourceLocationTool.js +2 -4
- package/dist/server/runDerivedOperation.js +15 -3
- package/dist/server/sessionAvailabilityPolicy.js +0 -1
- package/dist/server/toolRegistrationOptions.js +2 -2
- package/dist/server/toolResult.js +62 -10
- package/dist/server/toolResultEncoding.js +33 -0
- package/install.sh +1 -1
- package/native/windows/build/manifest.json +1 -1
- package/package.json +8 -3
- package/scripts/electron-active-hook-boundaries.cjs +18 -20
- package/scripts/electron-active-hook.cjs +241 -37
- package/skills/reverse-engineer-anything/SKILL.md +11 -3
- package/skills/reverse-engineer-anything/references/javascript-applications.md +8 -1
- package/dist/ghidra/GhidraDefaults.js +0 -2
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { createReadStream } from "node:fs";
|
|
2
|
-
import { stat } from "node:fs/promises";
|
|
2
|
+
import { open as openFile, stat } from "node:fs/promises";
|
|
3
3
|
import { Readable } from "node:stream";
|
|
4
4
|
import { XcrunCommandRunner, } from "../native/CommandRunner.js";
|
|
5
|
-
import { parseLipoArchitectures } from "../native/parsers/lipo.js";
|
|
5
|
+
import { parseLipoArchitectures, } from "../native/parsers/lipo.js";
|
|
6
|
+
import { readMachoImage } from "./apple/MachoLoadCommandReader.js";
|
|
6
7
|
import { ArtifactReaderFailure, } from "./ArtifactReader.js";
|
|
7
8
|
import { streamChunkToBuffer } from "./StreamBytes.js";
|
|
8
9
|
/** Read-only universal Mach-O slice reader backed by native lipo metadata. */
|
|
@@ -28,28 +29,75 @@ export class MachOSliceArtifactReader {
|
|
|
28
29
|
effects: ["read"],
|
|
29
30
|
};
|
|
30
31
|
const fileSize = (await stat(this.path)).size;
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
const architectures = parseLipoArchitectures(captured.value.stdout);
|
|
33
|
+
const structural = await readStructuralSlices(this.path, fileSize);
|
|
34
|
+
if (structural.status === "malformed")
|
|
35
|
+
throw new ArtifactReaderFailure("integrity", `Mach-O structural slice index is malformed: ${structural.reason}`);
|
|
36
|
+
if (structural.status === "unsupported")
|
|
37
|
+
throw new ArtifactReaderFailure("format", `Mach-O structural slice index is unsupported: ${structural.reason}`);
|
|
38
|
+
const slices = structural.status === "parsed" ? structural.slices : null;
|
|
39
|
+
const matchingSlices = new Map();
|
|
40
|
+
if (slices !== null) {
|
|
41
|
+
if (slices.length !== architectures.length)
|
|
42
|
+
throw new ArtifactReaderFailure("integrity", "lipo architecture count disagrees with the Mach-O FAT table");
|
|
43
|
+
const unmatched = [...slices];
|
|
44
|
+
for (const reported of architectures) {
|
|
45
|
+
const match = unmatched.findIndex((observed) => lipoMatchesSlice(reported, observed, slices.length === 1));
|
|
46
|
+
if (match < 0)
|
|
47
|
+
throw new ArtifactReaderFailure("integrity", `lipo slice metadata disagrees with the Mach-O FAT table: ${reported.name} (cputype=${reported.cpu_type ?? "unknown"}, cpusubtype=${reported.cpu_subtype ?? "unknown"}, offset=${reported.file_offset ?? "unknown"}, size=${reported.size ?? "unknown"}, alignment=${reported.alignment ?? "unknown"})`);
|
|
48
|
+
const [observed] = unmatched.splice(match, 1);
|
|
49
|
+
if (observed !== undefined)
|
|
50
|
+
matchingSlices.set(reported, observed);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
for (const architecture of architectures) {
|
|
54
|
+
const structuralSlice = matchingSlices.get(architecture);
|
|
55
|
+
const offset = architecture.file_offset ?? structuralSlice?.slice_offset;
|
|
56
|
+
const sliceSize = architecture.size ?? structuralSlice?.slice_size;
|
|
57
|
+
if (offset === undefined || sliceSize === undefined)
|
|
33
58
|
throw new ArtifactReaderFailure("integrity", "lipo omitted a universal slice byte range");
|
|
34
|
-
if (!Number.isSafeInteger(
|
|
35
|
-
!Number.isSafeInteger(
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
!Number.isSafeInteger(
|
|
39
|
-
|
|
59
|
+
if (!Number.isSafeInteger(offset) ||
|
|
60
|
+
!Number.isSafeInteger(sliceSize) ||
|
|
61
|
+
offset < 0 ||
|
|
62
|
+
sliceSize <= 0 ||
|
|
63
|
+
!Number.isSafeInteger(offset + sliceSize) ||
|
|
64
|
+
offset + sliceSize > fileSize)
|
|
40
65
|
throw new ArtifactReaderFailure("integrity", `lipo reported an out-of-bounds Mach-O slice: ${architecture.name}`);
|
|
41
66
|
yield {
|
|
42
67
|
path: `slices/${architecture.name}`,
|
|
43
68
|
kind: "slice",
|
|
44
|
-
declaredSize:
|
|
69
|
+
declaredSize: sliceSize,
|
|
45
70
|
compressedSize: null,
|
|
46
71
|
executable: true,
|
|
47
72
|
encrypted: false,
|
|
48
|
-
byteOffset:
|
|
73
|
+
byteOffset: offset,
|
|
49
74
|
declaredSha256: null,
|
|
50
75
|
unpacked: false,
|
|
51
|
-
limitations: [
|
|
52
|
-
|
|
76
|
+
limitations: [
|
|
77
|
+
...(structural.status === "not-mach-o"
|
|
78
|
+
? [
|
|
79
|
+
"Structural Mach-O facts were unavailable; slice range is based on lipo output.",
|
|
80
|
+
]
|
|
81
|
+
: []),
|
|
82
|
+
...(architecture.file_offset === null || architecture.size === null
|
|
83
|
+
? [
|
|
84
|
+
"Slice range was derived from structural Mach-O facts because lipo omitted it.",
|
|
85
|
+
]
|
|
86
|
+
: []),
|
|
87
|
+
...(architecture.cpu_type !== null &&
|
|
88
|
+
architecture.cpu_type_code === null
|
|
89
|
+
? [
|
|
90
|
+
`lipo CPU type is retained as unnormalized source text: ${architecture.cpu_type}`,
|
|
91
|
+
]
|
|
92
|
+
: []),
|
|
93
|
+
...(architecture.cpu_subtype !== null &&
|
|
94
|
+
architecture.cpu_subtype_code === null
|
|
95
|
+
? [
|
|
96
|
+
`lipo CPU subtype is retained as unnormalized source text: ${architecture.cpu_subtype}${architecture.capabilities === null ? "" : `; capabilities ${architecture.capabilities}`}`,
|
|
97
|
+
]
|
|
98
|
+
: []),
|
|
99
|
+
],
|
|
100
|
+
adapterKey: `${String(offset)}:${String(sliceSize)}`,
|
|
53
101
|
};
|
|
54
102
|
}
|
|
55
103
|
}
|
|
@@ -103,6 +151,42 @@ export class MachOSliceArtifactReader {
|
|
|
103
151
|
return Promise.resolve();
|
|
104
152
|
}
|
|
105
153
|
}
|
|
154
|
+
/** Compare lipo's independent ranges with structurally parsed slice identity. */
|
|
155
|
+
const readStructuralSlices = async (path, size) => {
|
|
156
|
+
const file = await openFile(path, "r");
|
|
157
|
+
try {
|
|
158
|
+
const readAt = async (offset, length) => {
|
|
159
|
+
const bytes = Buffer.alloc(length);
|
|
160
|
+
const { bytesRead } = await file.read(bytes, 0, length, offset);
|
|
161
|
+
return bytes.subarray(0, bytesRead);
|
|
162
|
+
};
|
|
163
|
+
const facts = await readMachoImage(readAt, size);
|
|
164
|
+
return facts;
|
|
165
|
+
}
|
|
166
|
+
finally {
|
|
167
|
+
await file.close();
|
|
168
|
+
}
|
|
169
|
+
};
|
|
170
|
+
const lipoMatchesSlice = (reported, observed, structurallyUnique) => {
|
|
171
|
+
const observedCpuType = observed.fat_cpu_type ?? observed.cpu_type;
|
|
172
|
+
const observedCpuSubtype = observed.fat_cpu_subtype ?? observed.cpu_subtype;
|
|
173
|
+
const hasPhysicalIdentity = reported.file_offset !== null ||
|
|
174
|
+
reported.size !== null ||
|
|
175
|
+
reported.cpu_type_code !== null ||
|
|
176
|
+
reported.cpu_subtype_code !== null;
|
|
177
|
+
return ((hasPhysicalIdentity || structurallyUnique) &&
|
|
178
|
+
reported.name === observed.architecture &&
|
|
179
|
+
(reported.file_offset === null ||
|
|
180
|
+
reported.file_offset === observed.slice_offset) &&
|
|
181
|
+
(reported.size === null || reported.size === observed.slice_size) &&
|
|
182
|
+
(reported.cpu_type_code === null ||
|
|
183
|
+
reported.cpu_type_code === observedCpuType) &&
|
|
184
|
+
(reported.cpu_subtype_code === null ||
|
|
185
|
+
reported.cpu_subtype_code === observedCpuSubtype) &&
|
|
186
|
+
(reported.alignment === null ||
|
|
187
|
+
observed.fat_alignment_exponent === null ||
|
|
188
|
+
reported.alignment === 2 ** observed.fat_alignment_exponent));
|
|
189
|
+
};
|
|
106
190
|
const parseSliceKeyInteger = (value) => {
|
|
107
191
|
if (value === undefined || !/^\d+$/u.test(value))
|
|
108
192
|
return null;
|
|
@@ -80,6 +80,7 @@ export class NativeDmgArtifactReader {
|
|
|
80
80
|
}
|
|
81
81
|
async close() {
|
|
82
82
|
let detachFailure;
|
|
83
|
+
const remainingDevices = [];
|
|
83
84
|
for (const device of [...this.#devices].reverse()) {
|
|
84
85
|
try {
|
|
85
86
|
await runChecked(this.host, ["detach", device], undefined, {
|
|
@@ -91,17 +92,22 @@ export class NativeDmgArtifactReader {
|
|
|
91
92
|
// Detaching a synthesized APFS container also ejects the image that
|
|
92
93
|
// backs it, so a later whole disk of the same image may already be
|
|
93
94
|
// gone. Only a device that is still attached is a cleanup failure.
|
|
94
|
-
if (await this.#isAttached(device))
|
|
95
|
+
if (await this.#isAttached(device)) {
|
|
96
|
+
remainingDevices.push(device);
|
|
95
97
|
detachFailure ??= cause;
|
|
98
|
+
}
|
|
96
99
|
}
|
|
97
100
|
}
|
|
98
|
-
this.#devices =
|
|
99
|
-
if (this.#mountRoot !== undefined)
|
|
100
|
-
await rm(this.#mountRoot, { recursive: true, force: true }).
|
|
101
|
+
this.#devices = remainingDevices.reverse();
|
|
102
|
+
if (this.#devices.length === 0 && this.#mountRoot !== undefined)
|
|
103
|
+
await rm(this.#mountRoot, { recursive: true, force: true }).then(() => {
|
|
104
|
+
this.#mountRoot = undefined;
|
|
105
|
+
this.#directory = undefined;
|
|
106
|
+
}, (cause) => {
|
|
101
107
|
detachFailure ??= cause;
|
|
102
108
|
});
|
|
103
109
|
if (detachFailure !== undefined)
|
|
104
|
-
throw new ArtifactReaderFailure("unavailable",
|
|
110
|
+
throw new ArtifactReaderFailure("unavailable", `DMG detach or mount-root cleanup failed for ${JSON.stringify(this.path)}: ${failureMessage(detachFailure)}`, { cause: detachFailure });
|
|
105
111
|
}
|
|
106
112
|
/**
|
|
107
113
|
* Report whether hdiutil still lists a device; unknown state counts as
|
|
@@ -169,11 +175,12 @@ export class NativeDmgArtifactReader {
|
|
|
169
175
|
cleanupFailure = cleanupCause;
|
|
170
176
|
}
|
|
171
177
|
if (cleanupFailure !== undefined)
|
|
172
|
-
throw new ArtifactReaderFailure("unavailable",
|
|
178
|
+
throw new ArtifactReaderFailure("unavailable", `DMG attach failed and cleanup could not detach every device: ${failureMessage(cause)}; cleanup: ${failureMessage(cleanupFailure)}`, { cause: new AggregateError([cause, cleanupFailure]) });
|
|
173
179
|
throw cause;
|
|
174
180
|
}
|
|
175
181
|
}
|
|
176
182
|
}
|
|
183
|
+
const failureMessage = (cause) => cause instanceof Error ? cause.message : String(cause);
|
|
177
184
|
const runChecked = async (host, arguments_, signal, options) => {
|
|
178
185
|
let result;
|
|
179
186
|
try {
|
|
@@ -26,11 +26,16 @@ export const analyzeAppleAssetCatalogs = async (input) => {
|
|
|
26
26
|
const page = appleAssetCatalogInputSchema.parse(input.page ?? {});
|
|
27
27
|
const reader = new DirectoryArtifactReader(input.bundlePath);
|
|
28
28
|
const catalogs = [];
|
|
29
|
+
const uninspected = [];
|
|
29
30
|
let totalMetadataBytes = 0;
|
|
30
31
|
try {
|
|
31
32
|
for await (const entry of reader.entries(input.signal)) {
|
|
32
|
-
if (
|
|
33
|
+
if (!entry.path.endsWith("Assets.car"))
|
|
33
34
|
continue;
|
|
35
|
+
if (entry.kind !== "file") {
|
|
36
|
+
uninspected.push(`${entry.path} (${entry.kind})`);
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
34
39
|
const inspected = await inspectAssetCatalogEntry({
|
|
35
40
|
reader,
|
|
36
41
|
entry,
|
|
@@ -46,8 +51,10 @@ export const analyzeAppleAssetCatalogs = async (input) => {
|
|
|
46
51
|
finally {
|
|
47
52
|
await reader.close();
|
|
48
53
|
}
|
|
49
|
-
|
|
50
|
-
|
|
54
|
+
// Without any readable catalog, unmatched resource keys would overstate an
|
|
55
|
+
// absence that a skipped catalog entry may contradict.
|
|
56
|
+
if (catalogs.length === 0 && uninspected.length > 0)
|
|
57
|
+
throw new ArtifactReaderFailure("path", `Asset catalog entries are not regular files and were not inspected: ${uninspected.join(", ")}`);
|
|
51
58
|
const interfaceBuilder = await analyzeInterfaceBuilderBundle({
|
|
52
59
|
bundlePath: input.bundlePath,
|
|
53
60
|
targetSha256: input.targetSha256,
|
|
@@ -65,6 +72,18 @@ export const analyzeAppleAssetCatalogs = async (input) => {
|
|
|
65
72
|
...result,
|
|
66
73
|
limitations: [
|
|
67
74
|
...result.limitations,
|
|
75
|
+
// An app without a compiled catalog is an observed empty inventory, not
|
|
76
|
+
// a missing host tool.
|
|
77
|
+
...(catalogs.length === 0
|
|
78
|
+
? [
|
|
79
|
+
"No compiled Assets.car catalog was found among the app bundle's regular files (symlinks are not followed); any resource keys are reported as unmatched.",
|
|
80
|
+
]
|
|
81
|
+
: []),
|
|
82
|
+
...(uninspected.length === 0
|
|
83
|
+
? []
|
|
84
|
+
: [
|
|
85
|
+
`Asset catalog entries that are not regular files were not inspected, so resource keys reported as unmatched may resolve there: ${uninspected.join(", ")}`,
|
|
86
|
+
]),
|
|
68
87
|
"Exact resource-key joins use only recognized image or asset key fields on decoded Interface Builder resource objects; other archive resource references are not inferred.",
|
|
69
88
|
...(interfaceBuilder.graph.truncated
|
|
70
89
|
? [
|
|
@@ -4,36 +4,72 @@ import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js";
|
|
|
4
4
|
import { projectPlistValue } from "../../domain/apple/plistValue.js";
|
|
5
5
|
import { omittedPrototypeKeysLimitation, parseXmlPropertyList, } from "../../domain/propertyListKeys.js";
|
|
6
6
|
import { decodeNibArchive } from "./NibArchive.js";
|
|
7
|
+
import { estimatePropertyListDecodeBytes, InterfaceBuilderDecodeBudget, InterfaceBuilderDecodeBudgetExceeded, } from "./InterfaceBuilderDecodeBudget.js";
|
|
7
8
|
import { buildInterfaceBuilderAnalysis, interfaceBuilderLimitsSchema, } from "../../domain/apple/interfaceBuilderGraph.js";
|
|
8
9
|
import { mergeNibHierarchies, projectNibViewHierarchy, } from "./NibViewHierarchy.js";
|
|
9
10
|
import { jsonValueSchema } from "../../domain/jsonValue.js";
|
|
10
|
-
|
|
11
|
+
import { decodeXmlPlistText } from "../../domain/propertyListXmlText.js";
|
|
12
|
+
const MAX_AGGREGATE_INPUT_BYTES = 32 * 1024 * 1024;
|
|
13
|
+
const MAX_AGGREGATE_DECODE_BYTES = 256 * 1024 * 1024;
|
|
14
|
+
const MAX_REPORTED_OMITTED_ARCHIVES = 64;
|
|
11
15
|
/** Decode compiled Interface Builder archives from a local app bundle. */
|
|
12
16
|
export const analyzeInterfaceBuilderBundle = async (input) => {
|
|
13
17
|
const limits = interfaceBuilderLimitsSchema.parse(input.limits ?? {});
|
|
14
18
|
const reader = new DirectoryArtifactReader(input.bundlePath);
|
|
15
19
|
const documents = [];
|
|
16
20
|
const invalid = [];
|
|
21
|
+
const omittedArchives = [];
|
|
22
|
+
let unreportedOmittedArchives = 0;
|
|
17
23
|
const incompleteHierarchies = new Map();
|
|
18
24
|
const prototypeKeyOmissions = new Map();
|
|
19
25
|
let omitted = 0;
|
|
20
26
|
let attempted = 0;
|
|
27
|
+
let candidates = 0;
|
|
28
|
+
let aggregateInputBytes = 0;
|
|
29
|
+
const decodeBudget = new InterfaceBuilderDecodeBudget(MAX_AGGREGATE_DECODE_BYTES);
|
|
30
|
+
const recordOmittedArchive = (path, reason) => {
|
|
31
|
+
if (omittedArchives.length < MAX_REPORTED_OMITTED_ARCHIVES)
|
|
32
|
+
omittedArchives.push({ path, reason });
|
|
33
|
+
else
|
|
34
|
+
unreportedOmittedArchives += 1;
|
|
35
|
+
};
|
|
21
36
|
try {
|
|
22
37
|
for await (const entry of reader.entries(input.signal)) {
|
|
23
38
|
if (entry.kind !== "file" || !isInterfaceBuilderArchive(entry.path))
|
|
24
39
|
continue;
|
|
25
|
-
|
|
40
|
+
candidates += 1;
|
|
41
|
+
if (candidates > limits.max_documents) {
|
|
26
42
|
omitted += 1;
|
|
43
|
+
recordOmittedArchive(entry.path, "max_documents");
|
|
27
44
|
continue;
|
|
28
45
|
}
|
|
29
|
-
attempted += 1;
|
|
30
46
|
try {
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
47
|
+
const remainingInputBytes = MAX_AGGREGATE_INPUT_BYTES - aggregateInputBytes;
|
|
48
|
+
if (entry.declaredSize !== null &&
|
|
49
|
+
entry.declaredSize > remainingInputBytes) {
|
|
50
|
+
omitted += 1;
|
|
51
|
+
recordOmittedArchive(entry.path, "aggregate_decode_budget_exhausted");
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
attempted += 1;
|
|
55
|
+
const bytes = await readEntry(reader, entry, input.signal, remainingInputBytes);
|
|
56
|
+
aggregateInputBytes += bytes.length;
|
|
57
|
+
const isNibArchive = bytes.subarray(0, 10).toString("ascii") === "NIBArchive";
|
|
58
|
+
let nib = null;
|
|
59
|
+
let xmlText;
|
|
60
|
+
if (isNibArchive) {
|
|
61
|
+
const documentBudget = new InterfaceBuilderDecodeBudget(decodeBudget.remainingBytes);
|
|
62
|
+
nib = projectNibArchive(decodeNibArchive(bytes, documentBudget), documentBudget, limits.max_objects);
|
|
63
|
+
decodeBudget.reserve(documentBudget.usedBytes, "NIBArchive representation exceeds the aggregate Interface Builder decode budget");
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
if (bytes.subarray(0, 8).toString("ascii") !== "bplist00")
|
|
67
|
+
xmlText = decodeXmlPlistText(bytes);
|
|
68
|
+
const decodedReservation = estimatePropertyListDecodeBytes(bytes, decodeBudget.remainingBytes, xmlText);
|
|
69
|
+
decodeBudget.reserve(decodedReservation, "plist representation exceeds the aggregate Interface Builder decode budget");
|
|
70
|
+
}
|
|
35
71
|
const { value: raw, omittedPrototypeKeys } = nib === null
|
|
36
|
-
? decodePlist(bytes)
|
|
72
|
+
? decodePlist(bytes, xmlText)
|
|
37
73
|
: { value: nib.raw, omittedPrototypeKeys: 0 };
|
|
38
74
|
if (nib !== null && nib.omitted > 0)
|
|
39
75
|
incompleteHierarchies.set(entry.path, nib.omitted);
|
|
@@ -52,6 +88,11 @@ export const analyzeInterfaceBuilderBundle = async (input) => {
|
|
|
52
88
|
catch (cause) {
|
|
53
89
|
if (input.signal?.aborted === true)
|
|
54
90
|
throw cause;
|
|
91
|
+
if (cause instanceof InterfaceBuilderDecodeBudgetExceeded) {
|
|
92
|
+
omitted += 1;
|
|
93
|
+
recordOmittedArchive(entry.path, cause.reason);
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
55
96
|
invalid.push(`${entry.path}: ${cause instanceof Error ? cause.message : "archive decode failed"}`);
|
|
56
97
|
}
|
|
57
98
|
}
|
|
@@ -69,13 +110,17 @@ export const analyzeInterfaceBuilderBundle = async (input) => {
|
|
|
69
110
|
incompleteHierarchies,
|
|
70
111
|
prototypeKeyOmissions,
|
|
71
112
|
invalid,
|
|
113
|
+
omittedArchives,
|
|
114
|
+
unreportedOmittedArchives,
|
|
72
115
|
attempted,
|
|
73
116
|
omitted,
|
|
74
117
|
});
|
|
75
118
|
};
|
|
76
119
|
const finalizeHierarchyCoverage = (result, counts) => {
|
|
77
|
-
const { incompleteHierarchies, prototypeKeyOmissions, invalid } = counts;
|
|
78
|
-
const archiveDecodePartial = invalid.length > 0 ||
|
|
120
|
+
const { incompleteHierarchies, prototypeKeyOmissions, invalid, omittedArchives, unreportedOmittedArchives, } = counts;
|
|
121
|
+
const archiveDecodePartial = invalid.length > 0 ||
|
|
122
|
+
prototypeKeyOmissions.size > 0 ||
|
|
123
|
+
omittedArchives.length > 0;
|
|
79
124
|
return {
|
|
80
125
|
...result,
|
|
81
126
|
documents: result.documents.map((document) => ({
|
|
@@ -102,11 +147,17 @@ const finalizeHierarchyCoverage = (result, counts) => {
|
|
|
102
147
|
status: archiveDecodePartial
|
|
103
148
|
? "partial"
|
|
104
149
|
: "complete",
|
|
105
|
-
reason:
|
|
106
|
-
? "
|
|
107
|
-
:
|
|
108
|
-
? "
|
|
109
|
-
:
|
|
150
|
+
reason: omittedArchives.some(({ reason }) => reason === "aggregate_decode_budget_exhausted")
|
|
151
|
+
? "aggregate_decode_budget_exhausted"
|
|
152
|
+
: omittedArchives.some(({ reason }) => reason === "max_documents")
|
|
153
|
+
? "document_limit_reached"
|
|
154
|
+
: omittedArchives.length > 0
|
|
155
|
+
? "archive_decode_budget_exhausted"
|
|
156
|
+
: invalid.length > 0
|
|
157
|
+
? "one_or_more_archives_invalid"
|
|
158
|
+
: prototypeKeyOmissions.size > 0
|
|
159
|
+
? "dictionary_entries_omitted"
|
|
160
|
+
: null,
|
|
110
161
|
examined: counts.attempted,
|
|
111
162
|
omitted: counts.omitted,
|
|
112
163
|
},
|
|
@@ -130,27 +181,70 @@ const finalizeHierarchyCoverage = (result, counts) => {
|
|
|
130
181
|
`Some Interface Builder archives could not be decoded: ${invalid.slice(0, 16).join("; ")}`,
|
|
131
182
|
]),
|
|
132
183
|
...[...prototypeKeyOmissions].map(([path, count]) => `${path}: ${omittedPrototypeKeysLimitation(count)}`),
|
|
184
|
+
...omittedArchives.map(({ path, reason }) => `${path}: omitted because ${reason.replaceAll("_", " ")}.`),
|
|
185
|
+
...(unreportedOmittedArchives === 0
|
|
186
|
+
? []
|
|
187
|
+
: [
|
|
188
|
+
`${unreportedOmittedArchives} additional omitted archive path(s) and their reasons were not retained; reporting is bounded to ${MAX_REPORTED_OMITTED_ARCHIVES} paths.`,
|
|
189
|
+
]),
|
|
133
190
|
],
|
|
134
191
|
};
|
|
135
192
|
};
|
|
136
193
|
/** Project decoded NIB records into the same bounded graph input as ibtool. */
|
|
137
|
-
const projectNibArchive = (archive) => {
|
|
194
|
+
const projectNibArchive = (archive, budget, maxHierarchyNodes) => {
|
|
138
195
|
const byId = new Map(archive.objects.map((object) => [object.id, object]));
|
|
196
|
+
const normalizedClassNames = new Map();
|
|
197
|
+
const normalizeClassName = (value) => {
|
|
198
|
+
const known = normalizedClassNames.get(value);
|
|
199
|
+
if (known !== undefined)
|
|
200
|
+
return known;
|
|
201
|
+
const normalized = value.replace(/\0+$/u, "");
|
|
202
|
+
normalizedClassNames.set(value, normalized);
|
|
203
|
+
return normalized;
|
|
204
|
+
};
|
|
205
|
+
const decodedStrings = new Map();
|
|
206
|
+
const decodedString = (objectId, object) => {
|
|
207
|
+
if (decodedStrings.has(objectId))
|
|
208
|
+
return decodedStrings.get(objectId) ?? null;
|
|
209
|
+
const data = object.values["NS.bytes"];
|
|
210
|
+
if (typeof data !== "object" || data === null || Array.isArray(data)) {
|
|
211
|
+
decodedStrings.set(objectId, null);
|
|
212
|
+
return null;
|
|
213
|
+
}
|
|
214
|
+
const encoded = data.$nib_data_base64;
|
|
215
|
+
if (typeof encoded !== "string") {
|
|
216
|
+
decodedStrings.set(objectId, null);
|
|
217
|
+
return null;
|
|
218
|
+
}
|
|
219
|
+
budget.reserve(64 + encoded.length * 2, "NIBArchive string projection exceeds the aggregate Interface Builder decode budget");
|
|
220
|
+
const value = Buffer.from(encoded, "base64").toString("utf8");
|
|
221
|
+
decodedStrings.set(objectId, value);
|
|
222
|
+
return value;
|
|
223
|
+
};
|
|
224
|
+
let projectedFields = 0;
|
|
225
|
+
for (const object of archive.objects)
|
|
226
|
+
projectedFields += Object.keys(object.values).length;
|
|
227
|
+
budget.reserve(archive.objects.length * 128 + projectedFields * 128, "NIBArchive graph projection exceeds the aggregate Interface Builder decode budget");
|
|
228
|
+
budget.reserve(archive.classes.length * 96, "NIBArchive class projection exceeds the aggregate Interface Builder decode budget");
|
|
139
229
|
const dereference = (value) => {
|
|
140
230
|
if (typeof value !== "object" || value === null || Array.isArray(value))
|
|
141
231
|
return value;
|
|
232
|
+
const encodedData = value.$nib_data_base64;
|
|
233
|
+
if (typeof encodedData === "string") {
|
|
234
|
+
budget.reserveBase64JsonStringOccurrence(encodedData);
|
|
235
|
+
return value;
|
|
236
|
+
}
|
|
142
237
|
const ref = value.$nib_object_ref;
|
|
143
238
|
if (typeof ref !== "number")
|
|
144
239
|
return value;
|
|
145
240
|
const target = byId.get(ref);
|
|
146
241
|
if (target === undefined)
|
|
147
242
|
return undefined;
|
|
148
|
-
if (target.class_name
|
|
149
|
-
const
|
|
150
|
-
if (
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
return Buffer.from(encoded, "base64").toString("utf8");
|
|
243
|
+
if (normalizeClassName(target.class_name) === "NSString") {
|
|
244
|
+
const string = decodedString(ref, target);
|
|
245
|
+
if (string !== null) {
|
|
246
|
+
budget.reserveJsonStringOccurrence(string);
|
|
247
|
+
return string;
|
|
154
248
|
}
|
|
155
249
|
}
|
|
156
250
|
return { objectID: String(ref) };
|
|
@@ -162,26 +256,30 @@ const projectNibArchive = (archive) => {
|
|
|
162
256
|
if (typeof ref !== "number")
|
|
163
257
|
return null;
|
|
164
258
|
const target = byId.get(ref);
|
|
165
|
-
|
|
166
|
-
|
|
259
|
+
if (target === undefined ||
|
|
260
|
+
normalizeClassName(target.class_name) !== "NSString")
|
|
167
261
|
return null;
|
|
168
|
-
|
|
262
|
+
const string = decodedString(ref, target);
|
|
263
|
+
if (string === null)
|
|
169
264
|
return null;
|
|
170
|
-
|
|
171
|
-
return
|
|
172
|
-
? Buffer.from(encoded, "base64").toString("utf8")
|
|
173
|
-
: null;
|
|
265
|
+
budget.reserveJsonStringOccurrence(string);
|
|
266
|
+
return string;
|
|
174
267
|
};
|
|
268
|
+
const runtimeClasses = new Map();
|
|
175
269
|
const runtimeClass = (objectId) => {
|
|
270
|
+
if (runtimeClasses.has(objectId))
|
|
271
|
+
return runtimeClasses.get(objectId) ?? null;
|
|
176
272
|
const object = byId.get(objectId);
|
|
177
273
|
if (object === undefined)
|
|
178
274
|
return null;
|
|
179
|
-
const storedClass = object.class_name
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
275
|
+
const storedClass = normalizeClassName(object.class_name);
|
|
276
|
+
const resolvedClass = storedClass === "NSClassSwapper"
|
|
277
|
+
? (referencedString(object.values.NSClassName) ?? storedClass)
|
|
278
|
+
: storedClass === "UIClassSwapper"
|
|
279
|
+
? (referencedString(object.values.UIClassName) ?? storedClass)
|
|
280
|
+
: storedClass;
|
|
281
|
+
runtimeClasses.set(objectId, resolvedClass);
|
|
282
|
+
return resolvedClass;
|
|
185
283
|
};
|
|
186
284
|
const objects = Object.fromEntries(archive.objects
|
|
187
285
|
.filter((object) => {
|
|
@@ -189,22 +287,29 @@ const projectNibArchive = (archive) => {
|
|
|
189
287
|
return !/^(?:NSObject|NSIBObjectData|NSString|NSMutableString|NSNumber|NSArray|NSMutableArray|NSSet|NSMutableSet|NSDictionary|NSMutableDictionary|NSApplication|NSNib.*Connector|UIRuntime\w*Connection)$/u.test(name);
|
|
190
288
|
})
|
|
191
289
|
.map((object) => {
|
|
192
|
-
const className = runtimeClass(object.id) ?? object.class_name
|
|
193
|
-
|
|
290
|
+
const className = runtimeClass(object.id) ?? normalizeClassName(object.class_name);
|
|
291
|
+
budget.reserveJsonStringOccurrence(className);
|
|
292
|
+
let name = className;
|
|
293
|
+
for (const [key, value] of Object.entries(object.values)) {
|
|
294
|
+
if (!/(?:title|label|identifier|accessibility|name|contents)/iu.test(key))
|
|
295
|
+
continue;
|
|
194
296
|
const resolved = dereference(value);
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
297
|
+
if (typeof resolved !== "string")
|
|
298
|
+
continue;
|
|
299
|
+
name = resolved;
|
|
300
|
+
break;
|
|
301
|
+
}
|
|
302
|
+
budget.reserveJsonStringOccurrence(name);
|
|
198
303
|
return [
|
|
199
304
|
String(object.id),
|
|
200
305
|
{
|
|
201
306
|
customClass: className,
|
|
202
307
|
label: name,
|
|
203
308
|
objectID: String(object.id),
|
|
204
|
-
nibValues: Object.fromEntries(Object.entries(object.values).map(([key, value]) =>
|
|
205
|
-
key
|
|
206
|
-
dereference(value) ?? null
|
|
207
|
-
|
|
309
|
+
nibValues: Object.fromEntries(Object.entries(object.values).map(([key, value]) => {
|
|
310
|
+
budget.reserveJsonPropertyNameOccurrence(key);
|
|
311
|
+
return [key, dereference(value) ?? null];
|
|
312
|
+
})),
|
|
208
313
|
},
|
|
209
314
|
];
|
|
210
315
|
}));
|
|
@@ -218,7 +323,7 @@ const projectNibArchive = (archive) => {
|
|
|
218
323
|
: null;
|
|
219
324
|
};
|
|
220
325
|
for (const object of archive.objects) {
|
|
221
|
-
const className = object.class_name
|
|
326
|
+
const className = normalizeClassName(object.class_name);
|
|
222
327
|
// AppKit connectors use NS-prefixed keys; UIKit's runtime outlet and
|
|
223
328
|
// event connections use UI-prefixed keys with the same roles.
|
|
224
329
|
const uiKit = /^UIRuntime\w*Connection$/u.test(className);
|
|
@@ -235,6 +340,7 @@ const projectNibArchive = (archive) => {
|
|
|
235
340
|
: className.includes("Control") || className.includes("Event")
|
|
236
341
|
? "action"
|
|
237
342
|
: className;
|
|
343
|
+
budget.reserveJsonStringOccurrence(type);
|
|
238
344
|
const eventMask = values.UIEventMask;
|
|
239
345
|
// The source is the outlet owner or the sending control; the destination
|
|
240
346
|
// is the outlet value or the action target, and a nil target is the
|
|
@@ -249,16 +355,26 @@ const projectNibArchive = (archive) => {
|
|
|
249
355
|
});
|
|
250
356
|
}
|
|
251
357
|
let hierarchyOmitted = 0;
|
|
358
|
+
let hierarchyNodeCount = 0;
|
|
252
359
|
const hierarchyFor = (objectId, seen, depth) => {
|
|
253
360
|
if (depth > 32 || seen.has(objectId)) {
|
|
254
361
|
hierarchyOmitted += 1;
|
|
255
362
|
return null;
|
|
256
363
|
}
|
|
364
|
+
if (hierarchyNodeCount >= maxHierarchyNodes) {
|
|
365
|
+
hierarchyOmitted += 1;
|
|
366
|
+
return null;
|
|
367
|
+
}
|
|
368
|
+
if (!budget.tryReserve(128)) {
|
|
369
|
+
hierarchyOmitted += 1;
|
|
370
|
+
return null;
|
|
371
|
+
}
|
|
257
372
|
const object = byId.get(objectId);
|
|
258
373
|
if (object === undefined) {
|
|
259
374
|
hierarchyOmitted += 1;
|
|
260
375
|
return null;
|
|
261
376
|
}
|
|
377
|
+
hierarchyNodeCount += 1;
|
|
262
378
|
const nextSeen = new Set(seen).add(objectId);
|
|
263
379
|
const children = [];
|
|
264
380
|
for (const [key, value] of Object.entries(object.values)) {
|
|
@@ -288,7 +404,7 @@ const projectNibArchive = (archive) => {
|
|
|
288
404
|
}
|
|
289
405
|
return { objectID: String(objectId), children };
|
|
290
406
|
};
|
|
291
|
-
const ibData = archive.objects.find(({ class_name }) => class_name
|
|
407
|
+
const ibData = archive.objects.find(({ class_name }) => normalizeClassName(class_name) === "NSIBObjectData");
|
|
292
408
|
const rootId = reference(ibData?.values.NSRoot);
|
|
293
409
|
const hierarchyRoots = rootId === null ? [] : [rootId];
|
|
294
410
|
for (const hierarchyRoot of hierarchyRoots) {
|
|
@@ -296,15 +412,19 @@ const projectNibArchive = (archive) => {
|
|
|
296
412
|
if (root !== null)
|
|
297
413
|
hierarchy.push(root);
|
|
298
414
|
}
|
|
299
|
-
const viewHierarchy = projectNibViewHierarchy(archive.objects, new Set(Object.keys(objects).map(Number)));
|
|
300
|
-
const merged = mergeNibHierarchies(hierarchy, viewHierarchy.hierarchy ?? []);
|
|
415
|
+
const viewHierarchy = projectNibViewHierarchy(archive.objects, new Set(Object.keys(objects).map(Number)), () => budget.tryReserve(128), maxHierarchyNodes);
|
|
416
|
+
const merged = mergeNibHierarchies(hierarchy, viewHierarchy.hierarchy ?? [], () => budget.tryReserve(96), maxHierarchyNodes);
|
|
301
417
|
return {
|
|
302
418
|
omitted: viewHierarchy.omitted + hierarchyOmitted + merged.omitted,
|
|
303
419
|
raw: jsonValueSchema.parse({
|
|
304
420
|
"com.apple.ibtool.document.objects": objects,
|
|
305
421
|
"com.apple.ibtool.document.connections": connections,
|
|
306
422
|
"com.apple.ibtool.document.hierarchy": merged.hierarchy,
|
|
307
|
-
"com.apple.ibtool.document.classes": Object.fromEntries(archive.classes.map((name) =>
|
|
423
|
+
"com.apple.ibtool.document.classes": Object.fromEntries(archive.classes.map((name) => {
|
|
424
|
+
const className = normalizeClassName(name);
|
|
425
|
+
budget.reserveJsonPropertyNameOccurrence(className);
|
|
426
|
+
return [className, {}];
|
|
427
|
+
})),
|
|
308
428
|
}),
|
|
309
429
|
};
|
|
310
430
|
};
|
|
@@ -312,9 +432,9 @@ const isInterfaceBuilderArchive = (path) => {
|
|
|
312
432
|
const lower = path.toLowerCase();
|
|
313
433
|
return lower.endsWith(".nib") || lower.endsWith("/objects.nib");
|
|
314
434
|
};
|
|
315
|
-
const readEntry = async (reader, entry, signal) => {
|
|
316
|
-
if (entry.declaredSize !== null && entry.declaredSize >
|
|
317
|
-
throw new
|
|
435
|
+
const readEntry = async (reader, entry, signal, maxInputBytes = MAX_AGGREGATE_INPUT_BYTES) => {
|
|
436
|
+
if (entry.declaredSize !== null && entry.declaredSize > maxInputBytes)
|
|
437
|
+
throw new InterfaceBuilderDecodeBudgetExceeded("aggregate_decode_budget_exhausted", "archive exceeds the aggregate Interface Builder decode budget");
|
|
318
438
|
const stream = await reader.open(entry, signal);
|
|
319
439
|
const chunks = [];
|
|
320
440
|
let length = 0;
|
|
@@ -323,18 +443,18 @@ const readEntry = async (reader, entry, signal) => {
|
|
|
323
443
|
? chunk
|
|
324
444
|
: Buffer.from(chunk);
|
|
325
445
|
length += bytes.length;
|
|
326
|
-
if (length >
|
|
446
|
+
if (length > maxInputBytes) {
|
|
327
447
|
stream.destroy();
|
|
328
|
-
throw new
|
|
448
|
+
throw new InterfaceBuilderDecodeBudgetExceeded("aggregate_decode_budget_exhausted", "archive exceeded the aggregate Interface Builder decode budget");
|
|
329
449
|
}
|
|
330
450
|
chunks.push(bytes);
|
|
331
451
|
}
|
|
332
452
|
return Buffer.concat(chunks, length);
|
|
333
453
|
};
|
|
334
454
|
/** Project decoded plist data and dates while retaining omitted-key coverage. */
|
|
335
|
-
const decodePlist = (bytes) => {
|
|
455
|
+
const decodePlist = (bytes, xmlText) => {
|
|
336
456
|
const { value, omittedPrototypeKeys } = bytes.subarray(0, 8).toString("ascii") === "bplist00"
|
|
337
457
|
? { value: parseBinary(bytes), omittedPrototypeKeys: 0 }
|
|
338
|
-
: parseXmlPropertyList(bytes
|
|
458
|
+
: parseXmlPropertyList(xmlText ?? decodeXmlPlistText(bytes));
|
|
339
459
|
return { value: projectPlistValue(value).value, omittedPrototypeKeys };
|
|
340
460
|
};
|