@xmanrui/dsh-im 4.34.0 → 4.34.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "4.34.0",
+  "version": "4.34.1",
   "icon": "./assets/logo-plugin-message-link-gradient.webp",
   "description": "把微信、飞书、企微、钉钉、QQ、Telegram、WhatsApp、Slack、Discord、Matrix接入DSH。 Connect Telegram, WhatsApp, Slack, Discord, Matrix, WeChat, Feishu, WeCom, DingTalk, and QQ to DSH.",
   "keywords": [

package/plugin-src/client/access-policy-settings.js

@@ -8,6 +8,7 @@ import {
 import { h, localizeText } from './i18n.js';
 
 export const ACCESS_POLICY_ENDPOINT = 'bot.access-policy.set';
+const CONFIRMED_OWNER_CHANNELS = new Set(['weixin', 'feishu', 'qq', 'whatsapp', 'discord']);
 
 export const ACCESS_CHANNEL_DEFINITIONS = Object.freeze({
   weixin: Object.freeze({
@@ -17,9 +18,9 @@ export const ACCESS_CHANNEL_DEFINITIONS = Object.freeze({
   }),
   feishu: Object.freeze({
     directUserLabel: '飞书 Open ID',
-    directPlaceholder: 'ou_xxx',
+    directPlaceholder: '填写使用者的 Open ID（ou_xxx），不是机器人 ID',
     groupUserLabel: '群成员 Open ID',
-    groupPlaceholder: 'ou_xxx',
+    groupPlaceholder: '填写使用者的 Open ID（ou_xxx），不是机器人 ID',
   }),
   dingtalk: Object.freeze({
     directUserLabel: '钉钉用户 ID',
@@ -125,6 +126,8 @@ function ScenePolicyEditor({
   placeholder,
   disabled = false,
   unsupported = false,
+  ownerHelp,
+  identityHelp,
   onChange,
 }) {
   const ownerHelpId = React.useId();
@@ -165,7 +168,7 @@ function ScenePolicyEditor({
           id: ownerHelpId,
           className: 'dim-channelTooltip dim-accessHelpTooltip',
           role: 'tooltip',
-        }, '原所有者或扫码接入者始终可以访问并执行命令；以下设置仅约束其他用户。')))),
+        }, ownerHelp, identityHelp ? h('br') : null, identityHelp)))),
   unsupported
     ? h('div', { className: 'dim-accessUnsupported', role: 'note' },
         h('strong', null, '当前渠道不支持群聊'),
@@ -271,6 +274,12 @@ function ScenePolicyEditor({
 
 export function AccessPolicySettingsPage({ channel, account, rpcCall, onSaved }) {
   const definition = ACCESS_CHANNEL_DEFINITIONS[channel];
+  const ownerHelp = CONFIRMED_OWNER_CHANNELS.has(channel)
+    ? '已由接入流程确认的所有者可以访问并执行命令，不受本页限制。未识别到所有者身份时，按本页访问设置执行。'
+    : '原所有者或扫码接入者始终可以访问并执行命令；以下设置仅约束其他用户。';
+  const identityHelp = channel === 'feishu'
+    ? '白名单请填写使用者的 Open ID，不是机器人的 Open ID。仅保存通配符的接入配置不包含所有者身份。'
+    : null;
   const initialPolicy = normalizeAccessPolicy(account?.accessPolicy);
   const initialKey = JSON.stringify(initialPolicy);
   const [draft, setDraft] = React.useState(() => clonePolicy(
@@ -333,6 +342,8 @@ export function AccessPolicySettingsPage({ channel, account, rpcCall, onSaved })
     policy: draft.direct,
     userLabel: definition.directUserLabel,
     placeholder: definition.directPlaceholder,
+    ownerHelp,
+    identityHelp,
     disabled: saving,
     onChange: (direct) => { setDraft((current) => ({ ...current, direct })); setFeedback(null); },
   }),
@@ -342,6 +353,10 @@ export function AccessPolicySettingsPage({ channel, account, rpcCall, onSaved })
     policy: draft.group,
     userLabel: definition.groupUserLabel ?? definition.directUserLabel,
     placeholder: definition.groupPlaceholder ?? definition.directPlaceholder,
+    ownerHelp,
+    identityHelp: channel === 'qq'
+      ? '扫码获得的是私聊身份，群聊只有匹配已确认的所有者身份时才豁免；其他成员按群聊白名单设置执行。'
+      : identityHelp,
     disabled: saving || definition.groupSupported === false,
     unsupported: definition.groupSupported === false,
     onChange: (group) => { setDraft((current) => ({ ...current, group })); setFeedback(null); },

package/plugin-src/client/i18n.js

@@ -68,6 +68,11 @@ const EN = Object.freeze({
   '尚未添加用户': 'No users added',
   '当前渠道不支持群聊': 'Group chat is not supported by this channel',
   '原所有者或扫码接入者始终可以访问并执行命令；以下设置仅约束其他用户。': 'The original owner or QR-code operator can always access the bot and run commands; the settings below apply only to other users.',
+  '已由接入流程确认的所有者可以访问并执行命令，不受本页限制。未识别到所有者身份时，按本页访问设置执行。': 'Owners confirmed during connection setup can access the bot and run commands regardless of these settings. When no owner has been identified, these access settings apply.',
+  '白名单请填写使用者的 Open ID，不是机器人的 Open ID。仅保存通配符的接入配置不包含所有者身份。': 'Enter the user’s Open ID in the allowlist, not the bot’s Open ID. A connection configured with only a wildcard has no identified owner.',
+  '扫码获得的是私聊身份，群聊只有匹配已确认的所有者身份时才豁免；其他成员按群聊白名单设置执行。': 'QR setup identifies the owner for direct messages. In groups, only a matching confirmed owner identity is exempt; other members follow the group allowlist settings.',
+  '填写使用者的 Open ID（ou_xxx），不是机器人 ID': 'Enter the user’s Open ID (ou_xxx), not the bot ID',
+  '这里需要填写用户的 Open ID，不能填写机器人自己的 Open ID。': 'Enter a user Open ID here, not the bot’s own Open ID.',
   '此区域无需配置，保存私聊设置时会保留现有群聊策略。': 'No setup is needed here. Saving direct-message settings keeps the existing group policy.',
   '访问设置已保存。': 'Access settings saved.',
   '访问设置暂不可用。': 'Access settings are currently unavailable.',

package/plugin-src/host/channels/feishu/production.mjs

@@ -1,4 +1,5 @@
 import { getImageInputSettingsStore } from '../../../../src/channels/shared/image-input-settings-store.mjs';
+import { t } from '../../../../src/channels/shared/i18n.mjs';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { unlink } from 'node:fs/promises';
@@ -291,6 +292,16 @@ export async function createProductionController(ctx, config = {}, internals = {
     stateFor: stateForBotId,
     agentPresetCatalog,
     modelCatalog,
+    validateAccessPolicyForBot(botId, policy) {
+      const botOpenId = configStore.getBot(botId)?.botOpenId;
+      if (!botOpenId) return;
+      if ([policy.direct, policy.group].some((scope) => scope.mode === 'allowlist'
+        && scope.allowlist.users.some((user) => user.id === botOpenId))) {
+        const error = new TypeError(t('这里需要填写用户的 Open ID，不能填写机器人自己的 Open ID。'));
+        error.code = 'access-policy-invalid';
+        throw error;
+      }
+    },
   });
 
   const supervisor = createSupervisor({

package/plugin-src/host/channels/shared/access-policy-production.mjs

@@ -109,6 +109,7 @@ export function privilegedSenderIdsFor(channel, config = {}) {
   }
   if (key === 'qq') return cleanIds(config.ownerUserOpenid).filter((id) => id !== '*');
   if (key === 'whatsapp') return cleanIds(config.accountJid);
+  if (key === 'discord') return cleanIds(config.ownerUserId);
   return [];
 }
 

package/plugin-src/host/channels/shared/workspace-rpc.mjs

@@ -26,6 +26,7 @@ export function publicWorkspaceError(error) {
     'model-selection-unavailable',
     'model-reasoning-unavailable',
     'context-enhancement-invalid',
+    'access-policy-invalid',
   ].includes(error?.code)) return null;
   return { code: error.code, message: error.message };
 }

package/src/channels/discord/config-store.mjs

@@ -20,6 +20,26 @@ export function maskDiscordBotId(platformId) {
 
 export class DiscordConfigStore extends TokenBotConfigStore {
   constructor(path) {
-    super(path, { channel: 'Discord', ...IDENTITY_OPTIONS });
+    super(path, {
+      channel: 'Discord',
+      ...IDENTITY_OPTIONS,
+      normalizeBotExtension(value) {
+        if (value.ownerUserId == null) return { ownerUserId: null };
+        const ownerUserId = typeof value.ownerUserId === 'string' ? value.ownerUserId.trim() : '';
+        if (!/^\d{5,30}$/.test(ownerUserId) || ownerUserId === value.platformId?.trim()) return null;
+        return { ownerUserId };
+      },
+    });
+  }
+
+  save(value) {
+    // Shared credential binding rebuilds the base config. Preserve only this
+    // bot's confirmed identity when omitted; explicit null still clears it.
+    return super.save({
+      ...value,
+      ownerUserId: value?.ownerUserId === undefined
+        ? this.get(value?.botId)?.ownerUserId ?? null
+        : value.ownerUserId,
+    });
   }
 }

package/src/channels/discord/discord-api.mjs

@@ -123,6 +123,10 @@ export class DiscordApi {
     return this.#request('users/@me', { ...options, method: 'GET' });
   }
 
+  getCurrentApplication(options = {}) {
+    return this.#request('applications/@me', { ...options, method: 'GET' });
+  }
+
   getGatewayBot(options = {}) {
     return this.#request('gateway/bot', { ...options, method: 'GET' });
   }
@@ -345,3 +349,31 @@ export async function inspectDiscordToken(token, options = {}) {
     username: cleanString(bot.username),
   };
 }
+
+/** Owner lookup is optional metadata, bounded separately from Gateway startup. */
+export async function inspectDiscordOwner(token, {
+  platformId,
+  timeoutMs = 5_000,
+  signal,
+  ...options
+} = {}) {
+  const api = new DiscordApi({ token, ...options });
+  const lookupSignal = requestSignal(signal, positiveTimeout(timeoutMs, 'owner lookup timeout'));
+  const request = { signal: lookupSignal, retry: false };
+  const application = await api.getCurrentApplication(request);
+  const bot = application?.bot ?? await api.getCurrentUser(request);
+  if ((!application?.bot && bot?.bot !== true) || bot?.bot === false
+    || snowflake(bot?.id, 'bot id') !== platformId) {
+    throw new Error('Discord application does not belong to the configured bot');
+  }
+  // A team application belongs to its team owner, not every developer or the
+  // synthetic application owner that Discord can return for team applications.
+  const ownerUserId = snowflake(application?.team != null
+    ? application.team.owner_user_id
+    : application?.owner?.id, 'owner id');
+  if (ownerUserId === platformId || (application?.owner?.bot === true && application?.team == null)) {
+    throw new Error('Discord application owner is not a human identity');
+  }
+  lookupSignal.throwIfAborted();
+  return ownerUserId;
+}

package/src/channels/discord/discord-controller.mjs

@@ -1,16 +1,37 @@
 import { TokenBotController } from '../shared/token-bot-controller.mjs';
 import { deriveDiscordBotIdentity, maskDiscordBotId } from './config-store.mjs';
-import { inspectDiscordToken } from './discord-api.mjs';
+import { inspectDiscordOwner, inspectDiscordToken } from './discord-api.mjs';
 import { DISCORD_DESCRIPTOR } from './discord-bridge.mjs';
 
 export class DiscordController extends TokenBotController {
   constructor(options) {
+    if (typeof options.createRuntime !== 'function') throw new TypeError('Discord runtime factory must be a function');
+    const inspectOwner = options.inspectOwner ?? inspectDiscordOwner;
+    if (typeof inspectOwner !== 'function') throw new TypeError('Discord owner inspector must be a function');
     super({
       ...options,
       descriptor: DISCORD_DESCRIPTOR,
       inspectToken: options.inspectToken ?? inspectDiscordToken,
       deriveIdentity: deriveDiscordBotIdentity,
       maskPlatformId: maskDiscordBotId,
+      createRuntime: async (request) => {
+        // Run inside the parent's existing per-bot transition. The production
+        // callback must receive the committed owner before building its policy.
+        let config = options.configStore.get(request.botId) ?? request.config;
+        try {
+          const ownerUserId = await inspectOwner(request.token, { platformId: config.platformId });
+          if (ownerUserId != null && ownerUserId !== config.ownerUserId) {
+            config = await options.configStore.save({ ...config, ownerUserId });
+          }
+        } catch {
+          // Neither provider errors nor optional metadata writes should break
+          // an otherwise usable bot. Do not log provider responses or user IDs.
+          (options.logger ?? console).warn?.('[dsh-im:discord] owner lookup unavailable; using saved identity', {
+            botId: request.botId,
+          });
+        }
+        return options.createRuntime({ ...request, config });
+      },
     });
   }
 }

package/src/channels/feishu/bridge.mjs

@@ -1411,11 +1411,20 @@ export class FeishuHarnessBridge {
     return current;
   }
 
+  #logAccessDenied(conversationType, reason) {
+    this.#logger.info?.('[dsh-feishu] inbound access denied', {
+      botId: this.#accessPolicy?.botId,
+      conversationType,
+      reason,
+    });
+  }
+
   #finishAccessDecision(event, messageId, access) {
     let current;
     current = Promise.resolve().then(async () => {
       if (this.#state.hasSeen(messageId)) return;
       await this.#state.markSeen(messageId);
+      this.#logAccessDenied(event.message.chat_type === 'p2p' ? 'direct' : 'group', access.reason);
       if (access.reason === 'command-not-allowed') {
         this.#status.lastMessageAt = new Date().toISOString();
         this.#status.messagesReceived += 1;
@@ -1659,6 +1668,7 @@ export class FeishuHarnessBridge {
           || (!hasImages && !hasFiles && NUMBER_REPLY.test(text) && this.#menus.has(key)),
       });
       if (!transcribedAccess.allowed) {
+        this.#logAccessDenied(event.message.chat_type === 'p2p' ? 'direct' : 'group', transcribedAccess.reason);
         if (transcribedAccess.reason === 'command-not-allowed') {
           await this.#send(
             event.message.chat_id,
@@ -2310,11 +2320,11 @@ export class FeishuHarnessBridge {
       isCommand: !isInteractionResponse,
     });
     if (!access.allowed) {
+      this.#logAccessDenied(conversationType, access.reason);
       if (access.reason === 'command-not-allowed') {
         return this.#send(route.chatId, t(COMMAND_PERMISSION_DENIED_MESSAGE))
           .catch(() => undefined);
       }
-      this.#logger.warn?.('[dsh-feishu] ignoring card action blocked by access policy');
       return Promise.resolve();
     }
     // A used card is recent even if it was first created long ago.

package/src/channels/shared/bot-workspace-store.mjs

@@ -2136,6 +2136,7 @@ export function createWorkspaceAwareController(controller, {
   stateFor,
   agentPresetCatalog,
   modelCatalog,
+  validateAccessPolicyForBot,
 } = {}) {
   if (!controller || !workspaces || typeof stateFor !== 'function') {
     throw new TypeError('controller, workspaces, and stateFor are required');
@@ -2289,6 +2290,9 @@ export function createWorkspaceAwareController(controller, {
         error.code = 'workspace-bot-not-found';
         throw error;
       }
+      // Channel-specific identity checks must finish before projecting or
+      // committing the new policy. Existing channels need no extra validation.
+      await validateAccessPolicyForBot?.(botId, policy);
       const [catalog, models] = await Promise.all([
         resolveAgentPresetCatalog(agentPresetCatalog),
         resolveModelCatalog(modelCatalog),

package/src/channels/shared/i18n-en/feishu.mjs

@@ -1,5 +1,7 @@
 // English translations (feishu area). Keys are exact Chinese literals passed to t().
 export default {
+  '这里需要填写用户的 Open ID，不能填写机器人自己的 Open ID。':
+    'Enter a user Open ID here, not the bot’s own Open ID.',
   '已结束本轮提问，将在当前会话中继续处理图片。':
     'The questions have been closed. Your image will be processed in this conversation.',
   '图片已排队，但暂时无法结束当前提问。请先回答问题或发送 /stop，结束后会继续处理图片。':