fix: validate configure gateway ports strictly · openclaw/openclaw@e8f2908

Recent Commits to openclaw:main

steipete · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,7 @@ describe("parsePort (#83899, #83900)", () => {`
`37`	`37`	`expect(parsePort(Number.POSITIVE_INFINITY)).toBeNull();`
`38`	`38`	`expect(parsePort("abc")).toBeNull();`
`39`	`39`	`expect(parsePort("8080ms")).toBeNull();`
	`40`	`+expect(parsePort("0x10")).toBeNull();`
	`41`	`+expect(parsePort("1e3")).toBeNull();`
`40`	`42`	`});`
`41`	`43`	`});`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { formatPortRangeHint } from "../cli/error-format.js";`
	`2`	`+import { parsePort } from "../cli/shared/parse-port.js";`
`2`	`3`	`import { resolveGatewayPort } from "../config/config.js";`
`3`	`4`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`4`	`5`	`import { isValidEnvSecretRefId, type SecretInput } from "../config/types.secrets.js";`
`@@ -8,7 +9,6 @@ import {`
`8`	`9`	`TAILSCALE_EXPOSURE_OPTIONS,`
`9`	`10`	`TAILSCALE_MISSING_BIN_NOTE_LINES,`
`10`	`11`	`} from "../gateway/gateway-config-prompts.shared.js";`
`11`		`-import { parseStrictPositiveInteger } from "../infra/parse-finite-number.js";`
`12`	`12`	`import { findTailscaleBinary } from "../infra/tailscale.js";`
`13`	`13`	`import type { RuntimeEnv } from "../runtime.js";`
`14`	`14`	`import { resolveDefaultSecretProviderAlias } from "../secrets/ref-contract.js";`
`@@ -29,8 +29,7 @@ type GatewayAuthChoice = "token" \| "password" \| "trusted-proxy";`
`29`	`29`	`type GatewayTokenInputMode = "plaintext" \| "ref";`
`30`	`30`
`31`	`31`	`function validateGatewayPortInput(value: unknown): string \| undefined {`
`32`		`-const port = Number(typeof value === "string" ? value.trim() : value);`
`33`		`-if (!Number.isInteger(port) \|\| port < 1 \|\| port > 65_535) {`
	`32`	`+if (parsePort(value) === null) {`
`34`	`33`	`return formatPortRangeHint();`
`35`	`34`	`}`
`36`	`35`	`return undefined;`
`@@ -52,7 +51,7 @@ export async function promptGatewayConfig(`
`52`	`51`	`}),`
`53`	`52`	`runtime,`
`54`	`53`	`);`
`55`		`-const port = parseStrictPositiveInteger(portRaw) ?? resolveGatewayPort(cfg);`
	`54`	`+const port = parsePort(portRaw) ?? resolveGatewayPort(cfg);`
`56`	`55`
`57`	`56`	`let bind = guardCancel(`
`58`	`57`	`await select({`

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ import { describeCodexNativeWebSearch } from "../agents/codex-native-web-search.`
`5`	`5`	`import { formatCliCommand } from "../cli/command-format.js";`
`6`	`6`	`import { formatPortRangeHint } from "../cli/error-format.js";`
`7`	`7`	`import { commitConfigWithPendingPluginInstalls } from "../cli/plugins-install-record-commit.js";`
	`8`	`+import { parsePort } from "../cli/shared/parse-port.js";`
`8`	`9`	`import { readConfigFileSnapshot, resolveGatewayPort } from "../config/config.js";`
`9`	`10`	`import { logConfigUpdated } from "../config/logging.js";`
`10`	`11`	`import { ConfigMutationConflictError } from "../config/mutate.js";`
`11`	`12`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`12`	`13`	`import { ensureControlUiAssetsBuilt } from "../infra/control-ui-assets.js";`
`13`		`-import { parseStrictPositiveInteger } from "../infra/parse-finite-number.js";`
`14`	`14`	`import { resolvePluginContributionOwners } from "../plugins/plugin-registry.js";`
`15`	`15`	`import type { RuntimeEnv } from "../runtime.js";`
`16`	`16`	`import { defaultRuntime } from "../runtime.js";`
`@@ -65,8 +65,7 @@ const setupPluginConfigModuleLoader = createLazyImportLoader<SetupPluginConfigMo`
`65`	`65`	`);`
`66`	`66`
`67`	`67`	`function validateGatewayPortInput(value: unknown): string \| undefined {`
`68`		`-const port = Number(typeof value === "string" ? value.trim() : value);`
`69`		`-if (!Number.isInteger(port) \|\| port < 1 \|\| port > 65_535) {`
	`68`	`+if (parsePort(value) === null) {`
`70`	`69`	`return formatPortRangeHint();`
`71`	`70`	`}`
`72`	`71`	`return undefined;`
`@@ -641,7 +640,7 @@ export async function runConfigureWizard(`
`641`	`640`	`}),`
`642`	`641`	`runtime,`
`643`	`642`	`);`
`644`		`-gatewayPort = parseStrictPositiveInteger(portInput) ?? gatewayPort;`
	`643`	`+gatewayPort = parsePort(portInput) ?? gatewayPort;`
`645`	`644`	`};`
`646`	`645`
`647`	`646`	`if (selectedSections) {`

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

推荐订阅源

Recent Commits to openclaw:main