mirror of
https://github.com/farcasclaudiu/openclaw.git
synced 2026-06-29 09:02:02 +03:00
Fix: Force dashboard command to use localhost URL (#16434)
Merged via /review-pr -> /prepare-pr -> /merge-pr. Prepared head SHA: 3c03b4cc9b1dec96e0541df37910a697493ca285 Co-authored-by: BinHPdev <219093083+BinHPdev@users.noreply.github.com> Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com> Reviewed-by: @gumadeiras
This commit is contained in:
@@ -52,6 +52,7 @@ Docs: https://docs.openclaw.ai
|
|||||||
- Cron/Slack: preserve agent identity (name and icon) when cron jobs deliver outbound messages. (#16242) Thanks @robbyczgw-cla.
|
- Cron/Slack: preserve agent identity (name and icon) when cron jobs deliver outbound messages. (#16242) Thanks @robbyczgw-cla.
|
||||||
- Cron: deliver text-only output directly when `delivery.to` is set so cron recipients get full output instead of summaries. (#16360) Thanks @thewilloftheshadow.
|
- Cron: deliver text-only output directly when `delivery.to` is set so cron recipients get full output instead of summaries. (#16360) Thanks @thewilloftheshadow.
|
||||||
- Cron: prevent `cron list`/`cron status` from silently skipping past-due recurring jobs by using maintenance recompute semantics. (#16156) Thanks @zerone0x.
|
- Cron: prevent `cron list`/`cron status` from silently skipping past-due recurring jobs by using maintenance recompute semantics. (#16156) Thanks @zerone0x.
|
||||||
|
- CLI/Dashboard: when `gateway.bind=lan`, generate localhost dashboard URLs to satisfy browser secure-context requirements while preserving non-LAN bind behavior. (#16434) Thanks @BinHPdev.
|
||||||
- Cron: repair missing/corrupt `nextRunAtMs` for the updated job without globally recomputing unrelated due jobs during `cron update`. (#15750)
|
- Cron: repair missing/corrupt `nextRunAtMs` for the updated job without globally recomputing unrelated due jobs during `cron update`. (#15750)
|
||||||
- Discord: prefer gateway guild id when logging inbound messages so cached-miss guilds do not appear as `guild=dm`. Thanks @thewilloftheshadow.
|
- Discord: prefer gateway guild id when logging inbound messages so cached-miss guilds do not appear as `guild=dm`. Thanks @thewilloftheshadow.
|
||||||
- TUI: refactor searchable select list description layout and add regression coverage for ANSI-highlight width bounds.
|
- TUI: refactor searchable select list description layout and add regression coverage for ANSI-highlight width bounds.
|
||||||
|
|||||||
@@ -436,7 +436,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
public let question: String
|
public let question: String
|
||||||
public let options: [String]
|
public let options: [String]
|
||||||
public let maxselections: Int?
|
public let maxselections: Int?
|
||||||
|
public let durationseconds: Int?
|
||||||
public let durationhours: Int?
|
public let durationhours: Int?
|
||||||
|
public let silent: Bool?
|
||||||
|
public let isanonymous: Bool?
|
||||||
|
public let threadid: String?
|
||||||
public let channel: String?
|
public let channel: String?
|
||||||
public let accountid: String?
|
public let accountid: String?
|
||||||
public let idempotencykey: String
|
public let idempotencykey: String
|
||||||
@@ -446,7 +450,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
question: String,
|
question: String,
|
||||||
options: [String],
|
options: [String],
|
||||||
maxselections: Int?,
|
maxselections: Int?,
|
||||||
|
durationseconds: Int?,
|
||||||
durationhours: Int?,
|
durationhours: Int?,
|
||||||
|
silent: Bool?,
|
||||||
|
isanonymous: Bool?,
|
||||||
|
threadid: String?,
|
||||||
channel: String?,
|
channel: String?,
|
||||||
accountid: String?,
|
accountid: String?,
|
||||||
idempotencykey: String
|
idempotencykey: String
|
||||||
@@ -455,7 +463,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
self.question = question
|
self.question = question
|
||||||
self.options = options
|
self.options = options
|
||||||
self.maxselections = maxselections
|
self.maxselections = maxselections
|
||||||
|
self.durationseconds = durationseconds
|
||||||
self.durationhours = durationhours
|
self.durationhours = durationhours
|
||||||
|
self.silent = silent
|
||||||
|
self.isanonymous = isanonymous
|
||||||
|
self.threadid = threadid
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
self.accountid = accountid
|
self.accountid = accountid
|
||||||
self.idempotencykey = idempotencykey
|
self.idempotencykey = idempotencykey
|
||||||
@@ -465,7 +477,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
case question
|
case question
|
||||||
case options
|
case options
|
||||||
case maxselections = "maxSelections"
|
case maxselections = "maxSelections"
|
||||||
|
case durationseconds = "durationSeconds"
|
||||||
case durationhours = "durationHours"
|
case durationhours = "durationHours"
|
||||||
|
case silent
|
||||||
|
case isanonymous = "isAnonymous"
|
||||||
|
case threadid = "threadId"
|
||||||
case channel
|
case channel
|
||||||
case accountid = "accountId"
|
case accountid = "accountId"
|
||||||
case idempotencykey = "idempotencyKey"
|
case idempotencykey = "idempotencyKey"
|
||||||
|
|||||||
@@ -436,7 +436,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
public let question: String
|
public let question: String
|
||||||
public let options: [String]
|
public let options: [String]
|
||||||
public let maxselections: Int?
|
public let maxselections: Int?
|
||||||
|
public let durationseconds: Int?
|
||||||
public let durationhours: Int?
|
public let durationhours: Int?
|
||||||
|
public let silent: Bool?
|
||||||
|
public let isanonymous: Bool?
|
||||||
|
public let threadid: String?
|
||||||
public let channel: String?
|
public let channel: String?
|
||||||
public let accountid: String?
|
public let accountid: String?
|
||||||
public let idempotencykey: String
|
public let idempotencykey: String
|
||||||
@@ -446,7 +450,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
question: String,
|
question: String,
|
||||||
options: [String],
|
options: [String],
|
||||||
maxselections: Int?,
|
maxselections: Int?,
|
||||||
|
durationseconds: Int?,
|
||||||
durationhours: Int?,
|
durationhours: Int?,
|
||||||
|
silent: Bool?,
|
||||||
|
isanonymous: Bool?,
|
||||||
|
threadid: String?,
|
||||||
channel: String?,
|
channel: String?,
|
||||||
accountid: String?,
|
accountid: String?,
|
||||||
idempotencykey: String
|
idempotencykey: String
|
||||||
@@ -455,7 +463,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
self.question = question
|
self.question = question
|
||||||
self.options = options
|
self.options = options
|
||||||
self.maxselections = maxselections
|
self.maxselections = maxselections
|
||||||
|
self.durationseconds = durationseconds
|
||||||
self.durationhours = durationhours
|
self.durationhours = durationhours
|
||||||
|
self.silent = silent
|
||||||
|
self.isanonymous = isanonymous
|
||||||
|
self.threadid = threadid
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
self.accountid = accountid
|
self.accountid = accountid
|
||||||
self.idempotencykey = idempotencykey
|
self.idempotencykey = idempotencykey
|
||||||
@@ -465,7 +477,11 @@ public struct PollParams: Codable, Sendable {
|
|||||||
case question
|
case question
|
||||||
case options
|
case options
|
||||||
case maxselections = "maxSelections"
|
case maxselections = "maxSelections"
|
||||||
|
case durationseconds = "durationSeconds"
|
||||||
case durationhours = "durationHours"
|
case durationhours = "durationHours"
|
||||||
|
case silent
|
||||||
|
case isanonymous = "isAnonymous"
|
||||||
|
case threadid = "threadId"
|
||||||
case channel
|
case channel
|
||||||
case accountid = "accountId"
|
case accountid = "accountId"
|
||||||
case idempotencykey = "idempotencyKey"
|
case idempotencykey = "idempotencyKey"
|
||||||
|
|||||||
@@ -0,0 +1,126 @@
|
|||||||
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import type { GatewayBindMode } from "../config/types.gateway.js";
|
||||||
|
import { dashboardCommand } from "./dashboard.js";
|
||||||
|
|
||||||
|
const mocks = vi.hoisted(() => ({
|
||||||
|
readConfigFileSnapshot: vi.fn(),
|
||||||
|
resolveGatewayPort: vi.fn(),
|
||||||
|
resolveControlUiLinks: vi.fn(),
|
||||||
|
copyToClipboard: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../config/config.js", () => ({
|
||||||
|
readConfigFileSnapshot: mocks.readConfigFileSnapshot,
|
||||||
|
resolveGatewayPort: mocks.resolveGatewayPort,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("./onboard-helpers.js", () => ({
|
||||||
|
resolveControlUiLinks: mocks.resolveControlUiLinks,
|
||||||
|
detectBrowserOpenSupport: vi.fn(),
|
||||||
|
openUrl: vi.fn(),
|
||||||
|
formatControlUiSshHint: vi.fn(() => "ssh hint"),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("../infra/clipboard.js", () => ({
|
||||||
|
copyToClipboard: mocks.copyToClipboard,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const runtime = {
|
||||||
|
log: vi.fn(),
|
||||||
|
error: vi.fn(),
|
||||||
|
exit: vi.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
function mockSnapshot(params?: {
|
||||||
|
token?: string;
|
||||||
|
bind?: GatewayBindMode;
|
||||||
|
customBindHost?: string;
|
||||||
|
}) {
|
||||||
|
const token = params?.token ?? "abc123";
|
||||||
|
mocks.readConfigFileSnapshot.mockResolvedValue({
|
||||||
|
path: "/tmp/openclaw.json",
|
||||||
|
exists: true,
|
||||||
|
raw: "{}",
|
||||||
|
parsed: {},
|
||||||
|
valid: true,
|
||||||
|
config: {
|
||||||
|
gateway: {
|
||||||
|
auth: { token },
|
||||||
|
bind: params?.bind,
|
||||||
|
customBindHost: params?.customBindHost,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
issues: [],
|
||||||
|
legacyIssues: [],
|
||||||
|
});
|
||||||
|
mocks.resolveGatewayPort.mockReturnValue(18789);
|
||||||
|
mocks.resolveControlUiLinks.mockReturnValue({
|
||||||
|
httpUrl: "http://127.0.0.1:18789/",
|
||||||
|
wsUrl: "ws://127.0.0.1:18789",
|
||||||
|
});
|
||||||
|
mocks.copyToClipboard.mockResolvedValue(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("dashboardCommand bind selection", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
mocks.readConfigFileSnapshot.mockReset();
|
||||||
|
mocks.resolveGatewayPort.mockReset();
|
||||||
|
mocks.resolveControlUiLinks.mockReset();
|
||||||
|
mocks.copyToClipboard.mockReset();
|
||||||
|
runtime.log.mockReset();
|
||||||
|
runtime.error.mockReset();
|
||||||
|
runtime.exit.mockReset();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("maps lan bind to loopback for dashboard URLs", async () => {
|
||||||
|
mockSnapshot({ bind: "lan" });
|
||||||
|
|
||||||
|
await dashboardCommand(runtime, { noOpen: true });
|
||||||
|
|
||||||
|
expect(mocks.resolveControlUiLinks).toHaveBeenCalledWith({
|
||||||
|
port: 18789,
|
||||||
|
bind: "loopback",
|
||||||
|
customBindHost: undefined,
|
||||||
|
basePath: undefined,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("defaults to loopback when bind is unset", async () => {
|
||||||
|
mockSnapshot();
|
||||||
|
|
||||||
|
await dashboardCommand(runtime, { noOpen: true });
|
||||||
|
|
||||||
|
expect(mocks.resolveControlUiLinks).toHaveBeenCalledWith({
|
||||||
|
port: 18789,
|
||||||
|
bind: "loopback",
|
||||||
|
customBindHost: undefined,
|
||||||
|
basePath: undefined,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves custom bind mode", async () => {
|
||||||
|
mockSnapshot({ bind: "custom", customBindHost: "10.0.0.5" });
|
||||||
|
|
||||||
|
await dashboardCommand(runtime, { noOpen: true });
|
||||||
|
|
||||||
|
expect(mocks.resolveControlUiLinks).toHaveBeenCalledWith({
|
||||||
|
port: 18789,
|
||||||
|
bind: "custom",
|
||||||
|
customBindHost: "10.0.0.5",
|
||||||
|
basePath: undefined,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("preserves tailnet bind mode", async () => {
|
||||||
|
mockSnapshot({ bind: "tailnet" });
|
||||||
|
|
||||||
|
await dashboardCommand(runtime, { noOpen: true });
|
||||||
|
|
||||||
|
expect(mocks.resolveControlUiLinks).toHaveBeenCalledWith({
|
||||||
|
port: 18789,
|
||||||
|
bind: "tailnet",
|
||||||
|
customBindHost: undefined,
|
||||||
|
basePath: undefined,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -25,9 +25,11 @@ export async function dashboardCommand(
|
|||||||
const customBindHost = cfg.gateway?.customBindHost;
|
const customBindHost = cfg.gateway?.customBindHost;
|
||||||
const token = cfg.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN ?? "";
|
const token = cfg.gateway?.auth?.token ?? process.env.OPENCLAW_GATEWAY_TOKEN ?? "";
|
||||||
|
|
||||||
|
// LAN URLs fail secure-context checks in browsers.
|
||||||
|
// Coerce only lan->loopback and preserve other bind modes.
|
||||||
const links = resolveControlUiLinks({
|
const links = resolveControlUiLinks({
|
||||||
port,
|
port,
|
||||||
bind,
|
bind: bind === "lan" ? "loopback" : bind,
|
||||||
customBindHost,
|
customBindHost,
|
||||||
basePath,
|
basePath,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user