@myassis/gateway 1.0.44 → 1.0.46

package/dist/services/tools/exec.js

@@ -10,7 +10,6 @@ const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const shared_1 = require("@myassis/shared");
 const crypto_1 = __importDefault(require("crypto"));
-const ServiceManager_js_1 = require("../ServiceManager.js");
 const logger = (0, shared_1.getLogger)('exec');
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 // 待批准的命令缓存：token -> { command, cwd, timeout, sessionId, expiresAt }
@@ -70,6 +69,39 @@ exports.clearSessionCwd = clearSessionCwd;
 function generateApprovalToken() {
     return crypto_1.default.randomBytes(16).toString('hex');
 }
+function tokenizeCommand(command) {
+    return command.match(/"[^"]*"|'[^']*'|&&|\|\||[;&|\r\n]|\S+/g) ?? [];
+}
+function buildCommandSafetyView(command) {
+    const textCommands = new Set(['echo', 'findstr', 'grep']);
+    const separators = new Set(['&&', '||', '&', '|', ';', '\r', '\n']);
+    const tokens = tokenizeCommand(command);
+    const view = [];
+    let skipTextArgs = false;
+    const getCommandName = (token) => {
+        const normalized = token
+            .replace(/^["']|["']$/g, '')
+            .replace(/\\/g, '/')
+            .toLowerCase();
+        return (normalized.split('/').pop() ?? normalized)
+            .replace(/\.(exe|cmd|bat|ps1|sh)$/i, '');
+    };
+    for (const token of tokens) {
+        if (separators.has(token)) {
+            view.push(token);
+            skipTextArgs = false;
+            continue;
+        }
+        if (skipTextArgs) {
+            continue;
+        }
+        view.push(token);
+        if (textCommands.has(getCommandName(token))) {
+            skipTextArgs = true;
+        }
+    }
+    return view.join(' ');
+}
 /** 检查命令是否危险 */
 function isDangerousCommand(command) {
     // 命令分隔符（起始位置、空格、shell 操作符）隔离的危险关键字
@@ -82,11 +114,8 @@ function isDangerousCommand(command) {
         /(^|[\s;|&])mkfs\b/i,
         /(^|[\s;|&])dd\s+if=.*of=\/dev\//i,
     ];
-    for (const reg of dangerousPatterns) {
-        if (reg.test(command))
-            return true;
-    }
-    return false;
+    const safetyCommand = buildCommandSafetyView(command);
+    return dangerousPatterns.some(pattern => pattern.test(safetyCommand));
 }
 /** 添加待批准命令，返回 token */
 function addPendingApproval(command, cwd, timeout, sessionId) {
@@ -176,23 +205,6 @@ exports.execTool = {
                     return;
                 }
             }
-            // Windows 下通过 Helper 以登录用户身份执行
-            if (process.platform === 'win32') {
-                try {
-                    const result = await (0, ServiceManager_js_1.execAsUser)(command, cwd);
-                    resolve({
-                        success: result.exitCode === 0,
-                        output: result.stdout.substring(0, 100000),
-                        errorMessage: result.stderr.substring(0, 100000),
-                        exitCode: result.exitCode,
-                    });
-                    return;
-                }
-                catch (e) {
-                    resolve({ success: false, errorMessage: e?.message || String(e) });
-                    return;
-                }
-            }
             const options = {
                 cwd,
                 timeout,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {