mirror of
https://github.com/moltbot/moltbot.git
synced 2026-04-28 17:21:52 +00:00
style: format auth boundary updates
This commit is contained in:
@@ -215,14 +215,13 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
|
|||||||
}
|
}
|
||||||
|
|
||||||
const senderName = await getMemberDisplayName(roomId, senderId);
|
const senderName = await getMemberDisplayName(roomId, senderId);
|
||||||
const storeAllowFrom =
|
const storeAllowFrom = isDirectMessage
|
||||||
isDirectMessage
|
? await readStoreAllowFromForDmPolicy({
|
||||||
? await readStoreAllowFromForDmPolicy({
|
provider: "matrix",
|
||||||
provider: "matrix",
|
dmPolicy,
|
||||||
dmPolicy,
|
readStore: (provider) => core.channel.pairing.readAllowFromStore(provider),
|
||||||
readStore: (provider) => core.channel.pairing.readAllowFromStore(provider),
|
})
|
||||||
})
|
: [];
|
||||||
: [];
|
|
||||||
const groupAllowFrom = cfg.channels?.matrix?.groupAllowFrom ?? [];
|
const groupAllowFrom = cfg.channels?.matrix?.groupAllowFrom ?? [];
|
||||||
const normalizedGroupAllowFrom = normalizeMatrixAllowList(groupAllowFrom);
|
const normalizedGroupAllowFrom = normalizeMatrixAllowList(groupAllowFrom);
|
||||||
const senderGroupPolicy =
|
const senderGroupPolicy =
|
||||||
|
|||||||
@@ -14,14 +14,13 @@ export async function resolveSlackEffectiveAllowFrom(
|
|||||||
options?: { includePairingStore?: boolean },
|
options?: { includePairingStore?: boolean },
|
||||||
) {
|
) {
|
||||||
const includePairingStore = options?.includePairingStore === true;
|
const includePairingStore = options?.includePairingStore === true;
|
||||||
const storeAllowFrom =
|
const storeAllowFrom = includePairingStore
|
||||||
includePairingStore
|
? await readStoreAllowFromForDmPolicy({
|
||||||
? await readStoreAllowFromForDmPolicy({
|
provider: "slack",
|
||||||
provider: "slack",
|
dmPolicy: ctx.dmPolicy,
|
||||||
dmPolicy: ctx.dmPolicy,
|
readStore: (provider) => readChannelAllowFromStore(provider),
|
||||||
readStore: (provider) => readChannelAllowFromStore(provider),
|
})
|
||||||
})
|
: [];
|
||||||
: [];
|
|
||||||
const allowFrom = normalizeAllowList([...ctx.allowFrom, ...storeAllowFrom]);
|
const allowFrom = normalizeAllowList([...ctx.allowFrom, ...storeAllowFrom]);
|
||||||
const allowFromLower = normalizeAllowListLower(allowFrom);
|
const allowFromLower = normalizeAllowListLower(allowFrom);
|
||||||
return { allowFrom, allowFromLower };
|
return { allowFrom, allowFromLower };
|
||||||
|
|||||||
@@ -336,14 +336,13 @@ export async function registerSlackMonitorSlashCommands(params: {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const storeAllowFrom =
|
const storeAllowFrom = isDirectMessage
|
||||||
isDirectMessage
|
? await readStoreAllowFromForDmPolicy({
|
||||||
? await readStoreAllowFromForDmPolicy({
|
provider: "slack",
|
||||||
provider: "slack",
|
dmPolicy: ctx.dmPolicy,
|
||||||
dmPolicy: ctx.dmPolicy,
|
readStore: (provider) => readChannelAllowFromStore(provider),
|
||||||
readStore: (provider) => readChannelAllowFromStore(provider),
|
})
|
||||||
})
|
: [];
|
||||||
: [];
|
|
||||||
const effectiveAllowFrom = normalizeAllowList([...ctx.allowFrom, ...storeAllowFrom]);
|
const effectiveAllowFrom = normalizeAllowList([...ctx.allowFrom, ...storeAllowFrom]);
|
||||||
const effectiveAllowFromLower = normalizeAllowListLower(effectiveAllowFrom);
|
const effectiveAllowFromLower = normalizeAllowListLower(effectiveAllowFrom);
|
||||||
|
|
||||||
|
|||||||
@@ -76,15 +76,14 @@ async function resolveWhatsAppCommandAuthorized(params: {
|
|||||||
const configuredGroupAllowFrom =
|
const configuredGroupAllowFrom =
|
||||||
account.groupAllowFrom ?? (configuredAllowFrom.length > 0 ? configuredAllowFrom : undefined);
|
account.groupAllowFrom ?? (configuredAllowFrom.length > 0 ? configuredAllowFrom : undefined);
|
||||||
|
|
||||||
const storeAllowFrom =
|
const storeAllowFrom = isGroup
|
||||||
isGroup
|
? []
|
||||||
? []
|
: await readStoreAllowFromForDmPolicy({
|
||||||
: await readStoreAllowFromForDmPolicy({
|
provider: "whatsapp",
|
||||||
provider: "whatsapp",
|
dmPolicy,
|
||||||
dmPolicy,
|
readStore: (provider) =>
|
||||||
readStore: (provider) =>
|
readChannelAllowFromStore(provider, process.env, params.msg.accountId),
|
||||||
readChannelAllowFromStore(provider, process.env, params.msg.accountId),
|
});
|
||||||
});
|
|
||||||
const dmAllowFrom =
|
const dmAllowFrom =
|
||||||
configuredAllowFrom.length > 0
|
configuredAllowFrom.length > 0
|
||||||
? configuredAllowFrom
|
? configuredAllowFrom
|
||||||
|
|||||||
Reference in New Issue
Block a user