@ai-ecoverse/slicc-kernel 1.10.0 → 1.11.0

package/README.md

@@ -183,6 +183,8 @@ Directories are renamed with `FileSystemHandle.move()` where available, else by
 
 Every process of the kernel has `/proc/<pid>/` with `cmdline`, `comm`, `stat`, `statm` and `status`, in the formats procps reads, and `/proc/self/` has the same files for the process that reads them. They come from the kernel's process table when they are opened, so a terminal sees the processes of every client; an exec'd program shows under the pid its parent knows. `/proc/uptime`, `/proc/loadavg`, `/proc/stat` and `/proc/meminfo` are there too, and `/proc/mounts`. Pids, parents, process groups, sessions, command lines, terminals, start and boot times are real; CPU times, memory sizes, load and `MemTotal` (from `navigator.deviceMemory`, else 4 GiB) are placeholders. Only Emscripten processes see this `/proc`.
 
+While OPFS has no `/etc/passwd`, `/etc/group` or `/etc/mtab`, reading them gets per-process ones: root is uid 0 and the realm user, uid 1000, is named after `USER`, or `web_user` (Emscripten's default) without one, so it matches `$USER`, with `HOME` as its home, so `id`, `whoami`, `ls -l` and `ps` show names. Nothing is written to OPFS, and a real file there wins.
+
 ### Metadata
 
 OPFS stores names, bytes, sizes and modification times, nothing else. Everything POSIX needs on top of that lives in an IndexedDB sidecar, so it survives reloads and new kernels:

package/dist/node-process-worker.js

@@ -1916,28 +1916,50 @@ function mountTable() {
     "\n"
   );
 }
-function useMounts(Fs) {
-  const { writeFile } = Fs;
+function accounts(env = {}) {
+  const user = env.USER ?? "web_user";
+  const name = NAME.test(user) && user !== "root" ? user : "user";
+  const home = env.HOME || "/home";
+  return {
+    passwd: `root:x:0:0:root:/root:/bin/sh
+${name}:x:1000:1000:${name}:${home}:/bin/bash
+`,
+    group: `root:x:0:
+${name}:x:1000:
+`
+  };
+}
+function useMounts(Fs, env = {}) {
+  const { writeFile, mkdirTree } = Fs;
   if (typeof Fs.open !== "function" || typeof writeFile !== "function") return;
+  const { passwd, group } = accounts(env);
+  const backing = { "/etc/mtab": "/proc/mounts" };
   try {
     writeFile.call(Fs, "/proc/mounts", mountTable());
   } catch {
     return;
   }
+  try {
+    mkdirTree.call(Fs, "/dev/.etc");
+    writeFile.call(Fs, "/dev/.etc/passwd", passwd);
+    writeFile.call(Fs, "/dev/.etc/group", group);
+    backing["/etc/passwd"] = "/dev/.etc/passwd";
+    backing["/etc/group"] = "/dev/.etc/group";
+  } catch {
+  }
   const open = Fs.open.bind(Fs);
   Fs.open = (path, flags, mode) => {
-    if (path !== "/etc/mtab" || (flags & (O_ACCMODE | O_CREAT2)) !== 0) {
-      return open(path, flags, mode);
-    }
+    const instead = backing[path];
+    if (!instead || (flags & (O_ACCMODE | O_CREAT2)) !== 0) return open(path, flags, mode);
     try {
       return open(path, flags, mode);
     } catch (e) {
       if (e?.errno !== wasiErrno("ENOENT")) throw e;
-      return open("/proc/mounts", flags, mode);
+      return open(instead, flags, mode);
     }
   };
 }
-var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, DIR_MODE, LINK_MODE, O_ACCMODE, O_CREAT2;
+var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, DIR_MODE, LINK_MODE, O_ACCMODE, O_CREAT2, NAME;
 var init_process_fds = __esm({
   "src/process/process-fds.ts"() {
     "use strict";
@@ -1965,6 +1987,7 @@ var init_process_fds = __esm({
     LINK_MODE = 41408;
     O_ACCMODE = 3;
     O_CREAT2 = 64;
+    NAME = /^[a-z_][a-z0-9_-]*$/i;
   }
 });
 
@@ -2960,6 +2983,8 @@ async function runWasmProcess(init, port2, deps = {}) {
   const restartable = () => signals.restartable();
   const streams = new KernelStreams(running.FS, sys, { sigpipe, restartable });
   trackCloseOnExec(running.FS);
+  useMounts(running.FS, init.env);
+  useProcfs(running.FS, sys, init.pid);
   if (init.fork) restoreForkedStreams(running.FS, streams, init.fork.streams ?? []);
   else {
     wireKernelStdio(running.FS, streams);
@@ -2969,8 +2994,6 @@ async function runWasmProcess(init, port2, deps = {}) {
   if (pipefs) streams.usePipes(pipefs);
   streams.useControllingTerminal();
   useDevFd(running.FS);
-  useMounts(running.FS);
-  useProcfs(running.FS, sys, init.pid);
   ownByRealmUser(running.FS);
   const livePath = (s) => liveNodePath(s.node);
   running.sliccKernel = createProcessKernel({