fix: use account-aware config paths in resolveDmPolicy and resolveAllowFrom

This commit is contained in:
Monty Taylor
2026-02-13 08:03:59 -06:00
committed by Peter Steinberger
parent 3985ef7b37
commit 1a17466a60
+13 -6
View File
@@ -145,19 +145,26 @@ export const matrixPlugin: ChannelPlugin<ResolvedMatrixAccount> = {
configured: account.configured, configured: account.configured,
baseUrl: account.homeserver, baseUrl: account.homeserver,
}), }),
resolveAllowFrom: ({ cfg }) => resolveAllowFrom: ({ account }) =>
((cfg as CoreConfig).channels?.matrix?.dm?.allowFrom ?? []).map((entry) => String(entry)), (account.config.dm?.allowFrom ?? []).map((entry) => String(entry)),
formatAllowFrom: ({ allowFrom }) => normalizeMatrixAllowList(allowFrom), formatAllowFrom: ({ allowFrom }) => normalizeMatrixAllowList(allowFrom),
}, },
security: { security: {
resolveDmPolicy: ({ account }) => ({ resolveDmPolicy: ({ account }) => {
const accountId = account.accountId;
const prefix =
accountId && accountId !== "default"
? `channels.matrix.accounts.${accountId}.dm`
: "channels.matrix.dm";
return {
policy: account.config.dm?.policy ?? "pairing", policy: account.config.dm?.policy ?? "pairing",
allowFrom: account.config.dm?.allowFrom ?? [], allowFrom: account.config.dm?.allowFrom ?? [],
policyPath: "channels.matrix.dm.policy", policyPath: `${prefix}.policy`,
allowFromPath: "channels.matrix.dm.allowFrom", allowFromPath: `${prefix}.allowFrom`,
approveHint: formatPairingApproveHint("matrix"), approveHint: formatPairingApproveHint("matrix"),
normalizeEntry: (raw) => normalizeMatrixUserId(raw), normalizeEntry: (raw) => normalizeMatrixUserId(raw),
}), };
},
collectWarnings: ({ account, cfg }) => { collectWarnings: ({ account, cfg }) => {
const defaultGroupPolicy = (cfg as CoreConfig).channels?.defaults?.groupPolicy; const defaultGroupPolicy = (cfg as CoreConfig).channels?.defaults?.groupPolicy;
const groupPolicy = account.config.groupPolicy ?? defaultGroupPolicy ?? "allowlist"; const groupPolicy = account.config.groupPolicy ?? defaultGroupPolicy ?? "allowlist";