ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-24 19:35:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(macos): reject invalid gateway ports before tunnel setup (#128260)

Browse Source
This commit is contained in:
Peter Steinberger
2026-08-23 09:21:05 -07:00
committed by GitHub
parent 1d54ce376e
commit bf91e00d36
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/macos/Sources/OpenClaw/GatewayEnvironment.swift
+3 -3
View File
@@ -122,12 +122,12 @@ enum GatewayEnvironment {
{
if let raw = environment["OPENCLAW_GATEWAY_PORT"] {
let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
if let parsed = Int(trimmed), parsed > 0 { return parsed }
if let parsed = Int(trimmed), (1...65535).contains(parsed) { return parsed }
}
if let configPort, configPort > 0 {
if let configPort, (1...65535).contains(configPort) {
return configPort
}
return storedPort > 0 ? storedPort : profile.defaultGatewayPort
return (1...65535).contains(storedPort) ? storedPort : profile.defaultGatewayPort
}
static func expectedGatewayVersion() -> Semver? {
apps/macos/Tests/OpenClawIPCTests/GatewayEnvironmentTests.swift
+15
View File
@@ -124,6 +124,21 @@ struct GatewayEnvironmentTests {
configPort: nil,
storedPort: 23001,
profile: work) == 23001)
#expect(GatewayEnvironment.resolvedGatewayPort(
environment: ["OPENCLAW_GATEWAY_PORT": "65536"],
configPort: 22001,
storedPort: 23001,
profile: work) == 22001)
#expect(GatewayEnvironment.resolvedGatewayPort(
environment: [:],
configPort: 65536,
storedPort: 23001,
profile: work) == 23001)
#expect(GatewayEnvironment.resolvedGatewayPort(
environment: [:],
configPort: nil,
storedPort: 65536,
profile: work) == work.defaultGatewayPort)
#expect(AppProfile(environment: [:]).defaultGatewayPort == 18789)
}