@wenbin_wb/dsh-bridge 2.4.0 → 2.5.1

package/lib/bridge-rpc.js

@@ -11,13 +11,14 @@ function ok(value) {
 }
 
 function fail(code, message, details = {}) {
-  if (code === 'cancelled') {
-    return { ok: false, error: { code: 'cancelled', message, details: {} } };
-  }
+  const allowedCodes = new Set([
+    'bad-request', 'cancelled', 'internal', 'settings-rejected', 'command-error'
+  ]);
+  const safeCode = allowedCodes.has(code) ? code : 'bad-request';
   return {
     ok: false,
     error: {
-      code: 'bad-request',
+      code: safeCode,
       message,
       details: { issues: [{ message }], ...details },
     },
@@ -54,7 +55,22 @@ async function wechatStatusValue(wechatService, logger) {
   return { ...status, login: { ...status.login, qr, qrPayload: undefined, qrKind: undefined } };
 }
 
-export function installBridgeRpc(ctx, { service, wechat, platformManager, logger, saveCustomTunnelConfig }) {
+function checkAdminAuth(authManager, payload) {
+  if (!authManager) return null;
+  if (authManager.adminPolicy === 'open') return null;
+  // 若系统尚未设置任何管理密码或访客密码，允许免密管理
+  const hasAnyPassword = authManager.hasAdminPassword || authManager.hasPassword;
+  if (!hasAnyPassword) {
+    return null;
+  }
+  // 已设置密码时，必须提供经服务端校验有效的 adminToken（绝不依赖客户端自称的 isLocalhost）
+  if (payload?.adminToken && authManager.validateAdminSession(payload.adminToken)) {
+    return null;
+  }
+  return fail('bad-request', '操作已被拦截：需要管理员权限，请先在控制台输入管理密码解锁');
+}
+
+export function installBridgeRpc(ctx, { service, authManager, wechat, platformManager, logger, saveCustomTunnelConfig }) {
   if (!ctx?.connection?.rpc?.handle) {
     logger.warn('dsh-bridge: Connection RPC unavailable — UI will not work');
     return () => {};
@@ -67,11 +83,61 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
       try {
         if (endpoint === BRIDGE_ENDPOINTS.getStatus) {
-          const status = await service.getStatus();
+          const isAdmin = checkAdminAuth(authManager, payload) === null;
+          const status = await service.getStatus({ adminAuthValid: isAdmin });
           return ok(status);
         }
 
+        // ---- 访问安全认证 ----
+
+        if (endpoint === BRIDGE_ENDPOINTS.authGetStatus) {
+          if (!authManager) return fail('bad-request', 'AuthManager 未初始化');
+          const isAdmin = checkAdminAuth(authManager, payload) === null;
+          return ok(authManager.getStatus({ masked: !isAdmin }));
+        }
+
+        if (endpoint === BRIDGE_ENDPOINTS.authUpdateConfig) {
+          if (!authManager) return fail('bad-request', 'AuthManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
+          const { enabled, mode, scope, adminPolicy, password, adminPassword } = payload;
+          if (enabled != null) await authManager.setEnabled(enabled);
+          if (mode != null) await authManager.setMode(mode);
+          if (scope != null) await authManager.setScope(scope);
+          if (adminPolicy != null) await authManager.setAdminPolicy(adminPolicy);
+          if (password !== undefined) await authManager.setPassword(password);
+          if (adminPassword !== undefined) await authManager.setAdminPassword(adminPassword);
+          return ok(authManager.getStatus({ masked: false }));
+        }
+
+        if (endpoint === BRIDGE_ENDPOINTS.authRegenerateToken) {
+          if (!authManager) return fail('bad-request', 'AuthManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
+          await authManager.regenerateSecretToken();
+          return ok(authManager.getStatus({ masked: false }));
+        }
+
+        if (endpoint === BRIDGE_ENDPOINTS.authAdminUnlock) {
+          if (!authManager) return fail('bad-request', 'AuthManager 未初始化');
+          const { password } = payload;
+          const res = authManager.unlockAdmin(password);
+          if (res.ok) return ok({ adminToken: res.adminToken });
+          return fail('bad-request', res.error || '管理员密码错误');
+        }
+
+        if (endpoint === BRIDGE_ENDPOINTS.authAdminLock) {
+          if (!authManager) return fail('bad-request', 'AuthManager 未初始化');
+          if (payload?.adminToken) authManager.revokeAdminSession(payload.adminToken);
+          return ok({ locked: true });
+        }
+
         if (endpoint === BRIDGE_ENDPOINTS.saveCustomTunnelConfig) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { serverUrl = '', accessToken = '' } = payload;
           await saveCustomTunnelConfig(serverUrl.trim(), accessToken.trim());
           const status = await service.getStatus();
@@ -79,6 +145,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
         }
 
         if (endpoint === BRIDGE_ENDPOINTS.startCustomTunnel) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           try {
             await service.startCustomTunnel();
             const status = await service.getStatus();
@@ -90,12 +159,18 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
         }
 
         if (endpoint === BRIDGE_ENDPOINTS.stopCustomTunnel) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           service.stopCustomTunnel();
           const status = await service.getStatus();
           return ok(status);
         }
 
         if (endpoint === BRIDGE_ENDPOINTS.startCloudflared) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           try {
             await service.startCloudflared();
             const status = await service.getStatus();
@@ -107,12 +182,18 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
         }
 
         if (endpoint === BRIDGE_ENDPOINTS.stopCloudflared) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           service.stopCloudflared();
           const status = await service.getStatus();
           return ok(status);
         }
 
         if (endpoint === BRIDGE_ENDPOINTS.resetCloudflared) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           await service.resetCloudflared();
           const status = await service.getStatus();
           return ok(status);
@@ -124,6 +205,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
         }
 
         if (endpoint === BRIDGE_ENDPOINTS.upgradePlugin) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const result = await service.upgradePlugin(payload);
           return ok(result);
         }
@@ -147,6 +231,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.platformLogin) {
           if (!platformManager) return fail('bad-request', 'PlatformManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { platformId, qrType } = payload;
           if (!platformId) return fail('bad-request', '缺少 platformId 参数');
           const platform = platformManager.get(platformId);
@@ -160,6 +247,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.platformSetAllowFrom) {
           if (!platformManager) return fail('bad-request', 'PlatformManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { platformId, allowFrom } = payload;
           if (!platformId) return fail('bad-request', '缺少 platformId 参数');
           const platform = platformManager.get(platformId);
@@ -172,6 +262,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.platformSetConfig) {
           if (!platformManager) return fail('bad-request', 'PlatformManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { platformId, ...config } = payload;
           if (!platformId) return fail('bad-request', '缺少 platformId 参数');
           const platform = platformManager.get(platformId);
@@ -184,6 +277,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.platformStop) {
           if (!platformManager) return fail('bad-request', 'PlatformManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { platformId } = payload;
           if (!platformId) return fail('bad-request', '缺少 platformId 参数');
           const platform = platformManager.get(platformId);
@@ -196,6 +292,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.platformStart) {
           if (!platformManager) return fail('bad-request', 'PlatformManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { platformId } = payload;
           if (!platformId) return fail('bad-request', '缺少 platformId 参数');
           const platform = platformManager.get(platformId);
@@ -208,6 +307,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.platformUnbind) {
           if (!platformManager) return fail('bad-request', 'PlatformManager 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { platformId } = payload;
           if (!platformId) return fail('bad-request', '缺少 platformId 参数');
           const platform = platformManager.get(platformId);
@@ -228,6 +330,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.wechatLogin) {
           if (!wechat) return fail('bad-request', '微信 Bot 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           const { qrType } = payload;
           const result = await wechat.login({ qrType });
           if (!result.ok) return fail('bad-request', result.error ?? '登录启动失败');
@@ -237,6 +342,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.wechatSetAllowFrom) {
           if (!wechat) return fail('bad-request', '微信 Bot 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           await wechat.setAllowFrom(payload.allowFrom);
           const value = await wechatStatusValue(wechat, logger);
           return ok(value);
@@ -244,6 +352,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.wechatSetConfig) {
           if (!wechat) return fail('bad-request', '微信 Bot 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           await wechat.setConfig(payload);
           const value = await wechatStatusValue(wechat, logger);
           return ok(value);
@@ -251,6 +362,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.wechatStop) {
           if (!wechat) return fail('bad-request', '微信 Bot 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           await wechat.stop();
           const value = await wechatStatusValue(wechat, logger);
           return ok(value);
@@ -258,6 +372,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.wechatStart) {
           if (!wechat) return fail('bad-request', '微信 Bot 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           await wechat.gateway.start().catch((err) => {
             logger.error('wechat start enabled: %s', err?.message ?? err);
           });
@@ -267,6 +384,9 @@ export function installBridgeRpc(ctx, { service, wechat, platformManager, logger
 
         if (endpoint === BRIDGE_ENDPOINTS.wechatUnbind) {
           if (!wechat) return fail('bad-request', '微信 Bot 未初始化');
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
           await wechat.unbind();
           const value = await wechatStatusValue(wechat, logger);
           return ok(value);

package/lib/feishu/node.js

@@ -75,13 +75,13 @@ export class FeishuConversationNode extends ConversationBridge {
     this._inTurn = false
 
     // 订阅网关入站消息事件
-    this.ctx.on('feishu/message', (event) => this._handleInbound(event))
+    this.disposers.push(this.ctx.on('feishu/message', (event) => this._handleInbound(event)))
 
     // 订阅卡片交互事件（审批按钮点击）
-    this.ctx.on('feishu/action', (event) => this._handleAction(event))
+    this.disposers.push(this.ctx.on('feishu/action', (event) => this._handleAction(event)))
 
     // 监听轮次事件：turn/start 开启流式会话，turn/end 最终刷新并重置
-    this.ctx.on('session/event', (session, event) => {
+    this.disposers.push(this.ctx.on('session/event', (session, event) => {
       if (session.id !== this.activeSessionId) return
       if (event.type === 'turn/start') {
         this._inTurn = true
@@ -103,7 +103,7 @@ export class FeishuConversationNode extends ConversationBridge {
         this._streamCardId = null
         this._streamContent = ''
       }
-    })
+    }))
   }
 
   async _handleInbound(event) {