@poe-platform/safe-bash 0.1.423 → 0.1.425

package/README.md

@@ -270,7 +270,7 @@ For SafeJS host integration, `makeSafeJsShellModule` exposes shell execution and
 | --- | --- |
 | `fs` | Required filesystem; no implicit host access. |
 | `cwd` | Initial virtual directory; defaults to `/`. |
-| `env` | Initial exported variables; defaults to an empty map, with `PWD` set from `cwd`. No host environment inheritance. Never pass host `process.env` or any secret-bearing object: everything in `env` is readable by executed scripts (`env`, `printenv`, `$VAR`), and on Cloudflare Workers with `nodejs_compat` `process.env` contains the Worker's secret bindings. The shell logs a warning when it detects this. |
+| `env` | Initial exported variables; defaults to an empty map, with `PWD` set from `cwd`. No host environment inheritance. Never pass host `process.env` or any secret-bearing object: everything in `env` is readable by executed scripts (`env`, `printenv`, `$VAR`), and on Cloudflare Workers with `nodejs_compat` `process.env` contains the Worker's secret bindings. The shell warns only for the identical host `process.env` object, not copies, and does not filter values. |
 | `commands` | Existing `CommandRegistry`; defaults to an empty registry. |
 | `limits` | Resource limits listed below. |
 
@@ -289,7 +289,7 @@ provided. Pass an `AbortSignal` as `signal` to cancel. [Option types](src/shell/
 | `maxExpansionFields` | 10,000 |
 | `maxExpansionBytes` | 16 MiB |
 | `maxWallClockMs` | 30 seconds |
-| `maxCpuMs` | 30 seconds, checked at command and cooperative-yield checkpoints |
+| `maxCpuMs` | 30 seconds elapsed including waits; checkpoint-enforced, not CPU accounting or preemptive enforcement. |
 | `pipeHighWaterMark` | 64 KiB |
 
 Always call `dispose()` when finished. Shell failures normally produce an exit

package/dist/safe-bash/browser.js

@@ -9195,6 +9195,7 @@ var InvocationScope = class _InvocationScope {
   parent;
   #children = /* @__PURE__ */ new Set();
   #callbacks = [];
+  #finalizers = [];
   #work = /* @__PURE__ */ new Set();
   #controller = new AbortController();
   #closed = false;
@@ -9202,6 +9203,10 @@ var InvocationScope = class _InvocationScope {
   get signal() {
     return this.#controller.signal;
   }
+  registerFinalizer(finalize) {
+    this.assertOpen();
+    this.#finalizers.push(finalize);
+  }
   assertOpen() {
     this.callerSignal?.throwIfAborted();
     if (this.#closed) throw this.signal.reason;
@@ -9256,6 +9261,13 @@ var InvocationScope = class _InvocationScope {
             ...this.#work
           ]);
         } finally {
+          for (const finalize of this.#finalizers.splice(0)) {
+            try {
+              finalize();
+            } catch (error) {
+              this.failures.push(error);
+            }
+          }
           if (this.parent) this.parent.#children.delete(this);
         }
       });
@@ -11605,6 +11617,89 @@ async function matchEre(program, subject, ledger, signal) {
   return Object.freeze({ matched: false, captures: Object.freeze([]), values: Object.freeze([]) });
 }
 
+// packages/safe-bash/src/shell/path-lookup.ts
+init_platform();
+var maxCacheEntries = 256;
+var maxCacheBytes = 64 * 1024;
+var PathLookup = class {
+  #entries = /* @__PURE__ */ new Map();
+  #bytes = 0;
+  #pending = 0;
+  #generation = 0;
+  suspend() {
+    this.#entries.clear();
+    this.#bytes = 0;
+    this.#generation++;
+    this.#pending++;
+    let closed = false;
+    return () => {
+      if (closed) return;
+      closed = true;
+      this.#pending--;
+      this.#generation++;
+    };
+  }
+  suspendUntilClosed(scope) {
+    scope.assertOpen();
+    const resume = this.suspend();
+    scope.registerFinalizer(resume);
+  }
+  async isFile(fs, path, signal) {
+    signal.throwIfAborted();
+    const cached = this.#entries.get(path);
+    if (cached) return cached.file;
+    const generation = this.#generation;
+    let file;
+    try {
+      file = (await fs.stat(path, { signal })).type === "file";
+    } catch (error) {
+      signal.throwIfAborted();
+      const code = typeof error === "object" && error !== null && "code" in error ? error.code : void 0;
+      if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+      file = false;
+    }
+    signal.throwIfAborted();
+    const bytes2 = import_buffer.Buffer.byteLength(path) + 64;
+    if (!this.#pending && generation === this.#generation && bytes2 <= maxCacheBytes && !this.#entries.has(path)) {
+      while (this.#entries.size >= maxCacheEntries || this.#bytes + bytes2 > maxCacheBytes) {
+        const oldest = this.#entries.entries().next().value;
+        this.#bytes -= oldest[1].bytes;
+        this.#entries.delete(oldest[0]);
+      }
+      this.#entries.set(path, { file, bytes: bytes2 });
+      this.#bytes += bytes2;
+    }
+    return file;
+  }
+};
+function* pathTargets(name2, path, limits, signal, fail2) {
+  signal.throwIfAborted();
+  if (path !== void 0 && import_buffer.Buffer.byteLength(path) > limits.maxExpansionBytes) fail2("maxExpansionBytes");
+  if (name2.includes("/") || path === void 0) {
+    if (limits.maxExpansionFields < 1) fail2("maxExpansionFields");
+    yield name2;
+    return;
+  }
+  let fields = 1;
+  for (let separator = path.indexOf(":"); separator >= 0; separator = path.indexOf(":", separator + 1)) {
+    signal.throwIfAborted();
+    if (++fields > limits.maxExpansionFields) fail2("maxExpansionFields");
+  }
+  if (fields > limits.maxExpansionFields) fail2("maxExpansionFields");
+  let start = 0;
+  let consulted = 0;
+  while (start <= path.length) {
+    signal.throwIfAborted();
+    if (consulted >= limits.maxPathComponents) fail2("maxPathComponents");
+    consulted++;
+    const end = path.indexOf(":", start);
+    const component = path.slice(start, end < 0 ? path.length : end);
+    yield `${component || "."}${component.endsWith("/") ? "" : "/"}${name2}`;
+    if (end < 0) return;
+    start = end + 1;
+  }
+}
+
 // packages/safe-bash/src/shell/runtime.ts
 var defaultLimits = {
   maxParseUnits: defaultMaxParseUnits,
@@ -11612,6 +11707,7 @@ var defaultLimits = {
   maxOutputBytes: 16 * 1024 * 1024,
   maxCommands: 1e4,
   maxFileSystemOperations: 1e5,
+  maxPathComponents: 64,
   maxRedirects: 64,
   maxPipelineStages: 64,
   maxLoopIterations: 1e4,
@@ -11705,6 +11801,7 @@ var Budget = class {
   }
   limits;
   executionScope = Object.freeze({});
+  pathLookup = new PathLookup();
   parsing;
   values;
   commands = 0;
@@ -13914,9 +14011,11 @@ var Runtime = class _Runtime {
                 });
               } };
             };
+            const resumePathCache = this.budget.pathLookup.suspend();
             const release = () => {
               if (closed) return;
               closed = true;
+              resumePathCache();
               if (--file.references === 0 && this.outputFiles.get(path) === file) this.outputFiles.delete(path);
             };
             let target2;
@@ -14191,6 +14290,7 @@ var Runtime = class _Runtime {
     if (argumentValues.values.every((value2) => typeof value2 === "string")) Reflect.deleteProperty(context, "argumentValues");
     const middleware = this.middleware.map((handler) => (context2, next) => {
       scope.assertOpen();
+      this.budget.pathLookup.suspendUntilClosed(scope);
       let downstream;
       const raw = handler(context2, () => {
         downstream = next();
@@ -14384,6 +14484,7 @@ var Runtime = class _Runtime {
           await this.diagnostic({ ...io, ...context2 }, `${context2.command}: command not found`);
           return { exitCode: 127 };
         }
+        this.budget.pathLookup.suspendUntilClosed(scope);
         const raw = definition.execute(forwarded);
         const observed = this.observeRuntimeReturn(raw, runtimeFrame);
         return await interruptible(observed, this.signal);
@@ -14537,25 +14638,20 @@ ${functionDisplay(name2, state.functions.get(name2))}`;
   }
   async searchPaths(name2, state, all = false, discovery = false) {
     if (!name2) return [];
-    const path = state.variables.PATH;
-    if (path !== void 0 && import_buffer.Buffer.byteLength(path) > this.budget.limits.maxExpansionBytes) this.budget.fail("maxExpansionBytes");
-    const components = name2.includes("/") || path === void 0 ? [void 0] : path.split(":");
-    if (components.length > this.budget.limits.maxExpansionFields) this.budget.fail("maxExpansionFields");
     let denied;
     const matches = [];
-    for (const component of components) {
-      this.signal.throwIfAborted();
-      const target = component === void 0 ? name2 : `${component || "."}${component?.endsWith("/") ? "" : "/"}${name2}`;
+    for (const target of pathTargets(name2, state.variables.PATH, this.budget.limits, this.signal, (limit) => this.budget.fail(limit))) {
       const resolved = resolvePath(state.cwd, target);
       try {
         const options3 = { signal: this.signal };
-        if ((await interruptible(this.fs.stat(resolved, options3), this.signal)).type !== "file") continue;
+        if (!await interruptible(this.budget.pathLookup.isFile(this.fs, resolved, this.signal), this.signal)) continue;
         if (this.fs.capabilities.permissions !== true) throw new CommandFailure(`${target}: execution permissions are not supported by this filesystem`, 126);
         await interruptible(this.fs.access(resolved, ACCESS_MODES.X_OK, options3), this.signal);
         matches.push(target);
         if (!all) return matches;
       } catch (error) {
         this.signal.throwIfAborted();
+        if (error instanceof ShellLimitError) throw error;
         if (error instanceof CommandFailure) {
           if (discovery) continue;
           throw error;
@@ -14805,6 +14901,7 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
       const runtimeFrame = {};
       const middleware = this.middleware.map((handler) => (context2, next) => {
         scope.assertOpen();
+        this.budget.pathLookup.suspendUntilClosed(scope);
         let downstream;
         const raw = handler(context2, () => {
           downstream = next();
@@ -14887,7 +14984,10 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
         return { exitCode: await runtime.interpreter(forwarded, state2, childIO, loadedSource) };
       }
       if (direct) return { exitCode: await runtime.scriptFile(forwarded, state2, childIO, command2, forwarded.args, true) };
-      if (definition) return definition.execute(forwarded);
+      if (definition) {
+        runtime.budget.pathLookup.suspendUntilClosed(childIO[invocationScope]);
+        return definition.execute(forwarded);
+      }
       await writeDiagnostic(forwarded.stderr, `env: ${command2}: command not found
 `);
       return { exitCode: 127 };
@@ -14907,6 +15007,7 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
       args: argumentValues.args,
       argumentValues
     }, state, io, async (runtime, forwarded) => {
+      runtime.budget.pathLookup.suspendUntilClosed(io[invocationScope]);
       let failed = false;
       let failure;
       let failureReport;
@@ -15079,16 +15180,11 @@ ${prefix2} line ${offset + line}: \`${source.split("\n")[line - 1] ?? ""}'
     try {
       const options3 = { signal: this.signal };
       if (filename && !filename.includes("/") && state.variables.PATH) {
-        if (import_buffer.Buffer.byteLength(state.variables.PATH) > this.budget.limits.maxExpansionBytes) this.budget.fail("maxExpansionBytes");
-        const components = state.variables.PATH.split(":");
-        if (components.length > this.budget.limits.maxExpansionFields) this.budget.fail("maxExpansionFields");
         let found = false;
-        for (const component of components) {
-          this.signal.throwIfAborted();
-          const candidate = `${component || "."}${component.endsWith("/") ? "" : "/"}${filename}`;
+        for (const candidate of pathTargets(filename, state.variables.PATH, this.budget.limits, this.signal, (limit) => this.budget.fail(limit))) {
           const path2 = resolvePath(state.cwd, candidate);
           try {
-            if ((await interruptible(this.fs.stat(path2, options3), this.signal)).type !== "file") continue;
+            if (!await interruptible(this.budget.pathLookup.isFile(this.fs, path2, this.signal), this.signal)) continue;
             await interruptible(this.fs.access(path2, ACCESS_MODES.R_OK, options3), this.signal);
             target = candidate;
             found = true;
@@ -17697,6 +17793,7 @@ var cloudflareWorkerLimits = Object.freeze({
   maxOutputBytes: 4 * 1024 * 1024,
   maxCommands: 1e3,
   maxFileSystemOperations: 1e4,
+  maxPathComponents: 64,
   maxRedirects: 64,
   maxPipelineStages: 64,
   maxLoopIterations: 1e3,
@@ -17844,7 +17941,7 @@ init_platform();
 // packages/safe-bash/src/commands/network/private-address.ts
 init_platform();
 function privateIPv4(first, second) {
-  return first === 10 || first === 127 || first === 0 || first === 169 && second === 254 || first === 192 && second === 168 || first === 172 && second >= 16 && second <= 31;
+  return first === 10 || first === 127 || first === 0 || first === 169 && second === 254 || first === 192 && second === 168 || first === 172 && second >= 16 && second <= 31 || first === 100 && second >= 64 && second <= 127 || first === 198 && second >= 18 && second <= 19 || first >= 224;
 }
 function privateHostname(input3) {
   const hostname = input3.toLowerCase().replace(/\.$/u, "").replace(/^\[|\]$/gu, "");
@@ -17860,10 +17957,12 @@ function privateHostname(input3) {
     const mappedIPv4 = hextets.slice(0, 5).every((value2) => value2 === 0) && hextets[5] === 65535;
     const translatedIPv4 = hextets.slice(0, 4).every((value2) => value2 === 0) && hextets[4] === 65535 && hextets[5] === 0;
     const nat64IPv4 = hextets[0] === 100 && hextets[1] === 65435 && hextets.slice(2, 6).every((value2) => value2 === 0);
-    if (mappedIPv4 || translatedIPv4 || nat64IPv4) {
+    const compatibleIPv4 = hextets.slice(0, 6).every((value2) => value2 === 0);
+    if (mappedIPv4 || translatedIPv4 || nat64IPv4 || compatibleIPv4) {
       return privateIPv4(hextets[6] >>> 8, hextets[6] & 255);
     }
-    return (hextets[0] & 65024) === 64512 || (hextets[0] & 65472) === 65152;
+    if (hextets[0] === 8194) return privateIPv4(hextets[1] >>> 8, hextets[1] & 255);
+    return (hextets[0] & 65024) === 64512 || (hextets[0] & 65472) === 65152 || (hextets[0] & 65472) === 65216 || (hextets[0] & 65280) === 65280 || hextets[0] === 100 && hextets[1] === 65435 && hextets[2] === 1;
   }
   const parts2 = hostname.split(".");
   if (parts2.length !== 4 || parts2.some((part) => !part || Array.from(part).some((character) => character < "0" || character > "9"))) return false;
@@ -19047,7 +19146,7 @@ async function substitute(text, pattern, replacement, budget, global, occurrence
 }
 
 // packages/safe-bash/src/commands/text-programs/sed.ts
-function parse(source, extended, separator) {
+function parse(source, extended, separator, maxProgramInstructions) {
   if (source.length > 1024 * 1024) throw new ProgramError("sed program exceeds 1 MiB");
   const result = [];
   const groups = [];
@@ -19143,6 +19242,7 @@ function parse(source, extended, separator) {
       continue;
     }
     if (offset === source.length) break;
+    if (result.length >= maxProgramInstructions) throw new ProgramError("program instruction limit exceeded");
     const first = address();
     horizontal();
     let second;
@@ -19532,6 +19632,8 @@ async function execute(program, context, files, quiet, budget, separator, output
 }
 function sedCommand(options3 = {}) {
   const definition = command("sed", async (context) => {
+    const maxProgramInstructions = options3.maxProgramInstructions === void 0 ? 1024 : options3.maxProgramInstructions;
+    if (!Number.isSafeInteger(maxProgramInstructions) || maxProgramInstructions < 1) throw new ProgramError("maxProgramInstructions must be a positive safe integer");
     const budget = new Budget3(context, options3);
     const sources = [];
     const files = [];
@@ -19580,7 +19682,7 @@ function sedCommand(options3 = {}) {
       sources.push(byteString(files.shift()));
     }
     if (sources[0]?.startsWith("#n")) quiet = true;
-    const program = parse(sources.join("\n"), extended, separator);
+    const program = parse(sources.join("\n"), extended, separator, maxProgramInstructions);
     const outputFiles = program.flatMap((instruction) => instruction.kind !== "r" && instruction.file !== void 0 ? [instruction.file] : []);
     await assertPathRequirements(context, sedRequirements, ["script-output"], outputFiles);
     if (inPlace !== void 0 || outputFiles.length) {