koishi-plugin-spawn-modified 1.2.5 → 1.2.6

package/lib/index.js

@@ -226,6 +226,33 @@ function validateCdCommand(command, currentDir, rootDir, restrictDirectory) {
     }
     return { valid: true };
 }
+function maskCurlOutput(command, output) {
+    if (!output)
+        return output;
+    if (!/\bcurl\b/i.test(command))
+        return output;
+    var ipv4Regex = /\b(?:(?:25[0-5]|2[0-4]\d|1?\d?\d)\.){3}(?:25[0-5]|2[0-4]\d|1?\d?\d)\b/g;
+    return output.replace(ipv4Regex, function (ip) { return (isPrivateIpv4(ip) ? ip : '*.*.*.*'); });
+}
+function isPrivateIpv4(ip) {
+    var octets = ip.split('.').map(Number);
+    if (octets.length !== 4)
+        return false;
+    if (octets.some(function (octet) { return Number.isNaN(octet) || octet < 0 || octet > 255; }))
+        return false;
+    var a = octets[0], b = octets[1];
+    if (a === 10)
+        return true;
+    if (a === 172 && b >= 16 && b <= 31)
+        return true;
+    if (a === 192 && b === 168)
+        return true;
+    if (a === 127)
+        return true;
+    if (a === 169 && b === 254)
+        return true;
+    return false;
+}
 // 渲染终端输出为图片
 function renderTerminalImage(ctx, workingDir, command, output) {
     return __awaiter(this, void 0, void 0, function () {
@@ -358,7 +385,7 @@ function apply(ctx, config) {
                                         state.code = code;
                                         state.signal = signal;
                                         state.timeUsed = Date.now() - start;
-                                        state.output = state.output.trim();
+                                        state.output = maskCurlOutput(command, state.output.trim());
                                         // 更新当前目录（如果是 cd 命令且执行成功）
                                         if (cdValidation.newDir && code === 0) {
                                             sessionDirs.set(sessionId, cdValidation.newDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-spawn-modified",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Run shell commands with Koishi",
   "keywords": [
     "bot",

package/src/index.ts

@@ -227,6 +227,30 @@ function validateCdCommand(command: string, currentDir: string, rootDir: string,
   return { valid: true }
 }
 
+function maskCurlOutput(command: string, output: string): string {
+  if (!output) return output
+  if (!/\bcurl\b/i.test(command)) return output
+
+  const ipv4Regex = /\b(?:(?:25[0-5]|2[0-4]\d|1?\d?\d)\.){3}(?:25[0-5]|2[0-4]\d|1?\d?\d)\b/g
+  return output.replace(ipv4Regex, (ip) => (isPrivateIpv4(ip) ? ip : '*.*.*.*'))
+}
+
+function isPrivateIpv4(ip: string): boolean {
+  const octets = ip.split('.').map(Number)
+  if (octets.length !== 4) return false
+  if (octets.some(octet => Number.isNaN(octet) || octet < 0 || octet > 255)) return false
+
+  const [a, b] = octets
+
+  if (a === 10) return true
+  if (a === 172 && b >= 16 && b <= 31) return true
+  if (a === 192 && b === 168) return true
+  if (a === 127) return true
+  if (a === 169 && b === 254) return true
+
+  return false
+}
+
 // 渲染终端输出为图片
 async function renderTerminalImage(ctx: Context, workingDir: string, command: string, output: string): Promise<h> {
   if (!ctx.puppeteer) {
@@ -459,7 +483,7 @@ export function apply(ctx: Context, config: Config) {
           state.code = code
           state.signal = signal
           state.timeUsed = Date.now() - start
-          state.output = state.output.trim()
+          state.output = maskCurlOutput(command, state.output.trim())
           // 更新当前目录（如果是 cd 命令且执行成功）
           if (cdValidation.newDir && code === 0) {
             sessionDirs.set(sessionId, cdValidation.newDir)