feat(secrets): expand SecretRef coverage across user-supplied credentials (#29580)

* feat(secrets): expand secret target coverage and gateway tooling

* docs(secrets): align gateway and CLI secret docs

* chore(protocol): regenerate swift gateway models for secrets methods

* fix(config): restore talk apiKey fallback and stabilize runner test

* ci(windows): reduce test worker count for shard stability

* ci(windows): raise node heap for test shard stability

* test(feishu): make proxy env precedence assertion windows-safe

* fix(gateway): resolve auth password SecretInput refs for clients

* fix(gateway): resolve remote SecretInput credentials for clients

* fix(secrets): skip inactive refs in command snapshot assignments

* fix(secrets): scope gateway.remote refs to effective auth surfaces

* fix(secrets): ignore memory defaults when enabled agents disable search

* fix(secrets): honor Google Chat serviceAccountRef inheritance

* fix(secrets): address tsgo errors in command and gateway collectors

* fix(secrets): avoid auth-store load in providers-only configure

* fix(gateway): defer local password ref resolution by precedence

* fix(secrets): gate telegram webhook secret refs by webhook mode

* fix(secrets): gate slack signing secret refs to http mode

* fix(secrets): skip telegram botToken refs when tokenFile is set

* fix(secrets): gate discord pluralkit refs by enabled flag

* fix(secrets): gate discord voice tts refs by voice enabled

* test(secrets): make runtime fixture modes explicit

* fix(cli): resolve local qr password secret refs

* fix(cli): fail when gateway leaves command refs unresolved

* fix(gateway): fail when local password SecretRef is unresolved

* fix(gateway): fail when required remote SecretRefs are unresolved

* fix(gateway): resolve local password refs only when password can win

* fix(cli): skip local password SecretRef resolution on qr token override

* test(gateway): cast SecretRef fixtures to OpenClawConfig

* test(secrets): activate mode-gated targets in runtime coverage fixture

* fix(cron): support SecretInput webhook tokens safely

* fix(bluebubbles): support SecretInput passwords across config paths

* fix(msteams): make appPassword SecretInput-safe in onboarding/token paths

* fix(bluebubbles): align SecretInput schema helper typing

* fix(cli): clarify secrets.resolve version-skew errors

* refactor(secrets): return structured inactive paths from secrets.resolve

* refactor(gateway): type onboarding secret writes as SecretInput

* chore(protocol): regenerate swift models for secrets.resolve

* feat(secrets): expand extension credential secretref support

* fix(secrets): gate web-search refs by active provider

* fix(onboarding): detect SecretRef credentials in extension status

* fix(onboarding): allow keeping existing ref in secret prompt

* fix(onboarding): resolve gateway password SecretRefs for probe and tui

* fix(onboarding): honor secret-input-mode for local gateway auth

* fix(acp): resolve gateway SecretInput credentials

* fix(secrets): gate gateway.remote refs to remote surfaces

* test(secrets): cover pattern matching and inactive array refs

* docs(secrets): clarify secrets.resolve and remote active surfaces

* fix(bluebubbles): keep existing SecretRef during onboarding

* fix(tests): resolve CI type errors in new SecretRef coverage

* fix(extensions): replace raw fetch with SSRF-guarded fetch

* test(secrets): mark gateway remote targets active in runtime coverage

* test(infra): normalize home-prefix expectation across platforms

* fix(cli): only resolve local qr password refs in password mode

* test(cli): cover local qr token mode with unresolved password ref

* docs(cli): clarify local qr password ref resolution behavior

* refactor(extensions): reuse sdk SecretInput helpers

* fix(wizard): resolve onboarding env-template secrets before plaintext

* fix(cli): surface secrets.resolve diagnostics in memory and qr

* test(secrets): repair post-rebase runtime and fixtures

* fix(gateway): skip remote password ref resolution when token wins

* fix(secrets): treat tailscale remote gateway refs as active

* fix(gateway): allow remote password fallback when token ref is unresolved

* fix(gateway): ignore stale local password refs for none and trusted-proxy

* fix(gateway): skip remote secret ref resolution on local call paths

* test(cli): cover qr remote tailscale secret ref resolution

* fix(secrets): align gateway password active-surface with auth inference

* fix(cli): resolve inferred local gateway password refs in qr

* fix(gateway): prefer resolvable remote password over token ref pre-resolution

* test(gateway): cover none and trusted-proxy stale password refs

* docs(secrets): sync qr and gateway active-surface behavior

* fix: restore stability blockers from pre-release audit

* Secrets: fix collector/runtime precedence contradictions

* docs: align secrets and web credential docs

* fix(rebase): resolve integration regressions after main rebase

* fix(node-host): resolve gateway secret refs for auth

* fix(secrets): harden secretinput runtime readers

* gateway: skip inactive auth secretref resolution

* cli: avoid gateway preflight for inactive secret refs

* extensions: allow unresolved refs in onboarding status

* tests: fix qr-cli module mock hoist ordering

* Security: align audit checks with SecretInput resolution

* Gateway: resolve local-mode remote fallback secret refs

* Node host: avoid resolving inactive password secret refs

* Secrets runtime: mark Slack appToken inactive for HTTP mode

* secrets: keep inactive gateway remote refs non-blocking

* cli: include agent memory secret targets in runtime resolution

* docs(secrets): sync docs with active-surface and web search behavior

* fix(secrets): keep telegram top-level token refs active for blank account tokens

* fix(daemon): resolve gateway password secret refs for probe auth

* fix(secrets): skip IRC NickServ ref resolution when NickServ is disabled

* fix(secrets): align token inheritance and exec timeout defaults

* docs(secrets): clarify active-surface notes in cli docs

* cli: require secrets.resolve gateway capability

* gateway: log auth secret surface diagnostics

* secrets: remove dead provider resolver module

* fix(secrets): restore gateway auth precedence and fallback resolution

* fix(tests): align plugin runtime mock typings

---------

Co-authored-by: Peter Steinberger <steipete@gmail.com>
This commit is contained in:
Josh Avant
2026-03-02 20:58:20 -06:00
committed by GitHub
parent f212351aed
commit 806803b7ef
236 changed files with 16810 additions and 2861 deletions

View File

@@ -47,7 +47,9 @@ type RemoteMediaFetchParams = {
const detectMimeMock = vi.fn(async () => CONTENT_TYPE_IMAGE_PNG);
const saveMediaBufferMock = vi.fn(async () => ({
id: "saved.png",
path: SAVED_PNG_PATH,
size: Buffer.byteLength(PNG_BUFFER),
contentType: CONTENT_TYPE_IMAGE_PNG,
}));
const readRemoteMediaResponse = async (
@@ -439,7 +441,9 @@ const ATTACHMENT_DOWNLOAD_SUCCESS_CASES: AttachmentDownloadSuccessCase[] = [
beforeDownload: () => {
detectMimeMock.mockResolvedValueOnce(CONTENT_TYPE_APPLICATION_PDF);
saveMediaBufferMock.mockResolvedValueOnce({
id: "saved.pdf",
path: SAVED_PDF_PATH,
size: Buffer.byteLength(PDF_BUFFER),
contentType: CONTENT_TYPE_APPLICATION_PDF,
});
},

View File

@@ -18,7 +18,8 @@ import {
resolveMSTeamsChannelAllowlist,
resolveMSTeamsUserAllowlist,
} from "./resolve-allowlist.js";
import { resolveMSTeamsCredentials } from "./token.js";
import { normalizeSecretInputString } from "./secret-input.js";
import { hasConfiguredMSTeamsCredentials, resolveMSTeamsCredentials } from "./token.js";
const channel = "msteams" as const;
@@ -229,7 +230,9 @@ const dmPolicy: ChannelOnboardingDmPolicy = {
export const msteamsOnboardingAdapter: ChannelOnboardingAdapter = {
channel,
getStatus: async ({ cfg }) => {
const configured = Boolean(resolveMSTeamsCredentials(cfg.channels?.msteams));
const configured =
Boolean(resolveMSTeamsCredentials(cfg.channels?.msteams)) ||
hasConfiguredMSTeamsCredentials(cfg.channels?.msteams);
return {
channel,
configured,
@@ -240,16 +243,12 @@ export const msteamsOnboardingAdapter: ChannelOnboardingAdapter = {
},
configure: async ({ cfg, prompter }) => {
const resolved = resolveMSTeamsCredentials(cfg.channels?.msteams);
const hasConfigCreds = Boolean(
cfg.channels?.msteams?.appId?.trim() &&
cfg.channels?.msteams?.appPassword?.trim() &&
cfg.channels?.msteams?.tenantId?.trim(),
);
const hasConfigCreds = hasConfiguredMSTeamsCredentials(cfg.channels?.msteams);
const canUseEnv = Boolean(
!hasConfigCreds &&
process.env.MSTEAMS_APP_ID?.trim() &&
process.env.MSTEAMS_APP_PASSWORD?.trim() &&
process.env.MSTEAMS_TENANT_ID?.trim(),
normalizeSecretInputString(process.env.MSTEAMS_APP_ID) &&
normalizeSecretInputString(process.env.MSTEAMS_APP_PASSWORD) &&
normalizeSecretInputString(process.env.MSTEAMS_TENANT_ID),
);
let next = cfg;
@@ -257,7 +256,7 @@ export const msteamsOnboardingAdapter: ChannelOnboardingAdapter = {
let appPassword: string | null = null;
let tenantId: string | null = null;
if (!resolved) {
if (!resolved && !hasConfigCreds) {
await noteMSTeamsCredentialHelp(prompter);
}

View File

@@ -0,0 +1,7 @@
import {
hasConfiguredSecretInput,
normalizeResolvedSecretInputString,
normalizeSecretInputString,
} from "openclaw/plugin-sdk";
export { hasConfiguredSecretInput, normalizeResolvedSecretInputString, normalizeSecretInputString };

View File

@@ -0,0 +1,72 @@
import { afterEach, describe, expect, it } from "vitest";
import { hasConfiguredMSTeamsCredentials, resolveMSTeamsCredentials } from "./token.js";
const ORIGINAL_ENV = {
appId: process.env.MSTEAMS_APP_ID,
appPassword: process.env.MSTEAMS_APP_PASSWORD,
tenantId: process.env.MSTEAMS_TENANT_ID,
};
afterEach(() => {
if (ORIGINAL_ENV.appId === undefined) {
delete process.env.MSTEAMS_APP_ID;
} else {
process.env.MSTEAMS_APP_ID = ORIGINAL_ENV.appId;
}
if (ORIGINAL_ENV.appPassword === undefined) {
delete process.env.MSTEAMS_APP_PASSWORD;
} else {
process.env.MSTEAMS_APP_PASSWORD = ORIGINAL_ENV.appPassword;
}
if (ORIGINAL_ENV.tenantId === undefined) {
delete process.env.MSTEAMS_TENANT_ID;
} else {
process.env.MSTEAMS_TENANT_ID = ORIGINAL_ENV.tenantId;
}
});
describe("resolveMSTeamsCredentials", () => {
it("returns configured credentials for plaintext values", () => {
const resolved = resolveMSTeamsCredentials({
appId: " app-id ",
appPassword: " app-password ",
tenantId: " tenant-id ",
});
expect(resolved).toEqual({
appId: "app-id",
appPassword: "app-password",
tenantId: "tenant-id",
});
});
it("throws when appPassword remains an unresolved SecretRef object", () => {
expect(() =>
resolveMSTeamsCredentials({
appId: "app-id",
appPassword: {
source: "env",
provider: "default",
id: "MSTEAMS_APP_PASSWORD",
},
tenantId: "tenant-id",
}),
).toThrow(/channels\.msteams\.appPassword: unresolved SecretRef/i);
});
});
describe("hasConfiguredMSTeamsCredentials", () => {
it("treats SecretRef appPassword as configured", () => {
const configured = hasConfiguredMSTeamsCredentials({
appId: "app-id",
appPassword: {
source: "env",
provider: "default",
id: "MSTEAMS_APP_PASSWORD",
},
tenantId: "tenant-id",
});
expect(configured).toBe(true);
});
});

View File

@@ -1,4 +1,9 @@
import type { MSTeamsConfig } from "openclaw/plugin-sdk";
import {
hasConfiguredSecretInput,
normalizeResolvedSecretInputString,
normalizeSecretInputString,
} from "./secret-input.js";
export type MSTeamsCredentials = {
appId: string;
@@ -6,10 +11,26 @@ export type MSTeamsCredentials = {
tenantId: string;
};
export function hasConfiguredMSTeamsCredentials(cfg?: MSTeamsConfig): boolean {
return Boolean(
normalizeSecretInputString(cfg?.appId) &&
hasConfiguredSecretInput(cfg?.appPassword) &&
normalizeSecretInputString(cfg?.tenantId),
);
}
export function resolveMSTeamsCredentials(cfg?: MSTeamsConfig): MSTeamsCredentials | undefined {
const appId = cfg?.appId?.trim() || process.env.MSTEAMS_APP_ID?.trim();
const appPassword = cfg?.appPassword?.trim() || process.env.MSTEAMS_APP_PASSWORD?.trim();
const tenantId = cfg?.tenantId?.trim() || process.env.MSTEAMS_TENANT_ID?.trim();
const appId =
normalizeSecretInputString(cfg?.appId) ||
normalizeSecretInputString(process.env.MSTEAMS_APP_ID);
const appPassword =
normalizeResolvedSecretInputString({
value: cfg?.appPassword,
path: "channels.msteams.appPassword",
}) || normalizeSecretInputString(process.env.MSTEAMS_APP_PASSWORD);
const tenantId =
normalizeSecretInputString(cfg?.tenantId) ||
normalizeSecretInputString(process.env.MSTEAMS_TENANT_ID);
if (!appId || !appPassword || !tenantId) {
return undefined;