github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 07:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gateway): share IPv4 input validator

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 06:37:41 +00:00
parent cc2a63cd2d
commit 4950fcfb33
3 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/commands/configure.gateway.ts
View File

@@ -2,6 +2,7 @@ import type { OpenClawConfig } from "../config/config.js";
import type { RuntimeEnv } from "../runtime.js"; import type { RuntimeEnv } from "../runtime.js";
import { resolveGatewayPort } from "../config/config.js"; import { resolveGatewayPort } from "../config/config.js";
import { findTailscaleBinary } from "../infra/tailscale.js"; import { findTailscaleBinary } from "../infra/tailscale.js";
import { validateIPv4AddressInput } from "../shared/net/ipv4.js";
import { note } from "../terminal/note.js"; import { note } from "../terminal/note.js";
import { buildGatewayAuthConfig } from "./configure.gateway-auth.js"; import { buildGatewayAuthConfig } from "./configure.gateway-auth.js";
import { confirm, select, text } from "./configure.shared.js"; import { confirm, select, text } from "./configure.shared.js";
@@ -72,25 +73,7 @@ export async function promptGatewayConfig(
await text({ await text({
message: "Custom IP address", message: "Custom IP address",
placeholder: "192.168.1.100", placeholder: "192.168.1.100",
validate: (value) => { validate: validateIPv4AddressInput,
if (!value) {
return "IP address is required for custom bind mode";
}
const trimmed = value.trim();
const parts = trimmed.split(".");
if (parts.length !== 4) {
return "Invalid IPv4 address (e.g., 192.168.1.100)";
}
if (
parts.every((part) => {
const n = parseInt(part, 10);
return !Number.isNaN(n) && n >= 0 && n <= 255 && part === String(n);
})
) {
return undefined;
}
return "Invalid IPv4 address (each octet must be 0-255)";
},
}), }),
runtime, runtime,
); );

19
src/shared/net/ipv4.ts Normal file
View File

@@ -0,0 +1,19 @@
export function validateIPv4AddressInput(value: string | undefined): string | undefined {
if (!value) {
return "IP address is required for custom bind mode";
}
const trimmed = value.trim();
const parts = trimmed.split(".");
if (parts.length !== 4) {
return "Invalid IPv4 address (e.g., 192.168.1.100)";
}
if (
parts.every((part) => {
const n = parseInt(part, 10);
return !Number.isNaN(n) && n >= 0 && n <= 255 && part === String(n);
})
) {
return undefined;
}
return "Invalid IPv4 address (each octet must be 0-255)";
}

21
src/wizard/onboarding.gateway-config.ts
View File

@@ -13,6 +13,7 @@ import {
validateGatewayPasswordInput, validateGatewayPasswordInput,
} from "../commands/onboard-helpers.js"; } from "../commands/onboard-helpers.js";
import { findTailscaleBinary } from "../infra/tailscale.js"; import { findTailscaleBinary } from "../infra/tailscale.js";
import { validateIPv4AddressInput } from "../shared/net/ipv4.js";
// These commands are "high risk" (privacy writes/recording) and should be // These commands are "high risk" (privacy writes/recording) and should be
// explicitly armed by the user when they want to use them. // explicitly armed by the user when they want to use them.
@@ -85,25 +86,7 @@ export async function configureGatewayForOnboarding(
message: "Custom IP address", message: "Custom IP address",
placeholder: "192.168.1.100", placeholder: "192.168.1.100",
initialValue: customBindHost ?? "", initialValue: customBindHost ?? "",
validate: (value) => { validate: validateIPv4AddressInput,
if (!value) {
return "IP address is required for custom bind mode";
}
const trimmed = value.trim();
const parts = trimmed.split(".");
if (parts.length !== 4) {
return "Invalid IPv4 address (e.g., 192.168.1.100)";
}
if (
parts.every((part) => {
const n = parseInt(part, 10);
return !Number.isNaN(n) && n >= 0 && n <= 255 && part === String(n);
})
) {
return undefined;
}
return "Invalid IPv4 address (each octet must be 0-255)";
},
}); });
customBindHost = typeof input === "string" ? input.trim() : undefined; customBindHost = typeof input === "string" ? input.trim() : undefined;
} }