fix(gateway): honor env token for remote interactive auth

This commit is contained in:
Vincent Koc
2026-05-17 02:24:03 +08:00
parent ca1fd1b140
commit 7d09ff89ee
3 changed files with 69 additions and 1 deletions

View File

@@ -23,6 +23,7 @@ Docs: https://docs.openclaw.ai
- CLI/config: add `--dry-run` support to `openclaw config unset`, with `--json` output and allow-exec validation parity with `config set`/`config patch` dry-run handling. (#81895) Thanks @giodl73-repo.
- Memory-core: retry disabled dreaming cron cleanup until cron is available after startup, so persisted managed dreaming jobs are removed after restart. Fixes #82383. (#82389) Thanks @neeravmakwana.
- Gateway/diagnostics: redact credential-bearing gateway target URLs and client diagnostics while preserving raw connection URLs for programmatic use, so connect-failure logs no longer surface embedded tokens.
- Gateway/auth: honor `OPENCLAW_GATEWAY_TOKEN` as the remote interactive fallback when no remote token is configured, keeping remote TUI setup aligned with documented auth precedence.
- Logs: redact raw Basic auth and named security headers from `logs.tail` output before returning lines to read-scoped clients. Fixes #66832. Thanks @Magicray1217.
- CLI/gateway: emit structured JSON for gateway transport close/timeout failures when `--json` is requested by health, gateway health, and devices list commands. Fixes #79108. Thanks @TurboTheTurtle.
- Telegram: normalize announce group targets via a new `resolveSessionTarget` channel hook so scheduled announcements resolve consistently against the same Telegram session conversation registry as inbound turns. Fixes #81229. Thanks @giodl73-repo.

View File

@@ -0,0 +1,67 @@
import { describe, expect, it } from "vitest";
import type { GatewayRemoteConfig } from "../config/types.gateway.js";
import type { OpenClawConfig } from "../config/types.openclaw.js";
import { resolveGatewayInteractiveSurfaceAuth } from "./auth-surface-resolution.js";
function remoteGatewayConfig(remote?: GatewayRemoteConfig): OpenClawConfig {
return {
gateway: {
mode: "remote",
remote: {
url: "wss://remote.example/ws",
...remote,
},
},
};
}
describe("resolveGatewayInteractiveSurfaceAuth", () => {
it("uses OPENCLAW_GATEWAY_TOKEN as remote interactive fallback", async () => {
await expect(
resolveGatewayInteractiveSurfaceAuth({
config: remoteGatewayConfig(),
env: {
OPENCLAW_GATEWAY_TOKEN: "env-token",
},
surface: "remote",
}),
).resolves.toEqual({
token: "env-token",
password: undefined,
});
});
it("keeps configured remote token ahead of OPENCLAW_GATEWAY_TOKEN", async () => {
await expect(
resolveGatewayInteractiveSurfaceAuth({
config: remoteGatewayConfig({ token: "remote-token" }),
env: {
OPENCLAW_GATEWAY_TOKEN: "env-token",
},
surface: "remote",
}),
).resolves.toEqual({
token: "remote-token",
password: undefined,
});
});
it("falls back to OPENCLAW_GATEWAY_TOKEN when the remote token ref is unresolved", async () => {
await expect(
resolveGatewayInteractiveSurfaceAuth({
config: {
...remoteGatewayConfig({
token: { source: "env", provider: "default", id: "MISSING_REMOTE_TOKEN" },
}),
},
env: {
OPENCLAW_GATEWAY_TOKEN: "env-token",
},
surface: "remote",
}),
).resolves.toEqual({
token: "env-token",
password: undefined,
});
});
});

View File

@@ -183,7 +183,7 @@ export async function resolveGatewayInteractiveSurfaceAuth(params: {
path: "gateway.remote.password",
value: params.config.gateway?.remote?.password,
});
const token = explicitToken ?? remoteToken.value;
const token = explicitToken ?? remoteToken.value ?? envToken;
const password = explicitPassword ?? envPassword ?? remotePassword.value;
return token || password
? { token, password }