vrr/openclaw
2
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-09 15:59:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix(wizard): reject loose gateway port input (#98689)

Browse source 
* fix(wizard): reject loose gateway port input

* fix(wizard): reuse shared gateway port parser
This commit is contained in:
qingminlong 2026-07-02 09:06:21 +08:00 • committed by GitHub
parent 1cbcff7c89
commit 40e02a418c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/wizard/setup.gateway-config.test.ts
View file

@ -39,7 +39,14 @@ describe("configureGatewayForSetup", () => {
return buildWizardPrompter({
select,
text: vi.fn(async () => textQueue.shift() as string),
text: vi.fn(async (paramsLocal) => {
const value = textQueue.shift() as string;
const error = typeof value === "string" ? paramsLocal.validate?.(value) : undefined;
if (error) {
throw new Error(error);
}
return value;
}),
});
}
@ -100,6 +107,14 @@ describe("configureGatewayForSetup", () => {
expect(result.nextConfig.gateway?.nodes?.denyCommands).toContain("screen.record");
});
it.each(["1e3", "0x1000"])("rejects loose gateway port input: %s", async (port) => {
mocks.randomToken.mockReturnValue("generated-token");
await expect(runGatewayConfig({ textQueue: [port] })).rejects.toThrow(
"Use a port number from 1 to 65535",
);
});
it("prefers OPENCLAW_GATEWAY_TOKEN during quickstart token setup", async () => {
const prevToken = process.env.OPENCLAW_GATEWAY_TOKEN;
process.env.OPENCLAW_GATEWAY_TOKEN = "token-from-env";

22
src/wizard/setup.gateway-config.ts
View file

@ -1,6 +1,7 @@
// Setup gateway config helpers build gateway config from onboarding answers.
import { validateIPv4AddressInput } from "@openclaw/net-policy/ipv4";
import { formatPortRangeHint } from "../cli/error-format.js";
import { parsePort } from "../cli/shared/parse-port.js";
import {
normalizeGatewayTokenInput,
randomToken,
@ -62,8 +63,7 @@ function normalizeWizardTextInput(value: unknown): string {
}
function validateGatewayPortInput(value: unknown): string | undefined {
const port = Number(normalizeWizardTextInput(value));
if (!Number.isInteger(port) || port < 1 || port > 65_535) {
if (parsePort(value) === null) {
return formatPortRangeHint();
}
return undefined;
@ -78,16 +78,16 @@ export async function configureGatewayForSetup(
const port =
flow === "quickstart"
? quickstartGateway.port
: Number.parseInt(
normalizeWizardTextInput(
await prompter.text({
message: t("wizard.gateway.port"),
initialValue: String(localPort),
validate: validateGatewayPortInput,
}),
),
10,
: parsePort(
await prompter.text({
message: t("wizard.gateway.port"),
initialValue: String(localPort),
validate: validateGatewayPortInput,
}),
);
if (port === null) {
throw new Error(formatPortRangeHint());
}
let bind: GatewayWizardSettings["bind"] =
flow === "quickstart"