romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 54a592711e into 6af205a13a

Browse Source
This commit is contained in:
wakingcan 2026-01-30 16:10:04 +08:00 committed by GitHub
commit a86cdd4fa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/discord/monitor/allow-list.ts
View File

@ -258,7 +258,8 @@ export function resolveDiscordChannelConfigWithFallback(params: {
scope, scope,
} = params; } = params;
const channels = guildInfo?.channels; const channels = guildInfo?.channels;
if (!channels) return null; // Return null if channels is undefined, null, or empty object - allows all channels when no allowlist is configured
if (!channels || Object.keys(channels).length === 0) return null;
const resolvedParentSlug = parentSlug ?? (parentName ? normalizeDiscordSlug(parentName) : ""); const resolvedParentSlug = parentSlug ?? (parentName ? normalizeDiscordSlug(parentName) : "");
const match = resolveDiscordChannelEntryMatch( const match = resolveDiscordChannelEntryMatch(
channels, channels,

9
src/discord/monitor/native-command.ts
View File

@ -38,6 +38,7 @@ import {
readChannelAllowFromStore, readChannelAllowFromStore,
upsertChannelPairingRequest, upsertChannelPairingRequest,
} from "../../pairing/pairing-store.js"; } from "../../pairing/pairing-store.js";
import { logVerbose } from "../../globals.js";
import { resolveAgentRoute } from "../../routing/resolve-route.js"; import { resolveAgentRoute } from "../../routing/resolve-route.js";
import { loadWebMedia } from "../../web/media.js"; import { loadWebMedia } from "../../web/media.js";
import { chunkDiscordTextWithMode } from "../chunk.js"; import { chunkDiscordTextWithMode } from "../chunk.js";
@ -656,6 +657,14 @@ async function dispatchDiscordCommandInteraction(params: {
modeWhenAccessGroupsOff: "configured", modeWhenAccessGroupsOff: "configured",
}); });
if (!commandAuthorized) { if (!commandAuthorized) {
// Log warning when no allowlist is configured to help users debug
const anyAuthorizerConfigured = authorizers.some((entry) => entry.configured);
if (!anyAuthorizerConfigured) {
logVerbose(
`discord: slash command rejected for user ${user.id} - no allowlist configured. ` +
`Configure channels.discord.guilds.<id>.users or channels.discord.dm.allowFrom to allow users.`,
);
}
await respond("You are not authorized to use this command.", { ephemeral: true }); await respond("You are not authorized to use this command.", { ephemeral: true });
return; return;
} }