mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-03 14:01:38 +00:00
* fix(macos): resolve OPENCLAW_STATE_DIR in openclaw-mac CLI config resolution Add shared resolveOpenClawConfigURL() to GatewayConfig.swift with precedence: OPENCLAW_CONFIG_PATH > OPENCLAW_STATE_DIR > default home. Switch ConfigureRemoteCommand and loadGatewayConfig to use it. Add focused tests for all three precedence paths. * fix(macos): honor state directory in openclaw-mac Use one normalized config resolver for connect, wizard, and configure-remote, with explicit config path precedence over the selected state directory. Co-authored-by: liuhao1024 <sunsky.lau@gmail.com> --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
340 lines
16 KiB
Swift
340 lines
16 KiB
Swift
import Foundation
|
|
import Testing
|
|
@testable import OpenClawMacCLI
|
|
|
|
@Suite(.serialized)
|
|
struct ConfigureRemoteCommandTests {
|
|
@Test @MainActor func `configure remote writes ssh config and app defaults`() async throws {
|
|
let configURL = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw-configure-remote-\(UUID().uuidString).json")
|
|
defer { try? FileManager().removeItem(at: configURL) }
|
|
|
|
let defaultSuites = [
|
|
"ConfigureRemoteCommandTests.release.\(UUID().uuidString)",
|
|
"ConfigureRemoteCommandTests.debug.\(UUID().uuidString)",
|
|
]
|
|
let defaultsBySuite = defaultSuites.compactMap { suite in
|
|
UserDefaults(suiteName: suite).map { (suite, $0) }
|
|
}
|
|
defer {
|
|
for (suite, _) in defaultsBySuite {
|
|
UserDefaults.standard.removePersistentDomain(forName: suite)
|
|
}
|
|
}
|
|
|
|
try await TestIsolation.withIsolatedState(env: ["OPENCLAW_CONFIG_PATH": configURL.path]) {
|
|
let output = try configureRemote(
|
|
.init(
|
|
sshTarget: "alice@gateway.example",
|
|
localPort: 19089,
|
|
remotePort: 18789,
|
|
sshHostKeyPolicy: "openssh",
|
|
token: "test-token", // pragma: allowlist secret
|
|
password: nil,
|
|
identity: nil,
|
|
projectRoot: nil,
|
|
cliPath: "/opt/homebrew/bin/openclaw"),
|
|
defaultsSuites: defaultSuites)
|
|
|
|
#expect(output.status == "ok")
|
|
#expect(output.localUrl == "ws://127.0.0.1:19089")
|
|
#expect(output.remotePort == 18789)
|
|
#expect(output.sshHostKeyPolicy == "openssh")
|
|
|
|
let data = try Data(contentsOf: configURL)
|
|
let root = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])
|
|
let gateway = try #require(root["gateway"] as? [String: Any])
|
|
let remote = try #require(gateway["remote"] as? [String: Any])
|
|
#expect(gateway["mode"] as? String == "remote")
|
|
#expect(gateway["port"] as? Int == 19089)
|
|
#expect(remote["transport"] as? String == "ssh")
|
|
#expect(remote["url"] as? String == "ws://127.0.0.1:19089")
|
|
#expect(remote["remotePort"] as? Int == 18789)
|
|
#expect(remote["sshTarget"] as? String == "alice@gateway.example")
|
|
#expect(remote["sshHostKeyPolicy"] as? String == "openssh")
|
|
#expect(remote["token"] as? String == "test-token") // pragma: allowlist secret
|
|
|
|
for (_, defaults) in defaultsBySuite {
|
|
#expect(defaults.string(forKey: "openclaw.connectionMode") == "remote")
|
|
#expect(defaults.string(forKey: "openclaw.remoteTarget") == "alice@gateway.example")
|
|
#expect(defaults.bool(forKey: "openclaw.onboardingSeen") == true)
|
|
#expect(defaults.string(forKey: "openclaw.remoteCliPath") == "/opt/homebrew/bin/openclaw")
|
|
}
|
|
}
|
|
}
|
|
|
|
@Test @MainActor func `configure remote preserves existing optional credentials when flags omitted`() async throws {
|
|
let configURL = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw-configure-remote-preserve-\(UUID().uuidString).json")
|
|
defer { try? FileManager().removeItem(at: configURL) }
|
|
|
|
let initial: [String: Any] = [
|
|
"gateway": [
|
|
"remote": [
|
|
"token": "keep-token", // pragma: allowlist secret
|
|
"sshIdentity": "/tmp/id",
|
|
"sshHostKeyPolicy": "openssh",
|
|
"sshTarget": "alice@gateway.example",
|
|
],
|
|
],
|
|
]
|
|
let initialData = try JSONSerialization.data(withJSONObject: initial, options: [.prettyPrinted])
|
|
try FileManager().createDirectory(at: configURL.deletingLastPathComponent(), withIntermediateDirectories: true)
|
|
try initialData.write(to: configURL)
|
|
|
|
try await TestIsolation.withIsolatedState(env: ["OPENCLAW_CONFIG_PATH": configURL.path]) {
|
|
try configureRemote(.init(sshTarget: "alice@gateway.example"), defaultsSuites: [])
|
|
|
|
let data = try Data(contentsOf: configURL)
|
|
let root = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])
|
|
let gateway = try #require(root["gateway"] as? [String: Any])
|
|
let remote = try #require(gateway["remote"] as? [String: Any])
|
|
#expect(remote["token"] as? String == "keep-token") // pragma: allowlist secret
|
|
#expect(remote["sshIdentity"] as? String == "/tmp/id")
|
|
#expect(remote["sshHostKeyPolicy"] as? String == "openssh")
|
|
}
|
|
}
|
|
|
|
@Test @MainActor func `configure remote defaults SSH host key policy to strict`() async throws {
|
|
let configURL = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw-configure-remote-strict-\(UUID().uuidString).json")
|
|
defer { try? FileManager().removeItem(at: configURL) }
|
|
|
|
let initial: [String: Any] = [
|
|
"gateway": [
|
|
"remote": [
|
|
"sshHostKeyPolicy": "openssh",
|
|
"sshTarget": "old-gateway-alias",
|
|
],
|
|
],
|
|
]
|
|
let initialData = try JSONSerialization.data(withJSONObject: initial, options: [.prettyPrinted])
|
|
try initialData.write(to: configURL)
|
|
|
|
try await TestIsolation.withIsolatedState(env: ["OPENCLAW_CONFIG_PATH": configURL.path]) {
|
|
let output = try configureRemote(.init(sshTarget: "gateway-alias"), defaultsSuites: [])
|
|
|
|
#expect(output.sshHostKeyPolicy == "strict")
|
|
let data = try Data(contentsOf: configURL)
|
|
let root = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])
|
|
let gateway = try #require(root["gateway"] as? [String: Any])
|
|
let remote = try #require(gateway["remote"] as? [String: Any])
|
|
#expect(remote["sshHostKeyPolicy"] as? String == "strict")
|
|
}
|
|
}
|
|
|
|
@Test func `configure remote rejects invalid explicit ports`() throws {
|
|
#expect(throws: Error.self) {
|
|
_ = try ConfigureRemoteOptions.parse(["--ssh-target", "alice@gateway.example", "--remote-port", "99999"])
|
|
}
|
|
#expect(throws: Error.self) {
|
|
_ = try ConfigureRemoteOptions.parse(["--ssh-target", "alice@gateway.example", "--local-port", "nope"])
|
|
}
|
|
}
|
|
|
|
@Test func `configure remote validates SSH host key policy`() throws {
|
|
#expect(ConfigureRemoteOptions().sshHostKeyPolicy == nil)
|
|
#expect(try ConfigureRemoteOptions.parse([
|
|
"--ssh-target", "gateway-alias",
|
|
"--ssh-host-key-policy", "openssh",
|
|
]).sshHostKeyPolicy == "openssh")
|
|
#expect(throws: Error.self) {
|
|
_ = try ConfigureRemoteOptions.parse([
|
|
"--ssh-target", "gateway-alias",
|
|
"--ssh-host-key-policy", "accept-new",
|
|
])
|
|
}
|
|
}
|
|
|
|
@Test func `configure remote rejects ssh targets without a host`() throws {
|
|
#expect(throws: Error.self) {
|
|
try configureRemote(.init(sshTarget: "user@"))
|
|
}
|
|
#expect(throws: Error.self) {
|
|
try configureRemote(.init(sshTarget: "alice@:2222"))
|
|
}
|
|
}
|
|
|
|
@Test @MainActor func `configure remote can write direct private url`() async throws {
|
|
let configURL = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw-configure-direct-\(UUID().uuidString).json")
|
|
defer { try? FileManager().removeItem(at: configURL) }
|
|
|
|
let initial: [String: Any] = [
|
|
"gateway": [
|
|
"port": 19089,
|
|
"remote": ["sshHostKeyPolicy": "openssh"],
|
|
],
|
|
]
|
|
let initialData = try JSONSerialization.data(withJSONObject: initial, options: [.prettyPrinted])
|
|
try FileManager().createDirectory(at: configURL.deletingLastPathComponent(), withIntermediateDirectories: true)
|
|
try initialData.write(to: configURL)
|
|
|
|
try await TestIsolation.withIsolatedState(env: ["OPENCLAW_CONFIG_PATH": configURL.path]) {
|
|
let output = try configureRemote(
|
|
.init(
|
|
directUrl: "ws://192.168.0.202:18789",
|
|
token: "test-token"), // pragma: allowlist secret
|
|
defaultsSuites: [])
|
|
|
|
#expect(output.transport == "direct")
|
|
#expect(output.remoteUrl == "ws://192.168.0.202:18789")
|
|
#expect(output.localUrl == nil)
|
|
#expect(output.sshTarget == nil)
|
|
#expect(output.sshHostKeyPolicy == nil)
|
|
|
|
let data = try Data(contentsOf: configURL)
|
|
let root = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])
|
|
let gateway = try #require(root["gateway"] as? [String: Any])
|
|
let remote = try #require(gateway["remote"] as? [String: Any])
|
|
#expect(gateway["mode"] as? String == "remote")
|
|
#expect(gateway["port"] as? Int == 19089)
|
|
#expect(remote["transport"] as? String == "direct")
|
|
#expect(remote["url"] as? String == "ws://192.168.0.202:18789")
|
|
#expect(remote["remotePort"] == nil)
|
|
#expect(remote["sshTarget"] == nil)
|
|
#expect(remote["sshHostKeyPolicy"] == nil)
|
|
#expect(remote["token"] as? String == "test-token") // pragma: allowlist secret
|
|
}
|
|
}
|
|
|
|
@Test @MainActor func `configure remote writes state dir config when config path is unset`() async throws {
|
|
let stateDir = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw-configure-state-\(UUID().uuidString)", isDirectory: true)
|
|
let configURL = stateDir.appendingPathComponent("openclaw.json")
|
|
defer { try? FileManager().removeItem(at: stateDir) }
|
|
|
|
try await TestIsolation.withIsolatedState(env: [
|
|
"OPENCLAW_CONFIG_PATH": nil,
|
|
"OPENCLAW_STATE_DIR": stateDir.path,
|
|
]) {
|
|
try #require(resolveOpenClawConfigURL().path == configURL.path)
|
|
let output = try configureRemote(
|
|
.init(
|
|
directUrl: "ws://192.168.0.203:18789",
|
|
token: "state-dir-token"), // pragma: allowlist secret
|
|
defaultsSuites: [])
|
|
|
|
#expect(output.configPath == configURL.path)
|
|
let data = try Data(contentsOf: configURL)
|
|
let root = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])
|
|
let gateway = try #require(root["gateway"] as? [String: Any])
|
|
let remote = try #require(gateway["remote"] as? [String: Any])
|
|
#expect(gateway["mode"] as? String == "remote")
|
|
#expect(remote["transport"] as? String == "direct")
|
|
#expect(remote["url"] as? String == "ws://192.168.0.203:18789")
|
|
#expect(remote["token"] as? String == "state-dir-token") // pragma: allowlist secret
|
|
}
|
|
}
|
|
|
|
@Test @MainActor func `configure remote rejects plaintext public prefix bypass`() async {
|
|
let configURL = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw-configure-direct-reject-\(UUID().uuidString).json")
|
|
defer { try? FileManager().removeItem(at: configURL) }
|
|
|
|
_ = await TestIsolation.withIsolatedState(env: ["OPENCLAW_CONFIG_PATH": configURL.path]) {
|
|
#expect(throws: Error.self) {
|
|
try configureRemote(.init(directUrl: "ws://fd-example.com:18789"))
|
|
}
|
|
#expect(throws: Error.self) {
|
|
try configureRemote(.init(directUrl: "ws://192.168.0.202.attacker.example:18789"))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@Suite(.serialized)
|
|
struct GatewayConfigTests {
|
|
@Test @MainActor func `config path wins when both config and state dir are set`() async throws {
|
|
let rootDir = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw-cli-config-precedence-\(UUID().uuidString)", isDirectory: true)
|
|
let explicitConfigURL = rootDir.appendingPathComponent("explicit.json")
|
|
let stateConfigURL = rootDir.appendingPathComponent("state/openclaw.json")
|
|
defer { try? FileManager().removeItem(at: rootDir) }
|
|
|
|
try self.writeGatewayConfig(
|
|
to: explicitConfigURL,
|
|
port: 19101,
|
|
remoteURL: "wss://explicit-config.example:19101",
|
|
token: "explicit-config-token") // pragma: allowlist secret
|
|
try self.writeGatewayConfig(
|
|
to: stateConfigURL,
|
|
port: 19102,
|
|
remoteURL: "wss://state-config.example:19102",
|
|
token: "state-config-token") // pragma: allowlist secret
|
|
|
|
await TestIsolation.withEnvValues([
|
|
"OPENCLAW_CONFIG_PATH": explicitConfigURL.path,
|
|
"OPENCLAW_STATE_DIR": stateConfigURL.deletingLastPathComponent().path,
|
|
]) {
|
|
let config = loadGatewayConfig()
|
|
|
|
#expect(config.port == 19101)
|
|
#expect(config.remoteUrl == "wss://explicit-config.example:19101")
|
|
#expect(config.remoteToken == "explicit-config-token") // pragma: allowlist secret
|
|
}
|
|
}
|
|
|
|
@Test @MainActor func `config path trims surrounding whitespace and expands tilde`() async {
|
|
let relativePath = ".openclaw-cli-config-\(UUID().uuidString)/openclaw.json"
|
|
let expectedURL = FileManager().homeDirectoryForCurrentUser.appendingPathComponent(relativePath)
|
|
|
|
await TestIsolation.withEnvValues([
|
|
"OPENCLAW_CONFIG_PATH": " ~/\(relativePath)\n",
|
|
"OPENCLAW_STATE_DIR": "/tmp/openclaw-unused-state-dir",
|
|
]) {
|
|
#expect(resolveOpenClawConfigURL().path == expectedURL.path)
|
|
}
|
|
}
|
|
|
|
@Test @MainActor func `state dir trims surrounding whitespace for connect and wizard`() async throws {
|
|
let stateDir = FileManager().temporaryDirectory
|
|
.appendingPathComponent("openclaw cli state profile \(UUID().uuidString)", isDirectory: true)
|
|
let configURL = stateDir.appendingPathComponent("openclaw.json")
|
|
defer { try? FileManager().removeItem(at: stateDir) }
|
|
|
|
try self.writeGatewayConfig(
|
|
to: configURL,
|
|
port: 19201,
|
|
remoteURL: "wss://state-profile.example:19202",
|
|
remotePort: 19203,
|
|
token: "state-profile-token") // pragma: allowlist secret
|
|
|
|
await TestIsolation.withEnvValues([
|
|
"OPENCLAW_CONFIG_PATH": nil,
|
|
"OPENCLAW_STATE_DIR": "\t\(stateDir.path) ",
|
|
]) {
|
|
let config = loadGatewayConfig()
|
|
|
|
#expect(config.mode == "remote")
|
|
#expect(config.port == 19201)
|
|
#expect(config.remoteUrl == "wss://state-profile.example:19202")
|
|
#expect(config.remotePort == 19203)
|
|
#expect(config.remoteToken == "state-profile-token") // pragma: allowlist secret
|
|
}
|
|
}
|
|
|
|
private func writeGatewayConfig(
|
|
to url: URL,
|
|
port: Int,
|
|
remoteURL: String,
|
|
remotePort: Int = 18789,
|
|
token: String) throws
|
|
{
|
|
let root: [String: Any] = [
|
|
"gateway": [
|
|
"mode": "remote",
|
|
"port": port,
|
|
"remote": [
|
|
"url": remoteURL,
|
|
"remotePort": remotePort,
|
|
"token": token,
|
|
],
|
|
],
|
|
]
|
|
try FileManager().createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)
|
|
let data = try JSONSerialization.data(withJSONObject: root, options: [.prettyPrinted, .sortedKeys])
|
|
try data.write(to: url, options: [.atomic])
|
|
}
|
|
}
|