@ai-ecoverse/slicc-kernel 1.58.0 → 1.59.0

package/dist/process-worker.js

@@ -603,7 +603,7 @@ function toMs(v) {
 function linkedStates(bridgeOf) {
   const opens = /* @__PURE__ */ new Map();
   const byId = /* @__PURE__ */ new Map();
-  const idOf2 = (st) => st?.ino === void 0 || (st.nlink ?? 1) < 2 ? void 0 : `${st.dev}:${st.ino}`;
+  const idOf3 = (st) => st?.ino === void 0 || (st.nlink ?? 1) < 2 ? void 0 : `${st.dev}:${st.ino}`;
   function know(s, id) {
     s.id = id;
     if (!byId.has(id)) byId.set(id, s);
@@ -617,14 +617,14 @@ function linkedStates(bridgeOf) {
       return;
     }
     opens.set(s, node);
-    const id = idOf2(s.stat);
+    const id = idOf3(s.stat);
     if (id !== void 0) know(s, id);
   }
   function sharedWith(node) {
     const st = node.live.stat;
     if (st?.ino === void 0) return void 0;
     const id = `${st.dev}:${st.ino}`;
-    if (!byId.has(id) && idOf2(st) !== void 0) {
+    if (!byId.has(id) && idOf3(st) !== void 0) {
       for (const [s2, other] of opens) {
         if (s2.id !== void 0 || s2.orphan) continue;
         let st2;
@@ -632,7 +632,7 @@ function linkedStates(bridgeOf) {
           st2 = bridgeOf(other).lstat(liveNodePath(other));
         } catch {
         }
-        const known = idOf2(st2);
+        const known = idOf3(st2);
         if (known !== void 0) know(s2, known);
       }
     }
@@ -640,7 +640,7 @@ function linkedStates(bridgeOf) {
     return s && s !== node.live && !stale(s) ? s : void 0;
   }
   const holder = (node) => opens.get(node.live) ?? node;
-  return { opening, sharedWith, know, idOf: idOf2, holder };
+  return { opening, sharedWith, know, idOf: idOf3, holder };
 }
 function createHelpers(Fs, ops) {
   const bridgeOf = (node) => node.mount.opts.bridge;
@@ -1746,9 +1746,9 @@ function createSyncFsSabBridge(transport, opts = {}) {
     create: (path, mode) => {
       run({ op: "create", path, ...mode !== void 0 ? { mode } : {} }, path);
     },
-    chown: (path, uid, gid) => {
+    chown: (path, uid, gid, follow2) => {
       const ids = { ...uid !== void 0 ? { uid } : {}, ...gid !== void 0 ? { gid } : {} };
-      run({ op: "lchown", path, ...ids }, path);
+      run({ op: follow2 ? "chown" : "lchown", path, ...ids }, path);
     },
     ...opts.owners ? { owners: true } : {},
     hold: (path, held, open, handle) => {
@@ -3850,7 +3850,7 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
   const pidContent = (target, name2, own = false) => () => {
     const listing = procList();
     const info = find(listing.processes, target, own);
-    if (!info) throw error(ESRCH);
+    if (!info) throw error();
     return pidFile(name2, info, listing.boot);
   };
   const pidNames = (names) => [.../* @__PURE__ */ new Set([...names, ...PID_FILES])];
@@ -3863,14 +3863,29 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
     dir.node_ops.readdir = () => [".", "..", ...PID_FILES];
     return dir;
   };
+  const scans = /* @__PURE__ */ new Map();
+  const listed = (target) => {
+    let found = false;
+    for (const [stream, pids] of scans) {
+      if (Fs.streams && Fs.streams[stream.fd ?? -1] !== stream) scans.delete(stream);
+      else found ||= pids.has(target);
+    }
+    return found;
+  };
   const procOps = proc.node_ops;
   const lookup = procOps.lookup?.bind(procOps);
   const readdir = procOps.readdir?.bind(procOps);
+  const listAll = (node) => {
+    const names = new Set(readdir ? readdir(node) : [".", ".."]);
+    for (const name2 of [...SYSTEM_FILES, "mounts"]) names.add(name2);
+    for (const p of procList().processes) names.add(String(p.pid));
+    return [...names];
+  };
   proc.node_ops = {
     ...procOps,
     lookup: (parent, name2) => {
       if (/^[1-9]\d*$/.test(name2)) {
-        if (!infoOf(Number(name2))) throw error();
+        if (!infoOf(Number(name2)) && !listed(Number(name2))) throw error();
         return pidDir(name2, Number(name2));
       }
       if (name2 === "mounts") return file(parent, name2, () => mountTable(sys.mountList?.() ?? []));
@@ -3884,11 +3899,36 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
       if (!lookup) throw error();
       return lookup(parent, name2);
     },
-    readdir: (node) => {
-      const names = new Set(readdir ? readdir(node) : [".", ".."]);
-      for (const name2 of [...SYSTEM_FILES, "mounts"]) names.add(name2);
-      for (const p of procList().processes) names.add(String(p.pid));
-      return [...names];
+    readdir: (node) => listAll(node)
+  };
+  const track = (stream, names) => {
+    let current = names;
+    const remember = (list) => scans.set(stream, new Set(list.filter((n) => /^[1-9]\d*$/.test(n)).map(Number)));
+    remember(current ?? []);
+    Object.defineProperty(stream, "getdents", {
+      configurable: true,
+      enumerable: true,
+      get: () => current,
+      set: (next2) => {
+        current = next2;
+        if (next2) remember(next2);
+      }
+    });
+  };
+  const dirOps = proc.stream_ops ?? {};
+  proc.stream_ops = {
+    ...dirOps,
+    open: (stream) => {
+      dirOps.open?.(stream);
+      track(stream, listAll(proc));
+    },
+    dup: (stream) => {
+      dirOps.dup?.(stream);
+      track(stream, stream.getdents);
+    },
+    close: (stream) => {
+      scans.delete(stream);
+      dirOps.close?.(stream);
     }
   };
   hashRemoveNode.call(Fs, self);
@@ -3912,7 +3952,7 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
     readdir: (node) => pidNames(selfReaddir ? selfReaddir(node) : [".", ".."])
   };
 }
-var HZ, DIR_MODE2, FILE_MODE, LINK_MODE2, ENOENT, ESRCH, EINVAL, UID, KIB, FALLBACK_MEMORY, PID_FILES, SYSTEM_FILES, sigMask;
+var HZ, DIR_MODE2, FILE_MODE, LINK_MODE2, ENOENT, EINVAL, UID, KIB, FALLBACK_MEMORY, PID_FILES, SYSTEM_FILES, sigMask;
 var init_procfs = __esm({
   "src/process/procfs.ts"() {
     "use strict";
@@ -3923,7 +3963,6 @@ var init_procfs = __esm({
     FILE_MODE = 33060;
     LINK_MODE2 = 41471;
     ENOENT = 44;
-    ESRCH = 71;
     EINVAL = 28;
     UID = 1e3;
     KIB = 1024;
@@ -4670,6 +4709,7 @@ function cachingBridge(bridge, now = () => performance.now(), shared) {
   };
   const invalidate = () => cache.mutated([]);
   const touched = (path, ino) => cache.changed(path, ino);
+  const { chown } = bridge;
   const mutating = (op, ...paths) => {
     try {
       return op();
@@ -4725,11 +4765,15 @@ function cachingBridge(bridge, now = () => performance.now(), shared) {
     ...bridge.kept ? { kept: bridge.kept.bind(bridge) } : {},
     ...bridge.pinned ? { pinned: (handle) => pinnedIo2(bridge, handle, rewriting) } : {},
     ...bridge.create ? { create: (p) => mutating(() => bridge.create?.(p), ...entry(p)) } : {},
+    ...chown ? {
+      chown: (p, uid, gid, follow2) => rewriting(p, () => chown.call(bridge, p, uid, gid, follow2))
+    } : {},
     ...bridge.pread && bridge.pwrite && bridge.truncate ? {
       pread: bridge.pread.bind(bridge),
       pwrite: (p, at, bytes, transfer) => rewriting(p, () => bridge.pwrite?.(p, at, bytes, transfer)),
       truncate: (p, size) => rewriting(p, () => bridge.truncate?.(p, size))
     } : {},
+    ...bridge.owners ? { owners: true } : {},
     invalidate,
     touched
   };
@@ -5970,6 +6014,9 @@ var init_wasi_termios = __esm({
 });
 
 // src/process/wasi/wasi-host.ts
+function idOf2(value2) {
+  return value2 >>> 0 === 4294967295 ? void 0 : value2 >>> 0;
+}
 function linkedOf(st) {
   return (st.nlink ?? 1) > 1 ? st : void 0;
 }
@@ -6038,7 +6085,7 @@ function wrap(table) {
   }
   return out;
 }
-var WasiExit, IDS, NS_PER_MS, AT_SYMLINK_NOFOLLOW2, S_IFIFO, DEFAULT_UMASK, MONOTONIC_BASE, MAX_READ, SIGPIPE_EXIT, WasiHost;
+var WasiExit, IDS, NS_PER_MS, AT_SYMLINK_NOFOLLOW2, ROOT_IDS, GONE, S_IFIFO, DEFAULT_UMASK, MONOTONIC_BASE, MAX_READ, SIGPIPE_EXIT, WasiHost;
 var init_wasi_host = __esm({
   "src/process/wasi/wasi-host.ts"() {
     "use strict";
@@ -6060,6 +6107,8 @@ var init_wasi_host = __esm({
     IDS = ["ruid", "euid", "suid", "rgid", "egid", "sgid"];
     NS_PER_MS = 1000000n;
     AT_SYMLINK_NOFOLLOW2 = 1;
+    ROOT_IDS = Object.freeze({ uid: 0, gid: 0 });
+    GONE = /* @__PURE__ */ new Set(["ENOENT", "ENOTDIR"]);
     S_IFIFO = 4096;
     DEFAULT_UMASK = 18;
     MONOTONIC_BASE = BigInt(Math.round(performance.timeOrigin)) * NS_PER_MS;
@@ -6131,7 +6180,60 @@ var init_wasi_host = __esm({
           return path;
         };
         const modeOf = (st) => (st.mode ?? 0) & 4095;
+        const chown = (path, uid, gid, follow2) => {
+          const { chown: own } = this.o.fs;
+          if (!own) throw new WasiError("ENOSYS");
+          own.call(this.o.fs, path, idOf2(uid), idOf2(gid), follow2);
+        };
+        const caller = () => {
+          const cred = this.o.kernel.call({ op: "proc-cred" });
+          return [cred.euid, cred.egid];
+        };
+        const owner = (st, out) => {
+          const [uid, gid] = st?.uid === void 0 ? caller() : [st.uid, st.gid];
+          const view = mem.view();
+          view.getUint32(out + 4, true);
+          view.setUint32(out, uid, true);
+          view.setUint32(out + 4, gid, true);
+        };
+        const fdOwned = (fd) => {
+          const e = fds.get(fd);
+          if (e.type === "device") return ROOT_IDS;
+          if (e.type === "kernel" && fds.kind(fd, e) !== "file") return void 0;
+          try {
+            return this.o.fs.stat(pathOf(fd));
+          } catch (err) {
+            if (!GONE.has(err?.code)) throw err;
+            return void 0;
+          }
+        };
+        const pathOwned = (path, follow2) => {
+          if (deviceOf(path)) return ROOT_IDS;
+          return follow2 ? this.o.fs.stat(path) : this.o.fs.lstat(path);
+        };
         return wrap({
+          fd_chown: (fd, uid, gid) => void chown(pathOf(fd), uid, gid, true),
+          path_chown: (dirfd, p, l, uid, gid, flags) => void chown(at(dirfd, p, l), uid, gid, (flags & AT_SYMLINK_NOFOLLOW2) === 0),
+          fd_owner: (fd, out) => {
+            if (!this.o.fs.owners) throw new WasiError("ENOTSUP");
+            owner(fdOwned(fd), out);
+          },
+          fd_filestat_owner: (fd, statOut, out) => {
+            if (!this.o.fs.owners) throw new WasiError("ENOTSUP");
+            this.writeFilestat(statOut, this.fdFilestat(fd));
+            owner(fdOwned(fd), out);
+          },
+          path_filestat_owner: (dirfd, lookup, p, l, statOut, out) => {
+            if (!this.o.fs.owners) throw new WasiError("ENOTSUP");
+            const path = at(dirfd, p, l);
+            this.writeFilestat(statOut, this.pathFilestat(path, lookup));
+            owner(pathOwned(path, (lookup & LOOKUP_SYMLINK_FOLLOW) !== 0), out);
+          },
+          path_owner: (dirfd, p, l, flags, out) => {
+            if (!this.o.fs.owners) throw new WasiError("ENOTSUP");
+            const path = at(dirfd, p, l);
+            owner(pathOwned(path, (flags & AT_SYMLINK_NOFOLLOW2) === 0), out);
+          },
           fd_chmod: (fd, mode) => void this.o.fs.chmod(pathOf(fd), mode & 4095),
           path_chmod: (dirfd, p, l, mode, flags) => void this.o.fs.chmod(target(at(dirfd, p, l), flags), mode & 4095),
           umask: (mask, out) => {
@@ -7427,6 +7529,10 @@ function procfsBridge(fs, tree) {
       over[name2] = (p, ...rest2) => readOnly([[p, follow2]], () => fn.call(fs, p, ...rest2));
     }
   }
+  const { chown } = fs;
+  if (chown) {
+    over.chown = (p, uid, gid, follow2) => readOnly([[p, follow2 === true]], () => chown.call(fs, p, uid, gid, follow2));
+  }
   return new Proxy(fs, {
     get: (target, key, receiver) => key in over ? over[key] : Reflect.get(target, key, receiver)
   });
@@ -9812,6 +9918,9 @@ function descriptors(init, fork, threads) {
   if (fork) return { forked: { fds: fork.fds, cloexec: fork.cloexec } };
   return { inherited: init.fds ?? [], ...init.program.preopenRoot ? { preopenRoot: true } : {} };
 }
+function ownersOf(init) {
+  return init.owners ? { owners: true } : {};
+}
 async function runWasiProcess(init, port2) {
   captureBacktraces(init.env);
   const signals = new WasiSignals(
@@ -9854,7 +9963,11 @@ async function runWasiProcess(init, port2) {
     parent: () => identify(transport, init).ppid,
     kernel: { sys: traced(stats, "kernel", sys), call: call2 },
     fs: procfsBridge(
-      cachingBridge(traced(stats, "fs", createSyncFsSabBridge(transport)), void 0, threads?.ids),
+      cachingBridge(
+        traced(stats, "fs", createSyncFsSabBridge(transport, ownersOf(init))),
+        void 0,
+        threads?.ids
+      ),
       procTree(call2, id.pid)
     ),
     ...descriptors(init, fork, threads)
@@ -9948,7 +10061,7 @@ async function runWasiThread(init, port2) {
     parent: () => identify(transport, init).ppid,
     kernel: { sys, call: call2 },
     fs: procfsBridge(
-      cachingBridge(createSyncFsSabBridge(transport), void 0, threads.ids),
+      cachingBridge(createSyncFsSabBridge(transport, ownersOf(init)), void 0, threads.ids),
       procTree(call2, id.pid)
     ),
     shared: threads.ids