fix(web): reject NUL bytes in web tool local path inputs

Four web tools accepted caller-selected local paths as plain strings, so
a NUL byte passed contract validation and reached filesystem calls. The
services only checked isAbsolute, and isAbsolute admits a NUL, so the
failure surfaced later as a raw ERR_INVALID_ARG_VALUE instead of a named
input constraint. Every other local-input tool already refuses NUL through
the shared local-path schema, and the existing OS-invalid-local-input
harness covers those but not these web tools.

inspect_web_network_capture.capture_path, export_web_scripts.capture_path
and output_directory, trace_web_source_location.manifest_path and
source_map.path, and trace_web_module_imports.manifest_path and
import_map.path now use localPathStringSchema. Each field already required
a nonempty string, so the advertised pattern and minLength stay the same
and only the NUL refusal is added.

Validation: a new schema test rejects NUL in all seven fields while
accepting ordinary absolute paths; the four tools are added to the
OS-invalid-local-input harness and reject NUL through the real advertised
MCP contracts; typecheck, oxlint, oxfmt, and toolSchemaValidity with a
regenerated catalog. Two webScriptExport boundary cases fail identically
with and without this change on this Windows host (symlink EPERM and
private-runtime-root authority), so they are environmental.
This commit is contained in:
DeryFerd
2026-10-11 23:32:52 +07:00
parent 7c207c7951
commit 499ac18011
7 changed files with 165 additions and 32 deletions
+7 -8
View File
@@ -1,6 +1,7 @@
import { z } from "zod";
import { digestSchema } from "./digests.js";
import { localPathStringSchema } from "./localPath.js";
import {
exportedWebScriptSchema,
webScriptExportManifestSchema,
@@ -8,10 +9,9 @@ import {
/** Inspect one captured script's native ES module relationships. */
export const webModuleTraceInputSchema = z.strictObject({
manifest_path: z
.string()
.min(1)
.describe("Absolute path to an export_web_scripts manifest"),
manifest_path: localPathStringSchema.describe(
"Absolute path to an export_web_scripts manifest",
),
script_index: z
.number()
.int()
@@ -26,10 +26,9 @@ export const webModuleTraceInputSchema = z.strictObject({
),
import_map: z
.strictObject({
path: z
.string()
.min(1)
.describe("Absolute local import-map JSON path; no fetch"),
path: localPathStringSchema.describe(
"Absolute local import-map JSON path; no fetch",
),
base_url: z
.string()
.min(1)
+4 -4
View File
@@ -1,5 +1,6 @@
import { z } from "zod";
import { jsonValueSchema } from "./jsonValue.js";
import { localPathStringSchema } from "./localPath.js";
/** Complete historical evidence budgets; exceeding a budget returns no partial capture. */
export const WEB_NETWORK_CAPTURE_LIMITS = {
@@ -11,10 +12,9 @@ export const WEB_NETWORK_CAPTURE_LIMITS = {
/** Inspect an explicit retained capture without contacting its recorded destinations. */
export const inspectWebNetworkCaptureInputSchema = z.strictObject({
capture_path: z
.string()
.min(1)
.describe("Absolute local HAR or mitmproxy capture path."),
capture_path: localPathStringSchema.describe(
"Absolute local HAR or mitmproxy capture path.",
),
format: z.enum(["har", "mitmproxy"]),
record_ordinals: z
.array(z.number().int().nonnegative())
+4 -4
View File
@@ -1,13 +1,13 @@
import { z } from "zod";
import { digestSchema } from "./digests.js";
import { localPathStringSchema } from "./localPath.js";
import { webScriptExportManifestSchema } from "./webScriptExport.js";
/** Select one source from an existing captured-script export. */
export const selectedWebScriptInputSchema = z.strictObject({
manifest_path: z
.string()
.min(1)
.describe("Absolute export_web_scripts manifest path"),
manifest_path: localPathStringSchema.describe(
"Absolute export_web_scripts manifest path",
),
script_index: z
.number()
.int()
+7 -12
View File
@@ -3,21 +3,16 @@ import { z } from "zod";
import { browserCompletenessSchema } from "./browserCompleteness.js";
import { browserScenarioCompletenessSchema } from "./browserScenarioCaptureValues.js";
import { digestSchema, prefixedDigestSchema } from "./digests.js";
import { localPathStringSchema } from "./localPath.js";
/** Export already captured scripts into one absent, caller-selected directory. */
export const exportWebScriptsInputSchema = z.strictObject({
capture_path: z
.string()
.min(1)
.describe(
"Absolute filesystem path to saved inspect_web_page or capture_browser_scenario JSON, normalized result or complete Evidence",
),
output_directory: z
.string()
.min(1)
.describe(
"Absolute absent filesystem directory for verified scripts and manifest; parent directory must exist",
),
capture_path: localPathStringSchema.describe(
"Absolute filesystem path to saved inspect_web_page or capture_browser_scenario JSON, normalized result or complete Evidence",
),
output_directory: localPathStringSchema.describe(
"Absolute absent filesystem directory for verified scripts and manifest; parent directory must exist",
),
});
export type ExportWebScriptsInput = z.output<
typeof exportWebScriptsInputSchema
+4 -4
View File
@@ -1,5 +1,6 @@
import { z } from "zod";
import { digestSchema } from "./digests.js";
import { localPathStringSchema } from "./localPath.js";
import { exportedWebScriptSchema } from "./webScriptExport.js";
import {
capturedWebManifestIdentitySchema,
@@ -17,10 +18,9 @@ export const webSourcePositionSchema = z.strictObject({
export const webSourceLocationInputSchema = selectedWebScriptInputSchema.extend(
{
source_map: z.strictObject({
path: z
.string()
.min(1)
.describe("Absolute local source-map path; no fetch"),
path: localPathStringSchema.describe(
"Absolute local source-map path; no fetch",
),
url: z
.string()
.min(1)
+103
View File
@@ -0,0 +1,103 @@
import { describe, expect, it } from "vitest";
import { inspectWebNetworkCaptureInputSchema } from "./webNetworkCapture.js";
import { webModuleTraceInputSchema } from "./webModuleTrace.js";
import { exportWebScriptsInputSchema } from "./webScriptExport.js";
import { webSourceLocationInputSchema } from "./webSourceLocation.js";
const nul = "/tmp/selected\0filename";
/**
* Every caller-selected local path these web tools accept must refuse NUL at
* the contract boundary, matching the shared local-path schema used by the
* other local-input tools. A NUL is not a valid filesystem byte on any
* supported host, and a downstream `isAbsolute` check admits it.
*/
describe("web tool local path inputs", () => {
it.each([
[
"export_web_scripts capture_path",
() =>
exportWebScriptsInputSchema.safeParse({
capture_path: nul,
output_directory: "/tmp/exported-scripts",
}).success,
],
[
"export_web_scripts output_directory",
() =>
exportWebScriptsInputSchema.safeParse({
capture_path: "/tmp/capture.json",
output_directory: nul,
}).success,
],
[
"inspect_web_network_capture capture_path",
() =>
inspectWebNetworkCaptureInputSchema.safeParse({
capture_path: nul,
format: "har",
}).success,
],
[
"trace_web_source_location manifest_path",
() =>
webSourceLocationInputSchema.safeParse({
manifest_path: nul,
script_index: 0,
source_map: { path: "/tmp/source.map", url: "http://127.0.0.1/a" },
generated_position: { line: 1, column: 0 },
}).success,
],
[
"trace_web_source_location source_map.path",
() =>
webSourceLocationInputSchema.safeParse({
manifest_path: "/tmp/manifest.json",
script_index: 0,
source_map: { path: nul, url: "http://127.0.0.1/a" },
generated_position: { line: 1, column: 0 },
}).success,
],
[
"trace_web_module_imports manifest_path",
() =>
webModuleTraceInputSchema.safeParse({
manifest_path: nul,
script_index: 0,
}).success,
],
[
"trace_web_module_imports import_map.path",
() =>
webModuleTraceInputSchema.safeParse({
manifest_path: "/tmp/manifest.json",
script_index: 0,
import_map: { path: nul, base_url: "http://127.0.0.1/a" },
}).success,
],
])("rejects NUL in %s", (_label, parse) => {
expect(parse()).toBe(false);
});
it("still accepts ordinary absolute paths", () => {
expect(
exportWebScriptsInputSchema.safeParse({
capture_path: "/tmp/capture.json",
output_directory: "/tmp/exported-scripts",
}).success,
).toBe(true);
expect(
inspectWebNetworkCaptureInputSchema.safeParse({
capture_path: "/tmp/session.har",
format: "har",
}).success,
).toBe(true);
expect(
webModuleTraceInputSchema.safeParse({
manifest_path: "/tmp/manifest.json",
script_index: 0,
}).success,
).toBe(true);
});
});
@@ -91,6 +91,42 @@ const pathRequests: readonly [string, Record<string, unknown>][] = [
),
["capture_electron_scenario", { ...electron, args: ["a\0b"] }],
["demangle_swift", { symbols: ["abc\0def"] }],
["inspect_web_network_capture", { capture_path: nul, format: "har" }],
[
"export_web_scripts",
{ capture_path: nul, output_directory: "/tmp/exported-scripts" },
],
[
"export_web_scripts",
{ capture_path: "/tmp/capture.json", output_directory: nul },
],
[
"trace_web_source_location",
{
manifest_path: nul,
script_index: 0,
source_map: { path: "/tmp/source.map", url: "http://127.0.0.1/a" },
generated_position: { line: 1, column: 0 },
},
],
[
"trace_web_source_location",
{
manifest_path: "/tmp/manifest.json",
script_index: 0,
source_map: { path: nul, url: "http://127.0.0.1/a" },
generated_position: { line: 1, column: 0 },
},
],
["trace_web_module_imports", { manifest_path: nul, script_index: 0 }],
[
"trace_web_module_imports",
{
manifest_path: "/tmp/manifest.json",
script_index: 0,
import_map: { path: nul, base_url: "http://127.0.0.1/a" },
},
],
];
it("rejects OS-invalid local inputs through the real advertised MCP contracts", async () => {