From 5cfaac0834b5cd474801809652778598c788041b Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Sun, 15 Nov 2026 18:33:23 +0800 Subject: [PATCH] refactor(process): require the platform for environment snapshots instead of reading the host (#11028) --- .../verify/architecture-guard-baselines.json | 1 - src/adb/AdbProvider.ts | 6 ++++- src/android/JadxProvider.ts | 11 +++++++-- src/apktool/ApktoolProvider.ts | 8 +++++-- src/application/DshCordisPatch.ts | 2 ++ src/application/UpdateCommandRunner.ts | 2 ++ .../history/HistoricalCaptureDecoder.ts | 6 ++++- .../history/MitmproxyCaptureAdapter.ts | 5 +++- src/browser/modules/NativeModuleResolver.ts | 3 ++- src/cli/cliShell.ts | 6 ++++- src/composition/binary.ts | 7 +++--- src/composition/directAnalysis.ts | 6 ++++- .../optionalObservationProviders.ts | 6 ++++- src/evm/EvmoleInterfaceProvider.ts | 6 ++++- src/firmware/FirmwareProvider.ts | 6 ++++- src/ghidra/GhidraLauncher.ts | 6 ++++- src/ghidra/GhidraProvider.ts | 3 ++- src/ida/IdaMcpConnection.ts | 7 ++++-- src/ida/IdaProvider.ts | 3 ++- src/javascript/recovery/WakaruProvider.ts | 6 ++++- src/main.ts | 23 ++++++++++++------- src/main/eagerRuntime.ts | 6 ++++- src/native/CommandRunner.ts | 3 ++- src/native/LldbCallTracer.ts | 3 ++- src/native/NativeUiHelperRuntime.ts | 6 ++++- src/native/pwntools/PwntoolsDecoder.ts | 6 ++++- src/pcap/PcapProvider.ts | 6 ++++- src/process/DarwinProcessRunTokenReader.ts | 6 ++++- src/process/snapshotEnvironment.ts | 4 ++-- src/server/createServer.ts | 6 ++++- src/server/providerEnvironment.ts | 6 ++++- src/wasm/WabtArtifactProvider.ts | 6 ++++- .../clientConfigurationEnvironment.test.ts | 7 +++--- .../native/pwndbgReplyFinalization.test.ts | 13 +++++++---- 34 files changed, 156 insertions(+), 51 deletions(-) diff --git a/scripts/verify/architecture-guard-baselines.json b/scripts/verify/architecture-guard-baselines.json index ae0bf2e639..da5ae29a59 100644 --- a/scripts/verify/architecture-guard-baselines.json +++ b/scripts/verify/architecture-guard-baselines.json @@ -546,7 +546,6 @@ "src/process/capture/ProcessHarness.ts": 1, "src/process/capture/ProcessScenarioRuntimeValidation.ts": 1, "src/process/ownedDebuggerSession.ts": 2, - "src/process/snapshotEnvironment.ts": 2, "src/rizin/RizinDebugSessionManager.ts": 1, "src/server/createServer.ts": 1, "src/server/registerSessionTools.ts": 3, diff --git a/src/adb/AdbProvider.ts b/src/adb/AdbProvider.ts index 57bc04e99f..f320a6d27d 100644 --- a/src/adb/AdbProvider.ts +++ b/src/adb/AdbProvider.ts @@ -1,4 +1,5 @@ import { ADB_PROVIDER_IDENTITY } from "./AdbProviderIdentity.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { absoluteCallerPath, appendCallerPath, @@ -839,7 +840,10 @@ export class AdbProvider { #outputCleanupPromise: Promise | undefined; constructor(options: AdbProviderOptions = {}) { - this.environment = snapshotEnvironment(options.environment ?? process.env); + this.environment = snapshotEnvironment( + options.environment ?? process.env, + HOST_PLATFORM.platform, + ); this.#createRuntimeRoot = options.createRuntimeRoot ?? ((rootOptions) => PrivateRuntimeRoot.create(rootOptions)); diff --git a/src/android/JadxProvider.ts b/src/android/JadxProvider.ts index e35cd4cb55..873296d4bf 100644 --- a/src/android/JadxProvider.ts +++ b/src/android/JadxProvider.ts @@ -1,4 +1,5 @@ import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import type { AnalysisSettingsReader } from "../domain/analysisSettings.js"; import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; @@ -304,7 +305,10 @@ export class JadxProvider implements AndroidAnalysisPort { /** Report actual local prerequisites without starting JADX or opening a target. */ inspectAvailability(signal?: AbortSignal) { - const environment = snapshotEnvironment(this.environment); + const environment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); const pending = inspectJadxAvailability(environment, { operationTimeoutMs: this.settings?.().overrides["jadx.operation_timeout_ms"], @@ -505,7 +509,10 @@ export class JadxProvider implements AndroidAnalysisPort { request: AndroidRequest, options: ExecutionOptions, ): Promise { - const environment = snapshotEnvironment(this.environment); + const environment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); // Resolve the accepted operation's override before acquiring any resource. // An unusable launch value is refused without starting the engine. const timeoutMs = resolveJadxOperationTimeout( diff --git a/src/apktool/ApktoolProvider.ts b/src/apktool/ApktoolProvider.ts index de09c98862..f1d2e1f09c 100644 --- a/src/apktool/ApktoolProvider.ts +++ b/src/apktool/ApktoolProvider.ts @@ -1,4 +1,5 @@ import { MAX_NODE_TIMER_DELAY_MS } from "../domain/analysisResourceLimits.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { processInspectionCancellationError } from "../providers/OwnedCommandCleanup.js"; import { APKTOOL_PROVIDER_IDENTITY } from "./ApktoolProviderIdentity.js"; import { countDecodedFiles } from "./ApktoolDecodedInventory.js"; @@ -311,12 +312,15 @@ export class ApktoolProvider { this.selectedEnvironment = options.environment === undefined ? undefined - : snapshotEnvironment(options.environment); + : snapshotEnvironment(options.environment, HOST_PLATFORM.platform); this.removeWorkspace = options.removeWorkspace; } private operationEnvironment(): Readonly { - return this.selectedEnvironment ?? snapshotEnvironment(process.env); + return ( + this.selectedEnvironment ?? + snapshotEnvironment(process.env, HOST_PLATFORM.platform) + ); } /** Probe the selected apktool launcher; decodes nothing. */ diff --git a/src/application/DshCordisPatch.ts b/src/application/DshCordisPatch.ts index 07321a4548..055e04c391 100644 --- a/src/application/DshCordisPatch.ts +++ b/src/application/DshCordisPatch.ts @@ -1,4 +1,5 @@ import { validateRegistrationEnvironment } from "./RegistrationEnvironmentValidation.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { isMap, isSeq, type Node, type YAMLMap } from "yaml"; import type { Environment } from "../config/environment.js"; import { ConfigurationError } from "../domain/configurationErrors.js"; @@ -271,6 +272,7 @@ export class DshCordisDocument { const env = mergeEnvironmentOverrides( isPatchRecord(this.config?.env) ? this.config.env : {}, overrides, + HOST_PLATFORM.platform, ); const desired = { ...this.config, ...dshClientRegistrationEntry(command) }; delete desired.env; diff --git a/src/application/UpdateCommandRunner.ts b/src/application/UpdateCommandRunner.ts index 9081b9b834..3c4ebde6ce 100644 --- a/src/application/UpdateCommandRunner.ts +++ b/src/application/UpdateCommandRunner.ts @@ -1,4 +1,5 @@ import spawn from "cross-spawn"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { spawn as spawnWindows } from "node:child_process"; import { win32 } from "node:path"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; @@ -121,6 +122,7 @@ const runUpdateProcess = async ( return commandFailure("No executable supplied.", "launch"); const environment = snapshotEnvironment( withoutPackageRunnerIdentity(selectedEnvironment), + HOST_PLATFORM.platform, ); let selectedExecutable = executable; let selectedArguments = args; diff --git a/src/browser/history/HistoricalCaptureDecoder.ts b/src/browser/history/HistoricalCaptureDecoder.ts index b04dc47260..84fee74ccc 100644 --- a/src/browser/history/HistoricalCaptureDecoder.ts +++ b/src/browser/history/HistoricalCaptureDecoder.ts @@ -1,4 +1,5 @@ import { javaScriptWorkerMemoryLimitBytes } from "../../process/JavaScriptWorkerMemoryLimit.js"; +import { HOST_PLATFORM } from "../../platform/HostPlatform.js"; import { captureBudgets, withCaptureBudgets } from "./CaptureBudgets.js"; import type { FileSnapshotPartialObservation } from "../../domain/fileSnapshotObservation.js"; import { @@ -146,7 +147,10 @@ export class HistoricalCaptureDecoder { input: InspectWebNetworkCaptureInput, options?: ExecutionOptions, ): Promise> { - const selectedEnvironment = snapshotEnvironment(this.environment); + const selectedEnvironment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); let runtime: Pick | undefined; const runtimeResources = new ArtifactResourceScope(); let processLease: AnalysisCleanupLease | undefined; diff --git a/src/browser/history/MitmproxyCaptureAdapter.ts b/src/browser/history/MitmproxyCaptureAdapter.ts index cd2bab3023..7d0340f4d7 100644 --- a/src/browser/history/MitmproxyCaptureAdapter.ts +++ b/src/browser/history/MitmproxyCaptureAdapter.ts @@ -1,4 +1,5 @@ import { access, stat } from "node:fs/promises"; +import { HOST_PLATFORM } from "../../platform/HostPlatform.js"; import { constants } from "node:fs"; import { isAbsolute } from "node:path"; import { fileURLToPath } from "node:url"; @@ -16,7 +17,9 @@ export class MitmproxyCaptureAdapter implements HistoricalCaptureFormatAdapter { readonly identity = MITMPROXY_CAPTURE_PROVIDER_IDENTITY; constructor(readonly environment: Readonly) {} snapshotConfiguration(): HistoricalCaptureFormatAdapter { - return new MitmproxyCaptureAdapter(snapshotEnvironment(this.environment)); + return new MitmproxyCaptureAdapter( + snapshotEnvironment(this.environment, HOST_PLATFORM.platform), + ); } async command( requestPath: string, diff --git a/src/browser/modules/NativeModuleResolver.ts b/src/browser/modules/NativeModuleResolver.ts index ff4e199d9b..c1ae73b0d0 100644 --- a/src/browser/modules/NativeModuleResolver.ts +++ b/src/browser/modules/NativeModuleResolver.ts @@ -1,4 +1,5 @@ import { snapshotEnvironment } from "../../process/snapshotEnvironment.js"; +import { HOST_PLATFORM } from "../../platform/HostPlatform.js"; import { chromiumLaunchRemediation, chromiumSandboxEnabled, @@ -105,7 +106,7 @@ export class NativeModuleResolver implements WebModuleResolutionPort { environment: Readonly>, readonly launcher: ModuleResolverLauncher = launch, ) { - this.environment = snapshotEnvironment(environment); + this.environment = snapshotEnvironment(environment, HOST_PLATFORM.platform); } resolve( diff --git a/src/cli/cliShell.ts b/src/cli/cliShell.ts index 60f3351c80..ce69932105 100644 --- a/src/cli/cliShell.ts +++ b/src/cli/cliShell.ts @@ -1,4 +1,5 @@ import { Cli, z } from "incur"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import type { FridaInstrumentationPort } from "../application/frida/FridaInstrumentationPort.js"; import { currentClientRegistrationCommand } from "../application/ClientRegistrationIdentity.js"; @@ -74,7 +75,10 @@ const registerCommands = ( * every set of registrars; they apply to whichever commands were registered. */ export const createCliShell = (options: CliShellOptions): CliInstance => { - const environment = snapshotEnvironment(options.selectedEnvironment); + const environment = snapshotEnvironment( + options.selectedEnvironment, + HOST_PLATFORM.platform, + ); const defaultRegistration = parseClientRegistrationCommand( currentClientRegistrationCommand({ environment }), ); diff --git a/src/composition/binary.ts b/src/composition/binary.ts index e5bc5fdd0c..d7056f2dc0 100644 --- a/src/composition/binary.ts +++ b/src/composition/binary.ts @@ -60,7 +60,8 @@ const composeDeepBinarySession = ( inspection?: "inspect_native_dispatch_metadata", settings?: AnalysisSettingsReader, ): BinarySession => { - const environment = snapshotEnvironment(selectedEnvironment); + const platform = HOST_PLATFORM.platform; + const environment = snapshotEnvironment(selectedEnvironment, platform); const hopper = new HopperProvider(config, logger, environment); const ghidra = new GhidraProvider(config, logger, environment); const ida = new IdaProvider(config, environment); @@ -70,7 +71,7 @@ const composeDeepBinarySession = ( }); const auxiliaryDeclarations = auxiliaryAnalysisProviderDeclarations( environment, - HOST_PLATFORM.platform, + platform, settings, ); const nativeInspectionAvailable = @@ -89,7 +90,7 @@ const composeDeepBinarySession = ( auxiliaryDeclarations.map( (declaration) => new LazyAnalysisProvider(declaration), ), - createBundleResourceFactory(environment, HOST_PLATFORM.platform, settings), + createBundleResourceFactory(environment, platform, settings), ); }; diff --git a/src/composition/directAnalysis.ts b/src/composition/directAnalysis.ts index 42d078ed17..4b2540462b 100644 --- a/src/composition/directAnalysis.ts +++ b/src/composition/directAnalysis.ts @@ -1,4 +1,5 @@ import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { parseConfig } from "../config/parseConfig.js"; import type { DirectAnalysisDependencies } from "../application/DirectAnalysisDependencies.js"; @@ -20,7 +21,10 @@ type BoundOperation = Operation extends ( export const createDirectAnalysis = ( selectedEnvironment: Readonly>, ) => { - const environment = snapshotEnvironment(selectedEnvironment); + const environment = snapshotEnvironment( + selectedEnvironment, + HOST_PLATFORM.platform, + ); const dependencies: DirectAnalysisDependencies = { readConfiguration: () => parseConfig(environment), createBinarySession: async (config, logger) => { diff --git a/src/composition/optionalObservationProviders.ts b/src/composition/optionalObservationProviders.ts index 36b25ace12..9b3ee00512 100644 --- a/src/composition/optionalObservationProviders.ts +++ b/src/composition/optionalObservationProviders.ts @@ -1,4 +1,5 @@ import type { AnalysisSettingsReader } from "../domain/analysisSettings.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import type { OptionalObservationProviders, @@ -28,7 +29,10 @@ export const createOptionalObservationFactories = ( selectedEnvironment: Readonly>, settings?: AnalysisSettingsReader, ): OptionalObservationFactories => { - const environment = snapshotEnvironment(selectedEnvironment); + const environment = snapshotEnvironment( + selectedEnvironment, + HOST_PLATFORM.platform, + ); let runtimeAdmission: V8InspectorAdmission | undefined; let webBundleAdmission: WebBundleAnalysisAdmission | undefined; return { diff --git a/src/evm/EvmoleInterfaceProvider.ts b/src/evm/EvmoleInterfaceProvider.ts index f2031dc6f9..2b7953da53 100644 --- a/src/evm/EvmoleInterfaceProvider.ts +++ b/src/evm/EvmoleInterfaceProvider.ts @@ -1,4 +1,5 @@ import { EvmAdmissionError } from "./EvmAdmissionError.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import type { ProviderRejectionCode } from "../domain/providerSelection.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import type { JsonValue } from "../domain/jsonValue.js"; @@ -449,7 +450,10 @@ export class EvmoleInterfaceProvider implements EvmInterfacePort { if (this.#closing) return Promise.resolve(err(this.#closedError())); const operation = this.#tail.then(async () => { if (this.#closing) return err(this.#closedError()); - const environment = snapshotEnvironment(this.environment); + const environment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); try { return await this.#resources.run(() => this.#inspect(input, environment, options), diff --git a/src/firmware/FirmwareProvider.ts b/src/firmware/FirmwareProvider.ts index dd4cca71ed..e9c61b34dc 100644 --- a/src/firmware/FirmwareProvider.ts +++ b/src/firmware/FirmwareProvider.ts @@ -1,4 +1,5 @@ import { FIRMWARE_OPERATION_ENGINES } from "../contracts/firmware/firmwareToolRequirements.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { assertArtifactCommandPath } from "../process/ArtifactCommandPath.js"; import { join } from "node:path"; @@ -345,7 +346,10 @@ export class FirmwareProvider implements FirmwareAnalysisPort { options?: ExecutionOptions, ): Promise { // Capture configuration after queue admission; later operations may select updates. - const environment = snapshotEnvironment(this.environment); + const environment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); let root: PrivateRuntimeRoot | undefined; let rootLease: AnalysisCleanupLease | undefined; const engineName = FIRMWARE_OPERATION_ENGINES[request.operation]; diff --git a/src/ghidra/GhidraLauncher.ts b/src/ghidra/GhidraLauncher.ts index e0bef7f390..4fbfa998fd 100644 --- a/src/ghidra/GhidraLauncher.ts +++ b/src/ghidra/GhidraLauncher.ts @@ -3,6 +3,7 @@ import { processInspectionFailure, retainProcessInspectionCleanup, } from "../providers/OwnedCommandCleanup.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { GhidraAdmissionError } from "./GhidraAdmissionError.js"; import { copyExistingGhidraProject } from "./GhidraProjectSnapshot.js"; import { hashGhidraPackedProgram } from "./GhidraCheckpoint.js"; @@ -276,7 +277,10 @@ export class GhidraHeadlessLauncher implements GhidraLauncher { constructor(options: GhidraHeadlessLauncherOptions) { this.options = { ...options, - environment: snapshotEnvironment(options.environment, options.platform), + environment: snapshotEnvironment( + options.environment, + options.platform ?? HOST_PLATFORM.platform, + ), }; } diff --git a/src/ghidra/GhidraProvider.ts b/src/ghidra/GhidraProvider.ts index 58c7a17cdd..26bdc97403 100644 --- a/src/ghidra/GhidraProvider.ts +++ b/src/ghidra/GhidraProvider.ts @@ -1,4 +1,5 @@ import { resolveGhidraCheckpoint } from "./GhidraCheckpoint.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { checkpointCapabilities, CAPABILITIES, @@ -154,7 +155,7 @@ export class GhidraProvider implements AnalysisProviderCandidate { ) { this.environment = snapshotEnvironment( environment, - installationHost?.platform, + installationHost?.platform ?? HOST_PLATFORM.platform, ); } diff --git a/src/ida/IdaMcpConnection.ts b/src/ida/IdaMcpConnection.ts index ecf80415a1..4c906f8afd 100644 --- a/src/ida/IdaMcpConnection.ts +++ b/src/ida/IdaMcpConnection.ts @@ -2,6 +2,7 @@ import { ArtifactResourceScope, type ArtifactResourceOwner, } from "../artifacts/ArtifactResourceScope.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { ResponseBodyCleanup } from "../providers/ResponseBodyCleanup.js"; import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; @@ -576,12 +577,14 @@ export const createIdaMcpConnection = ( DEFAULT_INHERITED_ENV_VARS.map((key) => [key, ""]), ), ...Object.fromEntries( - Object.entries(snapshotEnvironment(environment)).filter( + Object.entries( + snapshotEnvironment(environment, HOST_PLATFORM.platform), + ).filter( (entry): entry is [string, string] => entry[1] !== undefined, ), ), IDA_MCP_MAX_WORKERS: "1", - ...snapshotEnvironment(config.env), + ...snapshotEnvironment(config.env, HOST_PLATFORM.platform), }, stderr: "pipe", maxBufferSize: IDA_STDIO_MAX_MESSAGE_BYTES, diff --git a/src/ida/IdaProvider.ts b/src/ida/IdaProvider.ts index 3fa6cb6568..068306439a 100644 --- a/src/ida/IdaProvider.ts +++ b/src/ida/IdaProvider.ts @@ -1,4 +1,5 @@ import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { launchRegexMatchingLimitation } from "../process/RegexMatcher.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { @@ -91,7 +92,7 @@ export class IdaProvider implements AnalysisProviderCandidate { environment: Readonly, ) => IdaMcpConnection = createIdaMcpConnection, ) { - this.environment = snapshotEnvironment(environment); + this.environment = snapshotEnvironment(environment, HOST_PLATFORM.platform); } identity() { diff --git a/src/javascript/recovery/WakaruProvider.ts b/src/javascript/recovery/WakaruProvider.ts index ef0df3a700..5619a3305d 100644 --- a/src/javascript/recovery/WakaruProvider.ts +++ b/src/javascript/recovery/WakaruProvider.ts @@ -1,4 +1,5 @@ import { snapshotEnvironment } from "../../process/snapshotEnvironment.js"; +import { HOST_PLATFORM } from "../../platform/HostPlatform.js"; import { mkdir, mkdtemp, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; @@ -104,7 +105,10 @@ export class WakaruProvider implements JavaScriptRecoveryPort { const pending = await this.#retire(); if (pending !== undefined) return err(pending); // Capture configuration after queue/cleanup admission; later requests may select updates. - const environment = snapshotEnvironment(this.environment); + const environment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); let root: string | undefined; let tree: SafeOutputTree | undefined; let failed: { readonly cause: unknown } | undefined; diff --git a/src/main.ts b/src/main.ts index d198809b91..20cef815d4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ #!/usr/bin/env node import { snapshotEnvironment } from "./process/snapshotEnvironment.js"; +import { HOST_PLATFORM } from "./platform/HostPlatform.js"; import { CURRENT_ENTRYPOINT_PATH } from "./process/CurrentEntrypointPath.js"; import { pathToFileURL } from "node:url"; import { realpathSync } from "node:fs"; @@ -89,7 +90,10 @@ const httpRuntimeDependencies = ( export const run = async ( dependencies: RuntimeDependencies = runtimeDependencies(), ): Promise => { - const environment = snapshotEnvironment(dependencies.env); + const environment = snapshotEnvironment( + dependencies.env, + HOST_PLATFORM.platform, + ); const config = parseConfig(environment); if (!config.ok) { dependencies.writeStderr(`${projectAnalysisError(config.error).message}\n`); @@ -175,13 +179,16 @@ export const runMcpHttpEntrypoint = async ( io.setExitCode(1); return; } - const endpoint = parseMcpHttpEndpoint(snapshotEnvironment(process.env), { - ...(parsed.host === undefined ? {} : { host: parsed.host }), - ...(parsed.port === undefined ? {} : { port: parsed.port }), - ...(parsed.allowedHosts === undefined - ? {} - : { allowedHosts: [...parsed.allowedHosts] }), - }); + const endpoint = parseMcpHttpEndpoint( + snapshotEnvironment(process.env, HOST_PLATFORM.platform), + { + ...(parsed.host === undefined ? {} : { host: parsed.host }), + ...(parsed.port === undefined ? {} : { port: parsed.port }), + ...(parsed.allowedHosts === undefined + ? {} + : { allowedHosts: [...parsed.allowedHosts] }), + }, + ); if (!endpoint.ok) { io.writeStderr(`${projectAnalysisError(endpoint.error).message}\n`); io.setExitCode(1); diff --git a/src/main/eagerRuntime.ts b/src/main/eagerRuntime.ts index 09bc7de781..3c959496bd 100644 --- a/src/main/eagerRuntime.ts +++ b/src/main/eagerRuntime.ts @@ -1,4 +1,5 @@ import { AnalysisSettings } from "../application/AnalysisSettings.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import type { AppConfig } from "../config/types.js"; @@ -29,7 +30,10 @@ export const runEager = async ( dependencies: RuntimeDependencies, selectedConfig?: AppConfig, ): Promise => { - const environment = snapshotEnvironment(dependencies.env); + const environment = snapshotEnvironment( + dependencies.env, + HOST_PLATFORM.platform, + ); const config = selectedConfig === undefined ? parseConfig(environment) diff --git a/src/native/CommandRunner.ts b/src/native/CommandRunner.ts index aed9d2c9cd..52d8efaacd 100644 --- a/src/native/CommandRunner.ts +++ b/src/native/CommandRunner.ts @@ -1,4 +1,5 @@ import type { ProcessInspectionFailure } from "../process/ProcessInspectionCleanup.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { processInspectionFailure } from "../providers/OwnedCommandCleanup.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { createHash, randomUUID } from "node:crypto"; @@ -173,7 +174,7 @@ export class XcrunCommandRunner implements NativeCommandRunner { ) => resolveXcrunTool(tool, this.environment, signal, launcher, timeoutMs), private readonly launcher?: NativeCommandLauncher, ) { - this.environment = snapshotEnvironment(environment); + this.environment = snapshotEnvironment(environment, HOST_PLATFORM.platform); } run( diff --git a/src/native/LldbCallTracer.ts b/src/native/LldbCallTracer.ts index e0f41e2e58..ffbffcfff1 100644 --- a/src/native/LldbCallTracer.ts +++ b/src/native/LldbCallTracer.ts @@ -1,4 +1,5 @@ import { bindArtifactFileCleanup } from "../artifacts/ArtifactFileOperation.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; import { translateNativeCommandFailure } from "./NativeCommandAnalysisError.js"; import { DEFAULT_NATIVE_COMMAND_TIMEOUT_MS } from "../domain/native/nativeDeadlines.js"; @@ -238,7 +239,7 @@ export class LldbCallTracer implements NativeCallTracer { ) => ReturnType = (tool, signal) => resolveXcrunTool(tool, this.environment, signal), ) { - this.environment = snapshotEnvironment(environment); + this.environment = snapshotEnvironment(environment, HOST_PLATFORM.platform); } async trace( diff --git a/src/native/NativeUiHelperRuntime.ts b/src/native/NativeUiHelperRuntime.ts index 2141c534b4..d459a2535b 100644 --- a/src/native/NativeUiHelperRuntime.ts +++ b/src/native/NativeUiHelperRuntime.ts @@ -1,4 +1,5 @@ import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { AnalysisCleanupLease } from "../artifacts/AnalysisCleanupLease.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { mkdir, mkdtemp, rm, symlink } from "node:fs/promises"; @@ -26,7 +27,10 @@ export const createNativeUiHelperRuntime = ( environment: Readonly, deadlineMs = DEFAULT_NATIVE_UI_DEADLINE_MS, ): NativeUiHelperRuntime => { - const selectedEnvironment = snapshotEnvironment(environment); + const selectedEnvironment = snapshotEnvironment( + environment, + HOST_PLATFORM.platform, + ); const deadlineSignal = AbortSignal.timeout(deadlineMs); const operations = new ArtifactResourceScope(); // Both helper stages share the selected deadline. A shorter fixed exec diff --git a/src/native/pwntools/PwntoolsDecoder.ts b/src/native/pwntools/PwntoolsDecoder.ts index 7435a3a4b4..e37e503f57 100644 --- a/src/native/pwntools/PwntoolsDecoder.ts +++ b/src/native/pwntools/PwntoolsDecoder.ts @@ -1,4 +1,5 @@ import { classifyProviderFailure } from "../../providers/classifyProviderFailure.js"; +import { HOST_PLATFORM } from "../../platform/HostPlatform.js"; import { snapshotEnvironment } from "../../process/snapshotEnvironment.js"; import { safeParseUtf8Json } from "../../domain/safeJson.js"; import { @@ -249,7 +250,10 @@ export class PwntoolsDecoder< input: Input, options?: ExecutionOptions, ): Promise> { - const environment = snapshotEnvironment(this.environment); + const environment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); const selectedLimits = pwntoolsProducerLimitsSchema.safeParse( input.producer_limits === undefined ? {} : input.producer_limits, ); diff --git a/src/pcap/PcapProvider.ts b/src/pcap/PcapProvider.ts index 019d50635e..71a67c2871 100644 --- a/src/pcap/PcapProvider.ts +++ b/src/pcap/PcapProvider.ts @@ -1,4 +1,5 @@ import { PCAP_PROVIDER_IDENTITY } from "./PcapProviderIdentity.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { PCAP_HTTP_URI_FIELDS } from "./PcapHttpUri.js"; import { type ExecutionOptions, @@ -276,7 +277,10 @@ export class PcapProvider { >(); constructor(options: PcapProviderOptions = {}) { - this.environment = snapshotEnvironment(options.environment ?? process.env); + this.environment = snapshotEnvironment( + options.environment ?? process.env, + HOST_PLATFORM.platform, + ); this.launcher = options.launcher; this.#resources = new ArtifactAnalysisResources( "pcap", diff --git a/src/process/DarwinProcessRunTokenReader.ts b/src/process/DarwinProcessRunTokenReader.ts index c1d55f4851..4299391656 100644 --- a/src/process/DarwinProcessRunTokenReader.ts +++ b/src/process/DarwinProcessRunTokenReader.ts @@ -1,4 +1,5 @@ import { OwnerCancellation } from "../domain/analysisErrorCore.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { assertProcessOwnershipInspectionActive, ProcessOwnershipInspectionCancelled, @@ -465,7 +466,10 @@ export const createDarwinProcessRunTokenReader = ( kind: "xcrun", executable: "/usr/bin/xcrun", }; - const environment = snapshotEnvironment(options.environment ?? process.env); + const environment = snapshotEnvironment( + options.environment ?? process.env, + HOST_PLATFORM.platform, + ); const compilerTimeoutMs = resolveSwiftcCompileTimeoutMs({ ...options, environment, diff --git a/src/process/snapshotEnvironment.ts b/src/process/snapshotEnvironment.ts index 654328fff7..e8f7246fec 100644 --- a/src/process/snapshotEnvironment.ts +++ b/src/process/snapshotEnvironment.ts @@ -2,7 +2,7 @@ export const mergeEnvironmentOverrides = ( existing: Readonly>, overrides: Readonly>, - platform: NodeJS.Platform = process.platform, + platform: NodeJS.Platform, ): Readonly> => { const selected = new Map(); for (const layer of [existing, overrides]) @@ -17,7 +17,7 @@ export const mergeEnvironmentOverrides = ( /** Snapshot selected variables while preserving platform and caller precedence. */ export const snapshotEnvironment = ( environment: Readonly>, - platform: NodeJS.Platform = process.platform, + platform: NodeJS.Platform, ): Readonly> => { const selected = mergeEnvironmentOverrides({}, environment, platform); if (platform !== "win32") return selected; diff --git a/src/server/createServer.ts b/src/server/createServer.ts index 62a5b83f93..704e0b444f 100644 --- a/src/server/createServer.ts +++ b/src/server/createServer.ts @@ -2,6 +2,7 @@ import { createCapabilityServices, type CapabilityServiceOptions, } from "../composition/capabilityServices.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { registerToolFamilies } from "../contracts/toolFamilyIds.js"; import { SCOPED_NO_TARGET_RECOVERY } from "./recoveryInstructions.js"; import { AnalysisSettings } from "../application/AnalysisSettings.js"; @@ -174,7 +175,10 @@ export const createServer = ( ): EvidenceMcpServer => { const session = source.kind === "session" ? source.session : undefined; const analysis = source.kind === "session" ? source.session : source.analysis; - const environment = snapshotEnvironment(options.environment ?? process.env); + const environment = snapshotEnvironment( + options.environment ?? process.env, + HOST_PLATFORM.platform, + ); const analysisSettings = options.analysisSettings ?? new AnalysisSettings(environment); const compactInputPresentation = diff --git a/src/server/providerEnvironment.ts b/src/server/providerEnvironment.ts index 3d0d2c78a1..e8444c39f2 100644 --- a/src/server/providerEnvironment.ts +++ b/src/server/providerEnvironment.ts @@ -1,8 +1,12 @@ import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; /** Capture the selected provider environment at server construction time. */ export const captureProviderEnvironment = ( providerEnvironment: Readonly | undefined, serverEnvironment: Readonly, ): Readonly => - snapshotEnvironment(providerEnvironment ?? serverEnvironment); + snapshotEnvironment( + providerEnvironment ?? serverEnvironment, + HOST_PLATFORM.platform, + ); diff --git a/src/wasm/WabtArtifactProvider.ts b/src/wasm/WabtArtifactProvider.ts index 6e5e930eea..5afff5e0a5 100644 --- a/src/wasm/WabtArtifactProvider.ts +++ b/src/wasm/WabtArtifactProvider.ts @@ -1,4 +1,5 @@ import { WabtAdmissionError } from "./WabtAdmissionError.js"; +import { HOST_PLATFORM } from "../platform/HostPlatform.js"; import { randomUUID, createHash } from "node:crypto"; import { access, writeFile } from "node:fs/promises"; import { constants } from "node:fs"; @@ -119,7 +120,10 @@ export class WabtArtifactProvider implements WasmArtifactPort { input: InspectWasmArtifactInput, options?: WasmArtifactExecutionOptions, ): Promise> { - const environment = snapshotEnvironment(this.environment); + const environment = snapshotEnvironment( + this.environment, + HOST_PLATFORM.platform, + ); try { return await this.#resources.run(() => this.#inspect(input, environment, options), diff --git a/tests/boundary/filesystem/clientConfigurationEnvironment.test.ts b/tests/boundary/filesystem/clientConfigurationEnvironment.test.ts index 42d613f2b2..2573bda4b4 100644 --- a/tests/boundary/filesystem/clientConfigurationEnvironment.test.ts +++ b/tests/boundary/filesystem/clientConfigurationEnvironment.test.ts @@ -329,9 +329,10 @@ it.skipIf(process.platform !== "win32").each([ ); if (!result.ok) throw result.error; expect(result.value.timeoutInputs?.analysisProvider).toBe(expected); - expect(snapshotEnvironment(result.value.values).REA_ANALYSIS_PROVIDER).toBe( - expected, - ); + expect( + snapshotEnvironment(result.value.values, process.platform) + .REA_ANALYSIS_PROVIDER, + ).toBe(expected); expect(Object.keys(result.value.values)).toHaveLength(1); const child = spawnSync( process.execPath, diff --git a/tests/boundary/native/pwndbgReplyFinalization.test.ts b/tests/boundary/native/pwndbgReplyFinalization.test.ts index cee654ca00..2cd08457fb 100644 --- a/tests/boundary/native/pwndbgReplyFinalization.test.ts +++ b/tests/boundary/native/pwndbgReplyFinalization.test.ts @@ -74,11 +74,14 @@ const fixture = async ( replyClose.denied = false; replyClose.onClose = undefined; replyClose.handles = []; - const environment = snapshotEnvironment({ - REA_PWNDBG_GDB: process.execPath, - REA_PWNDBG_GDBINIT: init, - REA_PWNDBG_VENV_PATH: venv, - }); + const environment = snapshotEnvironment( + { + REA_PWNDBG_GDB: process.execPath, + REA_PWNDBG_GDBINIT: init, + REA_PWNDBG_VENV_PATH: venv, + }, + process.platform, + ); const provider = new PwntoolsRecordedCrashProvider(environment); onTestFinished(async () => { replyClose.denied = false;