fix(e2e): reject invalid config writer ports · openclaw/openclaw@53bb55e

Recent Commits to openclaw:main

vincentkoc · 2026-06-19 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,12 @@ export function readPositiveIntEnv(name, fallback, env = process.env) {`
`10`	`10`	`}`
`11`	`11`	`return value;`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+export function readTcpPortEnv(name, fallback, env = process.env) {`
	`15`	`+const value = readPositiveIntEnv(name, fallback, env);`
	`16`	`+if (value > 65_535) {`
	`17`	`+const text = String(env[name] ?? fallback).trim();`
	`18`	+throw new Error(`invalid ${name}: ${text}`);
	`19`	`+}`
	`20`	`+return value;`
	`21`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Writes config fixtures for Codex media-path E2E scenarios.`
`2`	`2`	`import fs from "node:fs";`
`3`	`3`	`import path from "node:path";`
`4`		`-import { readPositiveIntEnv } from "./limits.mjs";`
	`4`	`+import { readPositiveIntEnv, readTcpPortEnv } from "./limits.mjs";`
`5`	`5`
`6`	`6`	`function requireEnv(name) {`
`7`	`7`	`const value = process.env[name];`
`@@ -16,7 +16,7 @@ const stateDir = requireEnv("OPENCLAW_STATE_DIR");`
`16`	`16`	`const workspaceDir = requireEnv("OPENCLAW_TEST_WORKSPACE_DIR");`
`17`	`17`	`const token = requireEnv("OPENCLAW_GATEWAY_TOKEN");`
`18`	`18`	`const timeoutSeconds = readPositiveIntEnv("OPENCLAW_CODEX_MEDIA_PATH_TIMEOUT_SECONDS", 180);`
`19`		`-const gatewayPort = readPositiveIntEnv("PORT", 18790);`
	`19`	`+const gatewayPort = readTcpPortEnv("PORT", 18790);`
`20`	`20`
`21`	`21`	`const config = {`
`22`	`22`	`gateway: {`

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,11 @@`
`1`	`1`	`// Config fixture writer commands for E2E scenarios.`
`2`	`2`	`import path from "node:path";`
	`3`	`+import { readPositiveIntEnv, readTcpPortEnv } from "../env-limits.mjs";`
`3`	`4`	`import { requireArg, writeJson } from "./common.mjs";`
`4`	`5`
`5`		`-function readPositiveIntEnv(name, fallback) {`
`6`		`-const text = String(process.env[name] ?? fallback).trim();`
`7`		`-if (!/^\d+$/u.test(text)) {`
`8`		-throw new Error(`invalid ${name}: ${text}`);
`9`		`-}`
`10`		`-const value = Number(text);`
`11`		`-if (!Number.isSafeInteger(value) \|\| value <= 0) {`
`12`		-throw new Error(`invalid ${name}: ${text}`);
`13`		`-}`
`14`		`-return value;`
`15`		`-}`
`16`		`-`
`17`	`6`	`function writeConfig(kind) {`
`18`	`7`	`const configPath = requireArg(process.env.OPENCLAW_CONFIG_PATH, "OPENCLAW_CONFIG_PATH");`
`19`		`-const port = readPositiveIntEnv("PORT", 18789);`
	`8`	`+const port = readTcpPortEnv("PORT", 18789);`
`20`	`9`	`const config =`
`21`	`10`	`kind === "config-reload"`
`22`	`11`	`? {`
`@@ -47,7 +36,7 @@ function writeConfig(kind) {`
`47`	`36`	`ssrfPolicy: { allowedHostnames: ["127.0.0.1"] },`
`48`	`37`	`profiles: {`
`49`	`38`	`"docker-cdp": {`
`50`		-cdpUrl: `http://127.0.0.1:${readPositiveIntEnv("CDP_PORT", 19222)}`,
	`39`	+cdpUrl: `http://127.0.0.1:${readTcpPortEnv("CDP_PORT", 19222)}`,
`51`	`40`	`color: "#FF4500",`
`52`	`41`	`},`
`53`	`42`	`},`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Config writer for OpenAI chat tools E2E scenarios.`
`2`	`2`	`import fs from "node:fs";`
`3`	`3`	`import path from "node:path";`
	`4`	`+import { readPositiveIntEnv, readTcpPortEnv } from "../env-limits.mjs";`
`4`	`5`
`5`	`6`	`function requireEnv(name) {`
`6`	`7`	`const value = process.env[name];`
`@@ -10,25 +11,13 @@ function requireEnv(name) {`
`10`	`11`	`return value;`
`11`	`12`	`}`
`12`	`13`
`13`		`-function readPositiveIntEnv(name, fallback) {`
`14`		`-const text = String(process.env[name] ?? fallback).trim();`
`15`		`-if (!/^\d+$/u.test(text)) {`
`16`		-throw new Error(`invalid ${name}: ${text}`);
`17`		`-}`
`18`		`-const value = Number(text);`
`19`		`-if (!Number.isSafeInteger(value) \|\| value <= 0) {`
`20`		-throw new Error(`invalid ${name}: ${text}`);
`21`		`-}`
`22`		`-return value;`
`23`		`-}`
`24`		`-`
`25`	`14`	`const configPath = requireEnv("OPENCLAW_CONFIG_PATH");`
`26`	`15`	`const stateDir = requireEnv("OPENCLAW_STATE_DIR");`
`27`	`16`	`const workspaceDir = requireEnv("OPENCLAW_TEST_WORKSPACE_DIR");`
`28`	`17`	`const modelRef = requireEnv("OPENCLAW_OPENAI_CHAT_TOOLS_MODEL");`
`29`	`18`	`const token = requireEnv("OPENCLAW_GATEWAY_TOKEN");`
`30`	`19`	`const timeoutSeconds = readPositiveIntEnv("OPENCLAW_OPENAI_CHAT_TOOLS_TIMEOUT_SECONDS", 180);`
`31`		`-const gatewayPort = readPositiveIntEnv("PORT", 18789);`
	`20`	`+const gatewayPort = readTcpPortEnv("PORT", 18789);`
`32`	`21`	`const [providerId, modelId] = modelRef.split("/");`
`33`	`22`	`if (providerId !== "openai" \|\| !modelId) {`
`34`	`23`	throw new Error(`OPENCLAW_OPENAI_CHAT_TOOLS_MODEL must be openai/*, got ${modelRef}`);

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,14 @@ describe("codex media path limits", () => {`
`129`	`129`	`expect(result.status).not.toBe(0);`
`130`	`130`	`expect(result.stderr).toContain("invalid OPENCLAW_CODEX_MEDIA_PATH_TIMEOUT_SECONDS: 1e3");`
`131`	`131`	`});`
	`132`	`+`
	`133`	`+it("rejects out-of-range write-config gateway ports", () => {`
	`134`	`+const root = makeTempRoot();`
	`135`	`+const result = runWriteConfig(root, { PORT: "65536" });`
	`136`	`+`
	`137`	`+expect(result.status).not.toBe(0);`
	`138`	`+expect(result.stderr).toContain("invalid PORT: 65536");`
	`139`	`+});`
`132`	`140`	`});`
`133`	`141`
`134`	`142`	`describe("codex media path fake app-server", () => {`

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,18 @@ describe("scripts/e2e/lib/fixture.mjs config commands", () => {`
`44`	`44`	`}`
`45`	`45`	`});`
`46`	`46`
	`47`	`+it("rejects out-of-range gateway port env values", () => {`
	`48`	`+const root = makeTempRoot();`
	`49`	`+try {`
	`50`	`+const result = runFixture(root, "config-reload", [], { PORT: "65536" });`
	`51`	`+`
	`52`	`+expect(result.status).not.toBe(0);`
	`53`	`+expect(result.stderr).toContain("invalid PORT: 65536");`
	`54`	`+} finally {`
	`55`	`+rmSync(root, { recursive: true, force: true });`
	`56`	`+}`
	`57`	`+});`
	`58`	`+`
`47`	`59`	`it("writes strict positive browser CDP ports into generated config", () => {`
`48`	`60`	`const root = makeTempRoot();`
`49`	`61`	`try {`
`@@ -70,6 +82,18 @@ describe("scripts/e2e/lib/fixture.mjs config commands", () => {`
`70`	`82`	`}`
`71`	`83`	`});`
`72`	`84`
	`85`	`+it("rejects out-of-range browser CDP port env values", () => {`
	`86`	`+const root = makeTempRoot();`
	`87`	`+try {`
	`88`	`+const result = runFixture(root, "browser-cdp", [], { CDP_PORT: "65536" });`
	`89`	`+`
	`90`	`+expect(result.status).not.toBe(0);`
	`91`	`+expect(result.stderr).toContain("invalid CDP_PORT: 65536");`
	`92`	`+} finally {`
	`93`	`+rmSync(root, { recursive: true, force: true });`
	`94`	`+}`
	`95`	`+});`
	`96`	`+`
`73`	`97`	`it("rejects loose Open WebUI provider timeout values", () => {`
`74`	`98`	`const root = makeTempRoot();`
`75`	`99`	`try {`

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,18 @@ describe("scripts/e2e/lib/openai-chat-tools/client.mjs", () => {`
`236`	`236`	`}`
`237`	`237`	`});`
`238`	`238`
	`239`	`+it("rejects out-of-range write-config gateway ports", () => {`
	`240`	`+const root = mkdtempSync(path.join(tmpdir(), "openclaw-openai-chat-tools-"));`
	`241`	`+try {`
	`242`	`+const result = runWriteConfig(root, { PORT: "65536" });`
	`243`	`+`
	`244`	`+expect(result.status).not.toBe(0);`
	`245`	`+expect(result.stderr).toContain("invalid PORT: 65536");`
	`246`	`+} finally {`
	`247`	`+rmSync(root, { force: true, recursive: true });`
	`248`	`+}`
	`249`	`+});`
	`250`	`+`
`239`	`251`	`it("writes strict positive timeout and port values into generated config", () => {`
`240`	`252`	`const root = mkdtempSync(path.join(tmpdir(), "openclaw-openai-chat-tools-"));`
`241`	`253`	`try {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main