@goodandready/dsh-moa 0.2.49 → 0.2.51

package/lib/history.js

@@ -53,7 +53,7 @@ export function invalidateHistoryCache() {
 
 function getOrInitCache(filePath, stat) {
   if (!_historyCache || _historyCache.filePath !== filePath || _historyCache.mtimeMs !== stat.mtimeMs || _historyCache.size !== stat.size) {
-    _historyCache = { filePath, mtimeMs: stat.mtimeMs, size: stat.size, leaderboards: new Map(), runsById: new Map(), totalCount: null }
+    _historyCache = { filePath, mtimeMs: stat.mtimeMs, size: stat.size, leaderboards: new Map(), runsById: new Map(), totalCount: null, fullyIndexed: false }
   }
   if (!_historyCache.runsById) _historyCache.runsById = new Map()
   return _historyCache
@@ -473,19 +473,20 @@ export function getMoaRunById(runId, filePath = getDefaultHistoryFile()) {
     const stat = fs.statSync(filePath)
     const cache = getOrInitCache(filePath, stat)
     if (cache.runsById.has(runId)) return cache.runsById.get(runId)
+    if (cache.fullyIndexed) return null
 
     if (stat.size <= 65536) {
       const raw = fs.readFileSync(filePath, 'utf8')
-      const lines = raw.trim().split('\n').filter(Boolean)
+      const lines = raw.trim().split(String.fromCharCode(10)).filter(Boolean)
       for (let i = lines.length - 1; i >= 0; i--) {
         try {
           const item = JSON.parse(lines[i])
-          if (item?.id) {
-            cache.runsById.set(item.id, item)
-            if (item.id === runId) return item
-          }
+          if (item?.id) cache.runsById.set(item.id, item)
         } catch { /* skip corrupt */ }
       }
+      cache.fullyIndexed = true
+      if (cache.runsById.has(runId)) return cache.runsById.get(runId)
+      cache.runsById.set(runId, null)
       return null
     }
 
@@ -501,16 +502,16 @@ export function getMoaRunById(runId, filePath = getDefaultHistoryFile()) {
     }
 
     const raw = fs.readFileSync(filePath, 'utf8')
-    const lines = raw.trim().split('\n').filter(Boolean)
+    const lines = raw.trim().split(String.fromCharCode(10)).filter(Boolean)
     for (let i = lines.length - 1; i >= 0; i--) {
       try {
         const item = JSON.parse(lines[i])
-        if (item?.id) {
-          cache.runsById.set(item.id, item)
-          if (item.id === runId) return item
-        }
+        if (item?.id) cache.runsById.set(item.id, item)
       } catch { /* skip corrupt */ }
     }
+    cache.fullyIndexed = true
+    if (cache.runsById.has(runId)) return cache.runsById.get(runId)
+    cache.runsById.set(runId, null)
     return null
   } catch {
     return null

package/lib/moa-test-gate.js

@@ -45,21 +45,12 @@ export function resolveCandidateDir(baseDir, candidateIndex, options = {}) {
 
 export function decodeEscapedStrings(str) {
   if (!str || typeof str !== 'string') return ''
-  let res = str.replace(/\\+/g, '\\').replace(/\\(?:([0-7]{1,3})|x([0-9a-fA-F]{2}))/g, (m, oct, hex) =>
+  return str.replace(/\\+/g, '\\').replace(/\\(?:([0-7]{1,3})|x([0-9a-fA-F]{2}))/g, (m, oct, hex) =>
     oct ? String.fromCharCode(parseInt(oct, 8)) : hex ? String.fromCharCode(parseInt(hex, 16)) : m
   )
-  return res.replace(/(?<![A-Za-z0-9+/=])(?:(?:[A-Za-z0-9+/]{4}){2,}|(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=))(?![A-Za-z0-9+/=])/g, (m) => {
-    try {
-      const dec = Buffer.from(m, 'base64').toString('utf8')
-      return /^[\x20-\x7E\r\n\t]+$/.test(dec) ? dec : m
-    } catch (err) {
-      logger.debug('[dsh-moa:testGate] base64 decode skip:', err?.message || err)
-      return m
-    }
-  })
 }
 
-const COMPUTED_SHELL_EVASION = /(?:base64\s+(?:-d|--decode|-D)[^|\n;]*\|\s*(?:ba|z|da)?sh|\beval\s+["\']?\$|\bxxd\s+-r[^|\n;]*\|\s*(?:ba|z|da)?sh|\bprintf\s+[^|\n]+\|\s*(?:ba|z|da)?sh|\bopenssl\s+enc\s+-d[^|\n;]*\|\s*(?:ba|z|da)?sh)/i
+const COMPUTED_SHELL_EVASION = /(?:base64\s+(?:-d|--decode|-D)[^|\n;]*\|\s*(?:ba|z|da)?sh|\beval\s+["']?\$|\bxxd\s+-r[^|\n;]*\|\s*(?:ba|z|da)?sh|\bprintf\s+[^|\n]+\|\s*(?:ba|z|da)?sh|\bopenssl\s+enc\s+-d[^|\n;]*\|\s*(?:ba|z|da)?sh|\bprintf\s+(?:%s|["']%s["'])\s+.*["'](?:\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\$\(\s*(?:printf|echo)\s+.*["'](?:\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\x60\s*(?:printf|echo)\s+.*["'](?:\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\b(?:cat|head|tail|source|\.|touch|rm|cp|mv)\s+["']?\$[A-Za-z_]|>\s*["']?\$[A-Za-z_]|>>\s*["']?\$[A-Za-z_])/i
 
 const UNIX_ROOT_PREFIX = /^\/(?:home|root|etc|var|tmp|opt|mnt|srv|media|proc|sys|dev|usr|bin|lib|lib64|run\/(?:user\/\d+|systemd|lock|credentials|secrets|udev|initramfs|mount|shm|dbus|sshd|motd)|sbin|boot|Users\/(?:[a-zA-Z0-9_\-.]+)|Applications|Library|System|Volumes|private)(?:\/|$)/
 
@@ -82,6 +73,12 @@ function scanPathTokensForLeak(text, allowedRoots, executionDir) {
   }
   const rawLeak = checkText(text)
   if (rawLeak) return rawLeak
+  const segmented = text.match(/\bprintf\s+(?:%s|['"]%s['"])\s+((?:['"][^'"]*['"]\s*)+)/i)
+  if (segmented) {
+    const assembled = (segmented[1].match(/['"]([^'"]*)['"]/g) || []).map((s) => s.slice(1, -1)).join('')
+    const assembledLeak = checkText(assembled)
+    if (assembledLeak) return assembledLeak
+  }
   const decoded = decodeEscapedStrings(text)
   return decoded !== text ? checkText(decoded) : null
 }
@@ -166,6 +163,18 @@ export async function runCandidateTestGate({
       stderr = customRes?.stderr || ''
     } else {
       const allowedRoots = [executionDir, cwd, ...(candidateDir && candidateDir !== executionDir ? [candidateDir] : [])]
+      if (COMPUTED_SHELL_EVASION.test(resolvedCmd)) {
+        const durationMs = Date.now() - startTime
+        return {
+          candidateIndex,
+          passed: false,
+          exitCode: 1,
+          durationMs,
+          command: resolvedCmd,
+          output: 'Access denied: test command contains obfuscated or computed command execution',
+          summary: `FAIL (code 1, ${durationMs}ms)`,
+        }
+      }
       const cmdTokens = resolvedCmd.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) || []
 
       // 1. Check command tokens for absolute path leaks
@@ -310,7 +319,7 @@ function decodeEscaped(str) {
     return m;
   });
 }
-const COMPUTED_SHELL_EVASION = /(?:base64\\s+(?:-d|--decode|-D)[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\beval\\s+["\']?\\$|\\bxxd\\s+-r[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\bprintf\\s+[^|\\n]+\\|\\s*(?:ba|z|da)?sh|\\bopenssl\\s+enc\\s+-d[^|\\n;]*\\|\\s*(?:ba|z|da)?sh)/i;
+const COMPUTED_SHELL_EVASION = /(?:base64\\s+(?:-d|--decode|-D)[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\beval\\s+["']?\\$|\\bxxd\\s+-r[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\bprintf\\s+[^|\\n]+\\|\\s*(?:ba|z|da)?sh|\\bopenssl\\s+enc\\s+-d[^|\\n;]*\\|\\s*(?:ba|z|da)?sh|\\bprintf\\s+(?:%s|["']%s["'])\\s+.*["'](?:\\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\\$\\(\\s*(?:printf|echo)\\s+.*["'](?:\\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\\x60\\s*(?:printf|echo)\\s+.*["'](?:\\/|mnt|home|tmp|etc|var|usr|root|opt)["']|\\b(?:cat|head|tail|source|\\.|touch|rm|cp|mv)\\s+["']?\\$[A-Za-z_]|>\\s*["']?\\$[A-Za-z_]|>>\\s*["']?\\$[A-Za-z_])/i;
 const UNIX_ROOT_PREFIX = /^\\/(?:home|root|etc|var|tmp|opt|mnt|srv|media|proc|sys|dev|usr|bin|lib|lib64|run\\/(?:user\\/\\d+|systemd|lock|credentials|secrets|udev|initramfs|mount|shm|dbus|sshd|motd)|sbin|boot|Users\\/(?:[a-zA-Z0-9_\\-.]+)|Applications|Library|System|Volumes|private)(?:\\/|$)/;
 function checkSinglePath(p) {
   if (!p || typeof p !== 'string') return true;
@@ -355,36 +364,12 @@ function guardArgs(cmd, args) {
     }
   }
 }
-const origSpawn = cp.spawn;
-cp.spawn = function(cmd, args, opts) {
-  guardArgs(cmd, args);
-  return origSpawn.apply(this, arguments);
-};
-const origSpawnSync = cp.spawnSync;
-cp.spawnSync = function(cmd, args, opts) {
-  guardArgs(cmd, args);
-  return origSpawnSync.apply(this, arguments);
-};
-const origExecFile = cp.execFile;
-cp.execFile = function(file, args, opts, cb) {
-  guardArgs(file, args);
-  return origExecFile.apply(this, arguments);
-};
-const origExecFileSync = cp.execFileSync;
-cp.execFileSync = function(file, args, opts) {
-  guardArgs(file, args);
-  return origExecFileSync.apply(this, arguments);
-};
-const origExec = cp.exec;
-cp.exec = function(cmd, opts, cb) {
-  guardArgs(cmd, [cmd]);
-  return origExec.apply(this, arguments);
-};
-const origExecSync = cp.execSync;
-cp.execSync = function(cmd, opts) {
-  guardArgs(cmd, [cmd]);
-  return origExecSync.apply(this, arguments);
-};
+const origSpawn = cp.spawn; cp.spawn = function(cmd, args, opts) { guardArgs(cmd, args); return origSpawn.apply(this, arguments); };
+const origSpawnSync = cp.spawnSync; cp.spawnSync = function(cmd, args, opts) { guardArgs(cmd, args); return origSpawnSync.apply(this, arguments); };
+const origExecFile = cp.execFile; cp.execFile = function(file, args, opts, cb) { guardArgs(file, args); return origExecFile.apply(this, arguments); };
+const origExecFileSync = cp.execFileSync; cp.execFileSync = function(file, args, opts) { guardArgs(file, args); return origExecFileSync.apply(this, arguments); };
+const origExec = cp.exec; cp.exec = function(cmd, opts, cb) { guardArgs(cmd, [cmd]); return origExec.apply(this, arguments); };
+const origExecSync = cp.execSync; cp.execSync = function(cmd, opts) { guardArgs(cmd, [cmd]); return origExecSync.apply(this, arguments); };
 const fsMod = require('node:fs');
 function guardFs(p, isWrite) {
   if (!p || typeof p !== 'string') return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-moa",
-  "version": "0.2.49",
+  "version": "0.2.51",
   "description": "Mixture of Agents (MoA) plugin for DeepSeek Harness with /moa slash command",
   "type": "module",
   "main": "lib/index.js",