vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-12 09:41:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dedupe whatsapp security contract helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-06 18:39:38 +01:00
parent 00e46301a4
commit dd0cd5dcda
1 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
extensions/whatsapp/src/shared.ts
View File

@@ -23,52 +23,14 @@ import { formatWhatsAppConfigAllowFromEntries } from "./config-accessors.js";
import { WhatsAppChannelConfigSchema } from "./config-schema.js";
import { whatsappDoctor } from "./doctor.js";
import { resolveLegacyGroupSessionKey } from "./group-session-contract.js";
import {
collectUnsupportedSecretRefConfigCandidates,
unsupportedSecretRefSurfacePatterns,
} from "./security-contract.js";
import { applyWhatsAppSecurityConfigFixes } from "./security-fix.js";
import { canonicalizeLegacySessionKey, isLegacyGroupSessionKey } from "./session-contract.js";
export const WHATSAPP_CHANNEL = "whatsapp" as const;
const WHATSAPP_UNSUPPORTED_SECRET_REF_SURFACE_PATTERNS = [
"channels.whatsapp.creds.json",
"channels.whatsapp.accounts.*.creds.json",
] as const;
function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null;
}
function collectUnsupportedSecretRefConfigCandidates(raw: unknown): Array<{
path: string;
value: unknown;
}> {
if (!isRecord(raw) || !isRecord(raw.channels) || !isRecord(raw.channels.whatsapp)) {
return [];
}
const candidates: Array<{ path: string; value: unknown }> = [];
const whatsapp = raw.channels.whatsapp;
const creds = isRecord(whatsapp.creds) ? whatsapp.creds : null;
if (creds) {
candidates.push({
path: "channels.whatsapp.creds.json",
value: creds.json,
});
}
const accounts = isRecord(whatsapp.accounts) ? whatsapp.accounts : null;
if (!accounts) {
return candidates;
}
for (const [accountId, account] of Object.entries(accounts)) {
if (!isRecord(account) || !isRecord(account.creds)) {
continue;
}
candidates.push({
path: `channels.whatsapp.accounts.${accountId}.creds.json`,
value: account.creds.json,
});
}
return candidates;
}
export async function loadWhatsAppChannelRuntime() {
return await import("./channel.runtime.js");
@@ -219,7 +181,7 @@ export function createWhatsAppPluginBase(params: {
canonicalizeLegacySessionKey({ key: params.key, agentId: params.agentId }),
},
secrets: {
unsupportedSecretRefSurfacePatterns: WHATSAPP_UNSUPPORTED_SECRET_REF_SURFACE_PATTERNS,
unsupportedSecretRefSurfacePatterns,
collectUnsupportedSecretRefConfigCandidates,
},
security: base.security!,