@jigging/jig 0.1.0-alpha.12 → 0.1.0-alpha.14

package/libexec/linux-rootless-supervisor.js

@@ -2,8 +2,17 @@
 // src/internal/linux-rootless-supervisor.ts
 import { spawn } from "child_process";
 import { randomBytes } from "crypto";
-import { closeSync, readFileSync, statSync, writeSync } from "fs";
-import { link, mkdir, open, readFile, rmdir, stat, unlink, writeFile } from "fs/promises";
+import { closeSync, readFileSync, readSync, statSync, writeSync } from "fs";
+import {
+  link,
+  mkdir,
+  open,
+  readFile,
+  rmdir,
+  stat,
+  unlink,
+  writeFile
+} from "fs/promises";
 import { connect } from "net";
 import { posix } from "path";
 var POLICY = Object.freeze(["--no-env-file", "--no-install", "--config=/dev/null"]);
@@ -47,12 +56,17 @@ async function superviseConnected(control, startupDeadlineUnixMs) {
   let childExit;
   let stopReason;
   let admitted = false;
+  let continued = false;
+  let outputDirectory;
   let resolveAdmission;
   let rejectAdmission;
   const admission = new Promise((resolve, reject) => {
     resolveAdmission = resolve;
     rejectAdmission = reject;
   });
+  admission.catch(() => {
+    return;
+  });
   const killRun = async () => {
     if (!cgroupCreated)
       return;
@@ -76,6 +90,12 @@ async function superviseConnected(control, startupDeadlineUnixMs) {
       if (type === "admit" && !admitted) {
         admitted = true;
         resolveAdmission();
+      } else if (type === "continue" && configuration.output && outputDirectory !== undefined && !continued) {
+        continued = true;
+        const gate = child?.stdio[4];
+        if (gate === undefined)
+          return stop("setup_failed");
+        gate.end(Buffer.from([1]));
       } else if (type === "cancel") {
         stop("cancelled");
       } else {
@@ -127,16 +147,30 @@ async function superviseConnected(control, startupDeadlineUnixMs) {
       env: {
         LD_LIBRARY_PATH: configuration.bunHostLibraryPath
       },
-      stdio: ["inherit", "inherit", "inherit", "pipe"]
+      stdio: [
+        "inherit",
+        "inherit",
+        "inherit",
+        "pipe",
+        configuration.output ? "pipe" : "ignore",
+        configuration.output ? "pipe" : "ignore",
+        ...configuration.capturedInputs.map((file) => file.fd)
+      ]
     });
     childExit = childClose(launched);
     child = launched;
     const ready = await readReady(launched);
+    if (configuration.output) {
+      const sandboxPid = await readSandboxPid(launched);
+      await outputReady(launched);
+      outputDirectory = await open(`/proc/${sandboxPid}/root/jig-output`, 65536);
+    }
     safeSend(control, {
       type: "ready",
       runCgroup,
       payloadPid: ready,
-      supervisorPid: process.pid
+      supervisorPid: process.pid,
+      ...outputDirectory === undefined ? {} : { outputFd: outputDirectory.fd }
     });
     const exit = await childExit;
     exitCode = exit.code;
@@ -149,6 +183,7 @@ async function superviseConnected(control, startupDeadlineUnixMs) {
 `);
   } finally {
     clearTimeout(deadline);
+    await outputDirectory?.close();
     let cleanupError;
     try {
       child?.kill("SIGKILL");
@@ -211,13 +246,39 @@ async function enterMain(arguments_) {
   writeSync(3, `${process.pid}
 `);
   closeSync(3);
-  const child = spawn(bubblewrap, bubblewrapArguments_, { cwd: "/", env: {}, stdio: "inherit" });
+  const separator = bubblewrapArguments_.indexOf("--");
+  if (separator < 0)
+    throw new Error("missing rootless command boundary");
+  const envelopeArguments = bubblewrapArguments_.slice(0, separator);
+  const output = envelopeArguments.includes("--sync-fd");
+  const inputDescriptors = envelopeArguments.flatMap((arg, index) => arg === "--file" ? [Number(envelopeArguments[index + 1])] : []);
+  if (inputDescriptors.some((fd, index) => fd !== 6 + index))
+    throw new Error("invalid captured input descriptor order");
+  const child = spawn(bubblewrap, bubblewrapArguments_, {
+    cwd: "/",
+    env: {},
+    stdio: [
+      "inherit",
+      "inherit",
+      "inherit",
+      "ignore",
+      output ? 4 : "ignore",
+      output ? 5 : "ignore",
+      ...inputDescriptors
+    ]
+  });
+  for (const fd of inputDescriptors)
+    closeSync(fd);
+  if (output) {
+    closeSync(4);
+    closeSync(5);
+  }
   const exit = await childClose(child);
   if (exit.signal !== null)
     process.kill(process.pid, exit.signal);
   process.exitCode = exit.code ?? 1;
 }
-async function innerMain(command) {
+async function innerMain(command, output = false) {
   if (command.length === 0 || !absolute(command[0]))
     throw new Error("invalid rootless inner command");
   const nullDevice = statSync("/dev/null");
@@ -225,6 +286,14 @@ async function innerMain(command) {
   if (!nullDevice.isCharacterDevice() || !entropyDevice.isCharacterDevice() || (nullDevice.mode & 511) !== 438 || (entropyDevice.mode & 511) !== 438) {
     throw new Error("rootless private devices do not satisfy the required projection");
   }
+  if (output) {
+    writeSync(4, Buffer.from([1]));
+    const gate = Buffer.alloc(1);
+    if (readSync(4, gate, 0, 1, null) !== 1 || gate[0] !== 1) {
+      throw new Error("output ownership was not acquired");
+    }
+    closeSync(4);
+  }
   const child = spawn(command[0], command.slice(1), {
     cwd: "/work",
     env: process.env,
@@ -271,11 +340,21 @@ function bubblewrapArguments(configuration) {
   ];
   for (const mount of configuration.readOnlyMounts)
     result.push("--ro-bind", mount.source, mount.destination);
+  if (configuration.inputDirectories.length > 0)
+    result.push("--size", String(16 * 1024 * 1024), "--tmpfs", "/jig-input");
+  for (const path of configuration.inputDirectories)
+    result.push("--dir", path);
+  for (const file of configuration.capturedInputs)
+    result.push("--perms", "0444", "--file", String(file.fd), file.destination);
+  if (configuration.inputDirectories.length > 0)
+    result.push("--remount-ro", "/jig-input");
+  if (configuration.output)
+    result.push("--size", String(16 * 1024 * 1024), "--tmpfs", "/jig-output", "--sync-fd", "4", "--json-status-fd", "5");
   result.push("--ro-bind", configuration.supervisorPath, MODULE_DESTINATION);
   for (const [name, value] of Object.entries(configuration.environment).sort(([a], [b]) => a.localeCompare(b))) {
     result.push("--setenv", name, value);
   }
-  result.push("--setenv", "LD_LIBRARY_PATH", SANDBOX_LIBRARY_PATH, "--uid", String(configuration.payloadUid), "--gid", String(configuration.payloadGid), "--cap-drop", "ALL", "--", SANDBOX_BUN, ...POLICY, MODULE_DESTINATION, "--inner", "--", ...configuration.command);
+  result.push("--setenv", "LD_LIBRARY_PATH", SANDBOX_LIBRARY_PATH, "--uid", String(configuration.payloadUid), "--gid", String(configuration.payloadGid), "--cap-drop", "ALL", "--", SANDBOX_BUN, ...POLICY, MODULE_DESTINATION, configuration.output ? "--inner-output" : "--inner", "--", ...configuration.command);
   return result;
 }
 async function claimActive(configuration) {
@@ -360,12 +439,15 @@ function requireStart(value) {
     "bunHostLibraryPath",
     "bunPath",
     "command",
+    "capturedInputs",
     "delegatedCgroup",
     "environment",
     "limits",
+    "inputDirectories",
     "mechanismDigest",
     "nestedUserNamespaces",
     "network",
+    "output",
     "ownerDigest",
     "ownerStateAllocationDigest",
     "ownerStateDirectory",
@@ -377,7 +459,7 @@ function requireStart(value) {
     "sealedPlanDigest",
     "supervisorPath"
   ];
-  if (configuration === null || typeof configuration !== "object" || Array.isArray(configuration) || Object.keys(configuration).sort().join("\x00") !== keys.sort().join("\x00") || !absolute(configuration.delegatedCgroup) || !absolute(configuration.bunHostLibraryPath) || !absolute(configuration.runCgroup) || posix.dirname(configuration.runCgroup) !== configuration.delegatedCgroup || !/^jig-run-[a-z0-9][a-z0-9-]{0,47}-[0-9a-f]{24}$/.test(posix.basename(configuration.runCgroup)) || !configuration.runCgroup.startsWith("/sys/fs/cgroup/") || !absolute(configuration.ownerStateDirectory) || !absolute(configuration.bunPath) || !absolute(configuration.bubblewrapPath) || !absolute(configuration.supervisorPath) || typeof configuration.mechanismDigest !== "string" || !DIGEST.test(configuration.mechanismDigest) || typeof configuration.ownerDigest !== "string" || !DIGEST.test(configuration.ownerDigest) || typeof configuration.sealedPlanDigest !== "string" || !DIGEST.test(configuration.sealedPlanDigest) || typeof configuration.ownerStateAllocationDigest !== "string" || !DIGEST.test(configuration.ownerStateAllocationDigest) || typeof configuration.ownerToken !== "string" || !OWNER_TOKEN.test(configuration.ownerToken) || configuration.network !== "isolated" && configuration.network !== "inherited" || typeof configuration.nestedUserNamespaces !== "boolean" || !positiveInteger(configuration.payloadUid) || !positiveInteger(configuration.payloadGid) || !validLimits(configuration.limits) || !validMounts(configuration.readOnlyMounts) || !validEnvironment(configuration.environment) || !Array.isArray(configuration.command) || configuration.command.length === 0 || !absolute(configuration.command[0]) || configuration.command.some((part) => typeof part !== "string" || part.includes("\x00"))) {
+  if (configuration === null || typeof configuration !== "object" || Array.isArray(configuration) || Object.keys(configuration).sort().join("\x00") !== keys.sort().join("\x00") || !absolute(configuration.delegatedCgroup) || !absolute(configuration.bunHostLibraryPath) || !absolute(configuration.runCgroup) || posix.dirname(configuration.runCgroup) !== configuration.delegatedCgroup || !/^jig-run-[a-z0-9][a-z0-9-]{0,47}-[0-9a-f]{24}$/.test(posix.basename(configuration.runCgroup)) || !configuration.runCgroup.startsWith("/sys/fs/cgroup/") || !absolute(configuration.ownerStateDirectory) || !absolute(configuration.bunPath) || !absolute(configuration.bubblewrapPath) || !absolute(configuration.supervisorPath) || typeof configuration.mechanismDigest !== "string" || !DIGEST.test(configuration.mechanismDigest) || typeof configuration.ownerDigest !== "string" || !DIGEST.test(configuration.ownerDigest) || typeof configuration.sealedPlanDigest !== "string" || !DIGEST.test(configuration.sealedPlanDigest) || typeof configuration.ownerStateAllocationDigest !== "string" || !DIGEST.test(configuration.ownerStateAllocationDigest) || typeof configuration.ownerToken !== "string" || !OWNER_TOKEN.test(configuration.ownerToken) || configuration.network !== "isolated" && configuration.network !== "inherited" || typeof configuration.nestedUserNamespaces !== "boolean" || typeof configuration.output !== "boolean" || !Array.isArray(configuration.capturedInputs) || configuration.capturedInputs.length > 64 || !Array.isArray(configuration.inputDirectories) || configuration.inputDirectories.length > 8 || configuration.inputDirectories.some((path) => typeof path !== "string" || path.length > 75 || !/^\/jig-input\/[a-z0-9]+(?:-[a-z0-9]+)*$/.test(path)) || configuration.capturedInputs.some((file, index) => file === null || typeof file !== "object" || file.fd !== 6 + index || !absolute(file.destination) || !configuration.inputDirectories.some((path) => file.destination.startsWith(`${path}/`))) || !positiveInteger(configuration.payloadUid) || !positiveInteger(configuration.payloadGid) || !validLimits(configuration.limits) || !validMounts(configuration.readOnlyMounts) || !validEnvironment(configuration.environment) || !Array.isArray(configuration.command) || configuration.command.length === 0 || !absolute(configuration.command[0]) || configuration.command.some((part) => typeof part !== "string" || part.includes("\x00"))) {
     throw new Error("invalid rootless supervisor configuration");
   }
   return configuration;
@@ -460,6 +542,39 @@ async function readReady(child) {
     throw new Error("invalid rootless entry readiness receipt");
   return pid;
 }
+async function readSandboxPid(child) {
+  const stream = child.stdio[5];
+  if (stream === undefined)
+    throw new Error("missing Bubblewrap status pipe");
+  let text = "";
+  for await (const chunk of stream.iterator({ destroyOnReturn: false })) {
+    text += String(chunk);
+    if (text.length > 4096)
+      throw new Error("oversized Bubblewrap status");
+    const end = text.indexOf("}");
+    if (end < 0)
+      continue;
+    const record = JSON.parse(text.slice(0, end + 1));
+    if (!positiveInteger(record["child-pid"]))
+      throw new Error("invalid Bubblewrap child identity");
+    stream.resume();
+    return record["child-pid"];
+  }
+  throw new Error("Bubblewrap exited before output handoff");
+}
+function outputReady(child) {
+  const stream = child.stdio[4];
+  return new Promise((resolve, reject) => {
+    stream.once("error", reject);
+    stream.once("end", () => reject(new Error("output launcher ended before handoff")));
+    stream.once("data", (bytes) => {
+      if (bytes.length !== 1 || bytes[0] !== 1)
+        reject(new Error("invalid output readiness"));
+      else
+        resolve();
+    });
+  });
+}
 async function waitUntilEmpty(cgroup, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() <= deadline) {
@@ -609,10 +724,10 @@ async function main() {
   }
   if (mode === "--enter")
     return await enterMain(arguments_);
-  if (mode === "--inner") {
+  if (mode === "--inner" || mode === "--inner-output") {
     if (arguments_[0] !== "--")
       throw new Error("invalid rootless inner separator");
-    return await innerMain(arguments_.slice(1));
+    return await innerMain(arguments_.slice(1), mode === "--inner-output");
   }
   throw new Error("invalid rootless supervisor mode");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jigging/jig",
-  "version": "0.1.0-alpha.12",
+  "version": "0.1.0-alpha.14",
   "description": "A local, secure host for admitted FLOW packages",
   "license": "MPL-2.0",
   "repository": {
@@ -42,6 +42,7 @@
     "dist/index.js",
     "dist/index.d.ts",
     "dist/project/author.d.ts",
+    "dist/project/commands.d.ts",
     "dist/json.d.ts",
     "libexec/installed-cli.js",
     "libexec/linux-rootless-supervisor.js",