@ai-ecoverse/slicc-kernel 1.64.0 → 1.64.1

package/dist/node.js

@@ -410,6 +410,11 @@ var Created = class {
 function deny(g, op, path, errno = "EACCES") {
   g.dac.denied({ pid: g.pid, uid: g.cred.euid, op, path, errno });
 }
+var TTY_MODE = 400;
+function ttyOpenable(g, tty) {
+  if (!g || !tty.owner || permits(g.cred, tty.owner, R_OK | W_OK, false)) return;
+  deny(g, "open", tty.name ?? "/dev/tty");
+}
 async function need(g, op, path, want, options = {}, shown = path) {
   const walked = await access(g.fs, g.cred, path, want, options);
   if (walked.denied !== void 0) deny(g, op, shown);
@@ -2307,10 +2312,18 @@ var UserDb = class {
     };
   }
   async lookup(user) {
+    return (await this.lookupTerminal(user))?.account;
+  }
+  async ttyGroup() {
+    return parsed(parseGroup(await this.read(GROUP, DEFAULT_GROUP))).find((g) => g.name === "tty")?.gid;
+  }
+  async lookupTerminal(user) {
     const { passwd, group } = await this.tables();
     const key = typeof user === "number" ? "uid" : "name";
     const row = parsed(passwd).find((r) => r[key] === user);
-    return row && this.account(row, parsed(group));
+    const groups = parsed(group);
+    const tty = groups.find((g) => g.name === "tty")?.gid;
+    return row && { account: this.account(row, groups), tty };
   }
   async list() {
     const { passwd, group } = await this.tables();
@@ -9589,6 +9602,7 @@ var KernelTty = class {
   waiters = [];
   hungUp = false;
   name;
+  owner;
   onRead;
   readers = 0;
   screen;
@@ -9932,10 +9946,11 @@ var PtyTable = class {
     this.signal = signal;
     this.onRead = onRead;
   }
-  open() {
+  open(owner) {
     let index = 0;
     while (this.pairs.has(index)) index += 1;
     const pair = new PtyPair(index, this.signal, (p) => this.pairs.delete(p.index), this.onRead);
+    if (owner) pair.slave.owner = { uid: owner.uid, gid: owner.gid, mode: TTY_MODE };
     this.pairs.set(index, pair);
     return { pair, master: pair.master() };
   }
@@ -9948,6 +9963,10 @@ var PtyTable = class {
     return [...this.pairs.keys()].sort((a, b) => a - b);
   }
 };
+function ptsNumber(path) {
+  const m = /^\/dev\/pts\/(\d+)$/.exec(path);
+  return m ? Number(m[1]) : void 0;
+}
 var PTY_OPS = [
   "pty-open",
   "pty-slave-open",
@@ -9975,11 +9994,12 @@ function ptySyscall(req, ctx) {
   switch (req.op) {
     case "pty-open": {
       if (!ctx.ptys) throw new KernelError("ENOENT");
-      return json4(ctx.fds.install(ctx.ptys.open().master, 3));
+      return json4(ctx.fds.install(ctx.ptys.open(ctx.owner).master, 3));
     }
     case "pty-slave-open": {
       if (!ctx.ptys) throw new KernelError("ENOENT");
       const pair = ctx.ptys.get(req.n);
+      ttyOpenable(ctx.guard, pair.slave);
       const fd = ctx.fds.install(pair.openSlave(), 3);
       if (!req.noctty) ctx.jobs?.acquireTerminal(ctx.pid, pair.slave);
       return json4(fd);
@@ -10795,6 +10815,7 @@ var SYSCALL_OPS = /* @__PURE__ */ new Set([
   "fd-promote",
   "fd-open-tty",
   "fd-tty-names",
+  "fd-tty-owner",
   "tty-get",
   "tty-set",
   "tty-winsz",
@@ -10996,7 +11017,9 @@ var WasmProcess = class {
       }
       if (isPtySyscall(req)) {
         const { ptys, jobs } = this.options;
-        return ptySyscall(req, { pid: this.pid, fds: this.fds, ptys, jobs });
+        const owner = this.options.owners ? this.ttyOwner() : void 0;
+        const guard2 = this.guarded();
+        return ptySyscall(req, { pid: this.pid, fds: this.fds, ptys, jobs, guard: guard2, owner });
       }
       return await this.procSyscall(req, cancelled);
     } catch (e) {
@@ -11128,6 +11151,25 @@ var WasmProcess = class {
     const want = (access2 === 1 ? 0 : R_OK) | (access2 !== 0 || req.truncate ? W_OK : 0);
     await openable(g, "open", req.path, want, req.create === true);
   }
+  openTty(name2) {
+    const tty = name2 === void 0 ? this.controllingTerminal() : this.options.jobs?.terminalNamed(name2);
+    if (!tty) throw new KernelError("ENXIO");
+    if (name2 !== void 0) ttyOpenable(this.guarded(), tty);
+    return this.fds.install(tty.file(), 3);
+  }
+  guarded() {
+    const { guard: guard2 } = this.options;
+    return guard2 && { fs: guard2.fs, dac: guard2.dac, cred: this.cred, pid: this.pid };
+  }
+  ttyOwner() {
+    return { uid: this.cred.euid, gid: this.cred.egid, mode: TTY_MODE };
+  }
+  terminalByName(name2) {
+    const n = ptsNumber(name2);
+    const tty = n === void 0 ? this.options.jobs?.terminalNamed(name2) : this.options.ptys?.get(n).slave;
+    if (!tty) throw new KernelError("ENOENT");
+    return tty;
+  }
   newOwner() {
     if (!this.options.owners) return void 0;
     return { uid: this.cred.euid, gid: this.cred.egid, mode: 438 & ~this.umask };
@@ -11231,13 +11273,12 @@ var WasmProcess = class {
           if (!req.keep) await Promise.resolve(this.fds.close(req.from));
         }
         return { ok: true, kind: "void" };
-      case "fd-open-tty": {
-        const tty = req.name === void 0 ? this.controllingTerminal() : this.options.jobs?.terminalNamed(req.name);
-        if (!tty) throw new KernelError("ENXIO");
-        return { ok: true, kind: "json", json: this.fds.install(tty.file(), 3) };
-      }
+      case "fd-open-tty":
+        return { ok: true, kind: "json", json: this.openTty(req.name) };
       case "fd-tty-names":
         return { ok: true, kind: "json", json: this.options.jobs?.terminalNames() ?? [] };
+      case "fd-tty-owner":
+        return { ok: true, kind: "json", json: this.terminalByName(req.name).owner ?? null };
       case "fd-select": {
         const { read, write, timeoutMs } = req;
         if (this.owed && timeoutMs !== 0) {
@@ -14962,7 +15003,12 @@ var Launcher = class {
   }
   async account(user) {
     if (typeof user === "object") return user;
-    const found = await this.users.lookup(user ?? 0);
+    return (await this.terminalAccount(user)).account;
+  }
+  async terminalAccount(user) {
+    if (typeof user === "object")
+      return { account: user, tty: this.owners ? await this.users.ttyGroup() : void 0 };
+    const found = await this.users.lookupTerminal(user ?? 0);
     if (!found) throw fsError("ENOENT", `no user ${String(user)}`);
     return found;
   }
@@ -14984,7 +15030,7 @@ var Launcher = class {
     return { cwd, file, planned };
   }
   async openTerminal(argv, options) {
-    const account = await this.account(options.user);
+    const { account, tty: ttyGroup } = await this.terminalAccount(options.user);
     const { cwd, file, planned } = await this.starting(argv, options.cwd, account);
     if (!planned) throw new Error(`${file}: command not found`);
     let leader = 0;
@@ -14994,6 +15040,7 @@ var Launcher = class {
     );
     tty.onRead = () => this.settling.reading(this.jobs.tcgetpgrp(tty, leader));
     tty.name = `/dev/tty${++this.terminals}`;
+    if (this.owners) tty.owner = { uid: account.uid, gid: ttyGroup ?? account.gid, mode: TTY_MODE };
     tty.setSize(options.cols ?? 80, options.rows ?? 24);
     const fds = new FdTable();
     const stdio = tty.file();