@wrongstack/tools 0.3.3 → 0.3.4

package/dist/builtin.js

@@ -61,8 +61,8 @@ async function* spawnStream(opts) {
   let spawnFailed = false;
   for (; ; ) {
     while (queue.length === 0) {
-      await new Promise((resolve4) => {
-        waiter = resolve4;
+      await new Promise((resolve5) => {
+        waiter = resolve5;
       });
     }
     const chunk = queue.shift();
@@ -351,10 +351,10 @@ var bashTool = {
         queue.push(c);
       }
     };
-    const next = () => new Promise((resolve4) => {
+    const next = () => new Promise((resolve5) => {
       const c = queue.shift();
-      if (c) resolve4(c);
-      else resolveNext = resolve4;
+      if (c) resolve5(c);
+      else resolveNext = resolve5;
     });
     let lastFlush = Date.now();
     const flush = () => {
@@ -589,7 +589,7 @@ function findGitDir(cwd) {
   return null;
 }
 function runGit(args, cwd, signal) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let stdout = "";
     let stderr = "";
     const child = spawn("git", args, { cwd, signal, stdio: ["ignore", "pipe", "pipe"] });
@@ -599,8 +599,8 @@ function runGit(args, cwd, signal) {
     child.stderr?.on("data", (c) => {
       stderr += c.toString();
     });
-    child.on("close", (code) => resolve4({ stdout, stderr, exitCode: code ?? 0 }));
-    child.on("error", (e) => resolve4({ stdout: "", stderr: e.message, exitCode: 1 }));
+    child.on("close", (code) => resolve5({ stdout, stderr, exitCode: code ?? 0 }));
+    child.on("error", (e) => resolve5({ stdout: "", stderr: e.message, exitCode: 1 }));
   });
 }
 async function fileDiff(input, ctx, signal) {
@@ -934,7 +934,7 @@ var ALLOWED_COMMANDS = {
   cargo: ["--version", "build", "test", "check"],
   rustc: ["--version"],
   go: ["version", "run", "build", "test"],
-  python: ["--version", "-c"],
+  python: ["--version"],
   pip: ["--version", "install", "list"],
   docker: ["--version", "ps", "images", "build"],
   kubectl: ["version", "get", "describe", "logs"]
@@ -942,6 +942,30 @@ var ALLOWED_COMMANDS = {
 var MAX_ARGS = 20;
 var MAX_OUTPUT2 = 2e5;
 var TIMEOUT_MS = 3e4;
+var BLOCKED_ARG_PATTERNS = {
+  // python -c/--command executes arbitrary code; python -m runs modules
+  python: [/-c$/, /^--command$/, /^-m$/, /^--module$/],
+  // git --exec=<cmd> runs arbitrary commands via upload-pack/receive-pack
+  git: [/^--exec=/, /^--upload-pack=/, /^--receive-pack=/],
+  // node -r/--require preloads arbitrary modules; --eval executes code
+  node: [/^-r$/, /^--require$/, /^-e$/, /^--eval$/, /^--prof-process$/],
+  // go run could execute arbitrary .go files; -ldflags could inject build-time code
+  go: [/^-ldflags$/],
+  // bun --preload is similar to node --require
+  bun: [/^--preload$/]
+};
+function validateArgs(cmd, args) {
+  const blocked = BLOCKED_ARG_PATTERNS[cmd];
+  if (!blocked) return null;
+  for (const arg of args) {
+    for (const pattern of blocked) {
+      if (pattern.test(arg)) {
+        return `Blocked argument "${arg}" for command "${cmd}" (matches security pattern ${pattern})`;
+      }
+    }
+  }
+  return null;
+}
 var execTool = {
   name: "exec",
   category: "Shell",
@@ -985,6 +1009,18 @@ var execTool = {
     }
     const args = (input.args ?? []).slice(0, MAX_ARGS);
     const timeout = Math.max(1, Math.min(input.timeout ?? TIMEOUT_MS, TIMEOUT_MS));
+    const argError = validateArgs(cmd, args);
+    if (argError) {
+      return {
+        command: cmd,
+        args,
+        stdout: "",
+        stderr: argError,
+        exitCode: 1,
+        truncated: false,
+        allowed: false
+      };
+    }
     const requestedCwd = input.cwd ? path.resolve(ctx.projectRoot, input.cwd) : ctx.cwd;
     const rel = path.relative(ctx.projectRoot, requestedCwd);
     if (rel.startsWith("..") || path.isAbsolute(rel)) {
@@ -1004,7 +1040,7 @@ var execTool = {
   }
 };
 function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let stdout = "";
     let stderr = "";
     let killed = false;
@@ -1026,7 +1062,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve4({
+      resolve5({
         command: cmd,
         args,
         stdout: stdout.slice(0, MAX_OUTPUT2),
@@ -1038,7 +1074,7 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
     });
     child.on("error", (err) => {
       clearTimeout(timer);
-      resolve4({
+      resolve5({
         command: cmd,
         args,
         stdout: stdout.slice(0, MAX_OUTPUT2),
@@ -1565,7 +1601,7 @@ function buildArgs(input) {
   }
 }
 function runGit2(args, cwd, signal) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let stdout = "";
     let stderr = "";
     const child = spawn("git", args, {
@@ -1584,7 +1620,7 @@ function runGit2(args, cwd, signal) {
       }
     });
     child.on("error", (err) => {
-      resolve4({
+      resolve5({
         command: args[0],
         stdout,
         stderr: err.message,
@@ -1593,7 +1629,7 @@ function runGit2(args, cwd, signal) {
       });
     });
     child.on("close", (code) => {
-      resolve4({
+      resolve5({
         command: args[0],
         stdout: stdout.slice(0, MAX_OUTPUT3),
         stderr: stderr.slice(0, MAX_OUTPUT3),
@@ -1774,13 +1810,13 @@ var grepTool = {
   }
 };
 async function detectRg(signal) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     try {
       const p = spawn("rg", ["--version"], { stdio: "ignore", signal });
-      p.on("error", () => resolve4(false));
-      p.on("close", (code) => resolve4(code === 0));
+      p.on("error", () => resolve5(false));
+      p.on("close", (code) => resolve5(code === 0));
     } catch {
-      resolve4(false);
+      resolve5(false);
     }
   });
 }
@@ -2039,6 +2075,22 @@ var installTool = {
     const pkgList = input.packages ? (Array.isArray(input.packages) ? input.packages : input.packages.split(",")).map(
       (p) => p.trim()
     ) : [];
+    const PKG_NAME_RE = /^(?:@[a-z0-9._-]+\/)?[a-z0-9._-]+$/i;
+    for (const pkg of pkgList) {
+      if (!PKG_NAME_RE.test(pkg) || pkg.startsWith("-")) {
+        yield {
+          type: "final",
+          output: {
+            packages: pkgList,
+            exit_code: 1,
+            output: `Invalid package name "${pkg}". Names must match ${PKG_NAME_RE} and not start with "-".`,
+            dry_run: Boolean(input.dry_run),
+            truncated: false
+          }
+        };
+        return;
+      }
+    }
     if (pkgList.length > 0) args.push(...pkgList);
     yield {
       type: "log",
@@ -2361,8 +2413,17 @@ var logsTool = {
 async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
   const args = ["logs"];
   if (lines > 0) args.push("--tail", String(lines));
+  if (!/^[a-zA-Z0-9][a-zA-Z0-9._:-]+$/.test(service)) {
+    return {
+      source: `docker:${service}`,
+      entries: [],
+      total: 0,
+      truncated: false,
+      stream_mode: false
+    };
+  }
   args.push("--timestamps", service);
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let stdout = "";
     let stderr = "";
     const MAX = 2e5;
@@ -2376,7 +2437,7 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
     child.on("close", (code) => {
       const output = stdout + stderr;
       const entries = parseLogLines(output, filterRe);
-      resolve4({
+      resolve5({
         source: `docker:${service}`,
         entries,
         total: entries.length,
@@ -2386,7 +2447,7 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
     });
     child.on(
       "error",
-      (e) => resolve4({
+      (e) => resolve5({
         source: `docker:${service}`,
         entries: [],
         total: 0,
@@ -2520,7 +2581,7 @@ async function detectManager2(cwd) {
   return "npm";
 }
 function runOutdated(manager, args, cwd, signal) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let stdout = "";
     let stderr = "";
     const MAX = 1e5;
@@ -2533,11 +2594,11 @@ function runOutdated(manager, args, cwd, signal) {
     });
     child.on("close", (code) => {
       const result = parseOutdatedOutput(stdout, code ?? 0);
-      resolve4(result);
+      resolve5(result);
     });
     child.on(
       "error",
-      (e) => resolve4({
+      (e) => resolve5({
         exit_code: 1,
         packages: [],
         total: 0,
@@ -2667,7 +2728,7 @@ function stripPathComponents(p, strip) {
   return parts.slice(strip).join("/");
 }
 function runPatch(args, cwd, signal) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     let stdout = "";
     let stderr = "";
     const env = { ...buildChildEnv(), LANG: "C", LC_ALL: "C" };
@@ -2678,8 +2739,8 @@ function runPatch(args, cwd, signal) {
     child.stderr?.on("data", (c) => {
       stderr += c.toString();
     });
-    child.on("close", (code) => resolve4({ exitCode: code ?? 1, stdout, stderr }));
-    child.on("error", (e) => resolve4({ exitCode: 1, stdout: "", stderr: e.message }));
+    child.on("close", (code) => resolve5({ exitCode: code ?? 1, stdout, stderr }));
+    child.on("error", (e) => resolve5({ exitCode: 1, stdout: "", stderr: e.message }));
   });
 }
 function extractPatchedFiles(output) {
@@ -2975,13 +3036,13 @@ async function globFiles(pattern, base, extraGlob) {
   return await globNative(pattern, base, extraGlob);
 }
 function checkRg() {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     try {
       const p = spawn("rg", ["--version"], { stdio: "ignore" });
-      p.on("error", () => resolve4(false));
-      p.on("close", (code) => resolve4(code === 0));
+      p.on("error", () => resolve5(false));
+      p.on("close", (code) => resolve5(code === 0));
     } catch {
-      resolve4(false);
+      resolve5(false);
     }
   });
 }
@@ -2993,10 +3054,10 @@ function spawnRgFind(pattern, base) {
     buf += chunk.toString();
   });
   return {
-    promise: new Promise((resolve4, reject) => {
+    promise: new Promise((resolve5, reject) => {
       child.on("error", reject);
       child.on("close", () => {
-        resolve4(buf.split("\n").filter(Boolean));
+        resolve5(buf.split("\n").filter(Boolean));
       });
     })
   };
@@ -3160,7 +3221,7 @@ var scaffoldTool = {
     const vars = { name, ...input.vars };
     const builtIn = BUILT_IN_TEMPLATES[input.template];
     if (builtIn) {
-      return await handleBuiltIn(name, builtIn.files, cwd, input.dry_run ?? false, vars);
+      return await handleBuiltIn(name, builtIn.files, cwd, ctx, input.dry_run ?? false, vars);
     }
     return {
       template: input.template,
@@ -3172,12 +3233,19 @@ var scaffoldTool = {
     };
   }
 };
-async function handleBuiltIn(name, templateFiles, cwd, dryRun, vars) {
+async function handleBuiltIn(name, templateFiles, cwd, ctx, dryRun, vars) {
   const files = [];
   let filesCreated = 0;
   for (const [filePath, content] of Object.entries(templateFiles)) {
     const resolvedPath = substituteVars(filePath, name, vars);
-    const fullPath = path.join(cwd, resolvedPath);
+    const joinedPath = path.join(cwd, resolvedPath);
+    const root = path.resolve(ctx.projectRoot);
+    const target = path.resolve(joinedPath);
+    const rel = path.relative(root, target);
+    if (rel.startsWith("..") || path.isAbsolute(rel)) {
+      throw new Error(`scaffold: generated path "${resolvedPath}" would escape project root`);
+    }
+    const fullPath = target;
     if (!dryRun) {
       await fs9.mkdir(path.dirname(fullPath), { recursive: true });
       await fs9.writeFile(fullPath, substituteVars(content, name, vars), "utf8");