@ai-ecoverse/slicc-kernel 1.140.0 → 1.140.2

package/dist/process-worker.js

@@ -2775,7 +2775,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.140.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.140.2" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -9307,6 +9307,8 @@ var init_wasi_fds = __esm({
         if (kernelDevice !== void 0) return kernelDevice;
         const alias = stdioAlias(path);
         if (alias !== void 0) return this.reopen(alias);
+        const outside = this.escaped(path, oflags, rights);
+        if (outside !== void 0) return this.open(outside, oflags, rights, fdflags, mode);
         if (exclusive && !(oflags & OFLAGS.DIRECTORY) && this.madeAtOnce(path, mode)) {
           return this.regular(path, void 0, oflags, rights, fdflags, mode, true);
         }
@@ -9325,6 +9327,12 @@ var init_wasi_fds = __esm({
         refuseWrite(s, oflags, rights);
         return this.regular(path, s, oflags, rights, fdflags, mode);
       }
+      escaped(path, oflags, rights) {
+        const outside = this.fs.escape?.(path);
+        if (outside === void 0) return void 0;
+        refuseWrite({ readonly: true }, oflags | (oflags & OFLAGS.CREAT ? OFLAGS.TRUNC : 0), rights);
+        return outside;
+      }
       regular(path, s, oflags, rights, fdflags, mode, created = false) {
         if (s?.isFifo) return this.kernelFifo(path, s, oflags, rights, fdflags);
         if (s?.isSocket) throw new WasiError("ENXIO");
@@ -12396,10 +12404,12 @@ function directMiss(err, path) {
   if (err?.direct !== true) return false;
   return !path.split("/").some((part) => part === "." || part === "..");
 }
-function procfsBridge(fs, tree) {
-  const toProc = (path, follow3) => procPath(fs, path, follow3);
-  const shadowing = physicalProc(fs);
-  const via = (p, proc, own, follow3 = true) => {
+function routing(tree, toProc, shadowing) {
+  return (p, inner, own, follow3 = true, outside) => {
+    const proc = (q) => {
+      const target = outside ? tree.escape(q) : void 0;
+      return target === void 0 ? inner(q) : outside(target);
+    };
     if (inProc(p)) return proc(p);
     if (shadowing()) {
       const real = toProc(p, follow3);
@@ -12414,6 +12424,11 @@ function procfsBridge(fs, tree) {
       return proc(real);
     }
   };
+}
+function procfsBridge(fs, tree) {
+  const toProc = (path, follow3) => procPath(fs, path, follow3);
+  const shadowing = physicalProc(fs);
+  const via = routing(tree, toProc, shadowing);
   const readOnly2 = (paths, run) => {
     const physical2 = shadowing();
     for (const [p, follow3] of paths) {
@@ -12436,12 +12451,16 @@ function procfsBridge(fs, tree) {
     readFile: (p) => via(
       p,
       (q) => tree.read(q),
-      () => fs.readFile(p)
+      () => fs.readFile(p),
+      true,
+      (t) => fs.readFile(t)
     ),
     stat: (p) => via(
       p,
       (q) => tree.stat(q),
-      () => fs.stat(p)
+      () => fs.stat(p),
+      true,
+      (t) => fs.stat(t)
     ),
     lstat: (p) => via(
       p,
@@ -12520,6 +12539,7 @@ function procfsBridge(fs, tree) {
       return via(p, snapshot, () => fs.hold?.(p, held2, open, void 0, want, seen) ?? late(p));
     },
     kept: (handle) => snapshots.has(handle) || fs.kept?.(handle) === true,
+    escape: (p) => inProc(p) ? tree.escape(p) : void 0,
     pinned: (handle) => {
       const bytes = snapshots.get(handle);
       return bytes ? frozen(bytes) : fs.pinned?.(handle) ?? fs;
@@ -12700,6 +12720,12 @@ var init_wasi_procfs = __esm({
         if (node.kind !== "dir") throw syncError("ENOTDIR", path);
         return node.names();
       }
+      escape(path) {
+        const node = this.node(this.parts(path, true));
+        if (node?.kind !== "link" || !node.target.startsWith("/")) return void 0;
+        if (node.denied) throw syncError("EACCES", path);
+        return node.target;
+      }
       readlink(path) {
         const node = this.find(path, false);
         if (node.kind !== "link") throw syncError("EINVAL", path);
@@ -14538,7 +14564,29 @@ function nameFrame(line, module, name2) {
   const found = name2(Number(m[4]));
   return found === void 0 ? line : `${m[1]}${found} (${m[2]})`;
 }
-function sidecarNames(read2, path) {
+function definedFunctions(bytes) {
+  let at = 8;
+  const leb = () => {
+    let value2 = 0;
+    let shift = 0;
+    let byte;
+    do {
+      if (at >= bytes.length) throw new RangeError("truncated module");
+      byte = bytes[at++];
+      value2 += (byte & 127) * 2 ** shift;
+      shift += 7;
+    } while (byte & 128);
+    return value2;
+  };
+  while (at < bytes.length) {
+    const id = bytes[at++];
+    const size = leb();
+    if (id === 3) return leb();
+    at += size;
+  }
+  return 0;
+}
+function sidecarNames(read2, path, fit) {
   let names;
   return (index3) => {
     if (!names) {
@@ -14547,6 +14595,20 @@ function sidecarNames(read2, path) {
       } catch {
         names = /* @__PURE__ */ new Map();
       }
+      let want = names.size;
+      try {
+        if (fit) want = fit.functions();
+      } catch {
+        fit?.warn(`${path} can't be checked against the module, so the frames show raw indices`);
+        names = /* @__PURE__ */ new Map();
+        return void 0;
+      }
+      if (fit && names.size !== want) {
+        fit.warn(
+          `${path} names ${names.size} functions, but the module has ${want}: it doesn't fit, so the frames show raw indices`
+        );
+        names = /* @__PURE__ */ new Map();
+      }
     }
     return names.get(index3);
   };
@@ -15037,7 +15099,7 @@ async function runWasiProcess(init, port2) {
     if (e instanceof WasiExit) return e.code;
     if (!(e instanceof WebAssembly.RuntimeError)) throw e;
     try {
-      say(trapMessage(e, init.env, "", programNames(host, init.program)));
+      say(trapReport(e, init, host, ""));
     } catch {
       throw new Error(`${init.argv0}: wasm trap: ${e.message}`);
     }
@@ -15056,9 +15118,21 @@ function trapMessage(e, env, where = "", name2) {
   return frames.length ? `${head}
 ${frames.join("\n")}` : head;
 }
-function programNames(host, program) {
+function trapReport(e, init, host, where) {
+  const warned = [];
+  const message2 = trapMessage(e, init.env, where, programNames(host, init.program, warned));
+  return [...warned, message2].join(`
+${init.argv0}: `);
+}
+function programNames(host, program, warned) {
   const path = program.names;
-  return path === void 0 ? void 0 : sidecarNames((p) => host.o.fs.readFile(p), path);
+  if (path === void 0) return void 0;
+  const read2 = (p) => host.o.fs.readFile(p);
+  const imported = WebAssembly.Module.imports(program.module).filter((i) => i.kind === "function");
+  return sidecarNames(read2, path, {
+    functions: () => imported.length + definedFunctions(read2(program.path)),
+    warn: (line) => warned.push(line)
+  });
 }
 async function programImports(program, host, transport, tid) {
   if (program.imports === void 0) return void 0;
@@ -15139,7 +15213,7 @@ async function runWasiThread(init, port2) {
     }
     if (e instanceof WebAssembly.RuntimeError) {
       try {
-        say(trapMessage(e, init.env, ` in thread ${thread.tid}`, programNames(host, init.program)));
+        say(trapReport(e, init, host, ` in thread ${thread.tid}`));
       } catch {
       }
       port2.postMessage({ type: WASM_PROCESS_EXIT, code: TRAPPED });