@mithran-hq/aegis 0.9.14 → 0.9.16

package/README.md

@@ -2,16 +2,18 @@
 
 Aegis is the Mithran CLI for account authentication, agent gateway
 configuration, and Forge deploys. This package is the npm launcher; it runs the
-native `aegis` binary from the matching `@mithran-hq/aegis-darwin-arm64` package.
+native `aegis` binary from the platform package selected at install time:
+`@mithran-hq/aegis-darwin-arm64` on macOS 15+ Apple silicon and
+`@mithran-hq/aegis-linux-x64` on Linux x64.
 
 ## Requirements
 
-- macOS 15 or later
-- Apple silicon (arm64)
+- macOS 15 or later on Apple silicon (arm64), or Linux x86-64 with glibc
 - Node.js and npm
 
-The launcher refuses unsupported platforms and macOS versions before it starts
-the native binary.
+The launcher refuses unsupported platforms, unsupported macOS versions and
+Linux hosts older than the platform package's glibc floor before it starts the
+native binary.
 
 ## Install
 
@@ -27,7 +29,7 @@ candidate and `latest` still names the previous accepted build. Install a pinned
 version when you need a fixed build:
 
 ```bash
-npm install -g @mithran-hq/aegis@0.9.14
+npm install -g @mithran-hq/aegis@0.9.16
 ```
 
 Check the installed version:

package/aegis.mjs

@@ -1,6 +1,17 @@
 #!/usr/bin/env node
 import { createHash } from "node:crypto";
-import { existsSync, readFileSync, statSync, writeSync } from "node:fs";
+import {
+  closeSync,
+  constants,
+  existsSync,
+  fchmodSync,
+  fstatSync,
+  lstatSync,
+  openSync,
+  readFileSync,
+  statSync,
+  writeSync,
+} from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -14,26 +25,50 @@ const MANIFEST_NAME = "aegis.manifest.json";
 const MINIMUM_MACOS_MAJOR = 15;
 const MH_MAGIC_64 = 0xfeedfacf;
 const CPU_TYPE_ARM64 = 0x0100000c;
+const ELF_CLASS_64 = 2;
+const ELF_DATA_LSB = 1;
+const EM_X86_64 = 62;
+// The platform packages the launcher can select. The native package must be
+// installed as an optional dependency at the launcher's own version.
+const SUPPORTED = {
+  "darwin-arm64": { stem: "aegis-darwin-arm64", kind: "mach-o-arm64" },
+  "linux-x64": { stem: "aegis-linux-x64", kind: "elf-x86_64" },
+};
+const SUPPORTED_HOSTS = Object.keys(SUPPORTED).join(", ");
 const FORWARDED_SIGNALS = ["SIGHUP", "SIGINT", "SIGTERM", "SIGQUIT"];
 // The conventional 128+signal exit status for a payload that died by a signal.
 // The launcher must never re-deliver that signal to itself: a second core-dump
 // signal from the wrapper is a crash surface of its own and can take the
 // foreground job, and the shell's job control, down with it.
 const SIGNAL_NUMBERS = {
-  SIGHUP: 1,
-  SIGINT: 2,
-  SIGQUIT: 3,
-  SIGILL: 4,
-  SIGABRT: 6,
-  SIGFPE: 8,
-  SIGKILL: 9,
-  // Darwin numbers SIGBUS 10 (Linux uses 7); this launcher refuses every
-  // non-Darwin host before spawning a payload.
-  SIGBUS: 10,
-  SIGSEGV: 11,
-  SIGPIPE: 13,
-  SIGALRM: 14,
-  SIGTERM: 15,
+  "darwin-arm64": {
+    SIGHUP: 1,
+    SIGINT: 2,
+    SIGQUIT: 3,
+    SIGILL: 4,
+    SIGABRT: 6,
+    SIGFPE: 8,
+    SIGKILL: 9,
+    SIGBUS: 10,
+    SIGSEGV: 11,
+    SIGPIPE: 13,
+    SIGALRM: 14,
+    SIGTERM: 15,
+  },
+  "linux-x64": {
+    SIGHUP: 1,
+    SIGINT: 2,
+    SIGQUIT: 3,
+    SIGILL: 4,
+    SIGABRT: 6,
+    SIGFPE: 8,
+    SIGKILL: 9,
+    SIGBUS: 7,
+    SIGSEGV: 11,
+    SIGPIPE: 13,
+    SIGALRM: 14,
+    SIGTERM: 15,
+  },
 };
 const QUIET_COMMANDS = new Set(["help", "--version", "--help", "-h", "-V"]);
 // The Forge skill notice belongs only to commands that use the skill or set it
@@ -142,6 +177,143 @@ function isPlainObject(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
+// npm extracts with `mode & ~umask`, so a per-user-group umask (0002, the
+// Debian/Ubuntu default) leaves the distribution tree group-writable and the
+// native helper identity refuses it. Tighten only the exact platform package
+// we resolved: drop group/other write bits, never add any, and leave a
+// read-only install alone (its identity refusal stays honest).
+// Where to address an open directory descriptor so a child lookup is resolved
+// by the kernel against that descriptor, not against a path that a racing
+// directory replacement could redirect.
+const FD_ROOT = existsSync("/proc/self/fd") ? "/proc/self/fd" : "/dev/fd";
+
+function descriptorPath(dirFd, name) {
+  return name === "" ? `${FD_ROOT}/${dirFd}` : `${FD_ROOT}/${dirFd}/${name}`;
+}
+
+// Open exactly one entry with O_NOFOLLOW and bind the descriptor to the
+// metadata seen before the open. A linked entry, a metadata swap or the wrong
+// file type refuses instead of being followed.
+function openBoundEntry(target, expectDirectory) {
+  const before = lstatSync(target);
+  if (
+    before.isSymbolicLink() ||
+    (expectDirectory ? !before.isDirectory() : !before.isFile())
+  ) {
+    throw new Error("unexpected distribution entry");
+  }
+  const fd = openSync(target, constants.O_RDONLY | constants.O_NOFOLLOW);
+  try {
+    const opened = fstatSync(fd);
+    if (
+      opened.dev !== before.dev ||
+      opened.ino !== before.ino ||
+      (expectDirectory ? !opened.isDirectory() : !opened.isFile())
+    ) {
+      throw new Error("distribution entry moved between stat and open");
+    }
+    return fd;
+  } catch (error) {
+    closeSync(fd);
+    throw error;
+  }
+}
+
+function tightenDescriptor(fd) {
+  const metadata = fstatSync(fd);
+  const tightened = metadata.mode & ~0o022;
+  if (tightened !== metadata.mode) {
+    fchmodSync(fd, tightened);
+  }
+}
+
+function tightenEntryAt(dirFd, name, expectDirectory) {
+  let fd;
+  try {
+    fd = openBoundEntry(descriptorPath(dirFd, name), expectDirectory);
+    tightenDescriptor(fd);
+  } catch {
+    // Not ours to repair (absent, linked, swapped, or read-only). The helper
+    // identity still decides with the observed mode.
+  } finally {
+    if (fd !== undefined) {
+      try {
+        closeSync(fd);
+      } catch {
+        // The descriptor is already gone.
+      }
+    }
+  }
+}
+
+// Walk an absolute path from `/` through descriptor-relative lookups so no
+// component is resolved against a path that a racing directory replacement
+// could redirect. Any linked or swapped component aborts the whole walk.
+function openAbsoluteBound(path) {
+  if (!path.startsWith("/")) {
+    throw new Error("distribution root is not absolute");
+  }
+  let fd = openSync("/", constants.O_RDONLY | constants.O_NOFOLLOW);
+  try {
+    for (const component of path.split("/").filter((part) => part !== "")) {
+      const next = openBoundEntry(descriptorPath(fd, component), true);
+      closeSync(fd);
+      fd = next;
+    }
+    return fd;
+  } catch (error) {
+    try {
+      closeSync(fd);
+    } catch {
+      // The descriptor is already gone.
+    }
+    throw error;
+  }
+}
+
+function tightenDistributionModes(nativeDir) {
+  let root;
+  try {
+    root = openAbsoluteBound(nativeDir);
+  } catch {
+    // No safely bound root: touch nothing rather than risk a path that a race
+    // redirected. The identity refusal stays honest.
+    return;
+  }
+  try {
+    tightenDescriptor(root);
+    tightenEntryAt(root, MANIFEST_NAME, false);
+    tightenEntryAt(root, "package.json", false);
+    let payload;
+    try {
+      payload = openBoundEntry(descriptorPath(root, "payload"), true);
+    } catch {
+      return;
+    }
+    try {
+      tightenDescriptor(payload);
+      tightenEntryAt(payload, "aegis", false);
+    } finally {
+      closeSync(payload);
+    }
+  } finally {
+    closeSync(root);
+  }
+}
+
+function isLinuxElf64(payload) {
+  return (
+    payload.length >= 20 &&
+    payload[0] === 0x7f &&
+    payload[1] === 0x45 &&
+    payload[2] === 0x4c &&
+    payload[3] === 0x46 &&
+    payload[4] === ELF_CLASS_64 &&
+    payload[5] === ELF_DATA_LSB &&
+    payload.readUInt16LE(18) === EM_X86_64
+  );
+}
+
 function macOSMajorVersion() {
   const system = typeof process.getSystemVersion === "function" ? process.getSystemVersion() : "";
   const fromSystem = Number.parseInt(system, 10);
@@ -155,25 +327,56 @@ function macOSMajorVersion() {
   return null;
 }
 
-if (process.platform !== "darwin" || process.arch !== "arm64") {
-  refuse(
-    `unsupported host: this launcher runs only on macOS ${MINIMUM_MACOS_MAJOR}+ arm64, ` +
-      `found ${process.platform} ${process.arch}. No native payload was started.`,
-  );
+function hostGlibcVersion() {
+  const reported = process.report?.getReport?.()?.header?.glibcVersionRuntime;
+  return parseVersion(reported);
 }
-const macOSMajor = macOSMajorVersion();
-if (macOSMajor === null) {
-  refuse(
-    `unable to determine the macOS version; macOS ${MINIMUM_MACOS_MAJOR}+ arm64 is required. ` +
-      "No native payload was started.",
-  );
+
+function parseVersion(value) {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const match = /^(\d+)\.(\d+)/.exec(value);
+  if (match === null) {
+    return null;
+  }
+  return [Number.parseInt(match[1], 10), Number.parseInt(match[2], 10)];
+}
+
+function compareVersions(left, right) {
+  for (let index = 0; index < Math.max(left.length, right.length); index += 1) {
+    const leftPart = left[index] ?? 0;
+    const rightPart = right[index] ?? 0;
+    if (leftPart !== rightPart) {
+      return leftPart < rightPart ? -1 : 1;
+    }
+  }
+  return 0;
 }
-if (macOSMajor < MINIMUM_MACOS_MAJOR) {
+
+const hostKey = `${process.platform}-${process.arch}`;
+const supported = SUPPORTED[hostKey];
+if (supported === undefined) {
   refuse(
-    `macOS ${MINIMUM_MACOS_MAJOR} or newer is required; found macOS ${macOSMajor}. ` +
-      "Upgrade macOS to run aegis.",
+    `unsupported host: this launcher runs on ${SUPPORTED_HOSTS}, ` +
+      `found ${process.platform} ${process.arch}. No native payload was started.`,
   );
 }
+if (hostKey === "darwin-arm64") {
+  const macOSMajor = macOSMajorVersion();
+  if (macOSMajor === null) {
+    refuse(
+      `unable to determine the macOS version; macOS ${MINIMUM_MACOS_MAJOR}+ arm64 is required. ` +
+        "No native payload was started.",
+    );
+  }
+  if (macOSMajor < MINIMUM_MACOS_MAJOR) {
+    refuse(
+      `macOS ${MINIMUM_MACOS_MAJOR} or newer is required; found macOS ${macOSMajor}. ` +
+        "Upgrade macOS to run aegis.",
+    );
+  }
+}
 
 const launcherDir = dirname(fileURLToPath(import.meta.url));
 const launcher = readJson(join(launcherDir, "package.json"), "launcher package metadata");
@@ -187,15 +390,14 @@ const scope = launcherName.endsWith(suffix) ? launcherName.slice(0, -suffix.leng
 if (!/^@[a-z0-9._-]+$/.test(scope)) {
   refuse(`launcher package name is invalid: ${JSON.stringify(launcherName)}`);
 }
-const nativeName = `${scope}/aegis-darwin-arm64`;
+const nativeName = `${scope}/${supported.stem}`;
 if (!isPlainObject(launcher.optionalDependencies)) {
   refuse("launcher package metadata is malformed: optionalDependencies is required");
 }
-const dependencyKeys = Object.keys(launcher.optionalDependencies);
-if (dependencyKeys.length !== 1 || dependencyKeys[0] !== nativeName) {
+if (!Object.prototype.hasOwnProperty.call(launcher.optionalDependencies, nativeName)) {
   refuse(
-    `launcher declares unexpected platform dependencies: ${JSON.stringify(dependencyKeys)}; ` +
-      `only ${nativeName} is supported`,
+    `launcher does not declare the host platform dependency ${nativeName}; ` +
+      `reinstall ${launcherName}@${launcherVersion} for ${hostKey}`,
   );
 }
 if (launcher.optionalDependencies[nativeName] !== launcherVersion) {
@@ -213,7 +415,7 @@ try {
   refuse(
     `native payload package ${nativeName}@${launcherVersion} is not installed. ` +
       `Reinstall the launcher so its optional dependency lands: ` +
-      `npm install ${launcherName}@${launcherVersion} on a macOS ${MINIMUM_MACOS_MAJOR}+ arm64 host.`,
+      `npm install ${launcherName}@${launcherVersion} on ${hostKey}.`,
   );
 }
 const nativeDir = dirname(nativePackagePath);
@@ -225,6 +427,8 @@ if (native.name !== nativeName || native.version !== launcherVersion) {
   );
 }
 
+tightenDistributionModes(nativeDir);
+
 const manifest = readJson(join(nativeDir, MANIFEST_NAME), "native manifest");
 if (manifest.schema !== MANIFEST_SCHEMA) {
   refuse(`native manifest schema is invalid: expected ${MANIFEST_SCHEMA}`);
@@ -246,14 +450,43 @@ if (
   refuse(`native manifest capability contract is invalid: expected ${CAPABILITY}`);
 }
 const compatibility = manifest.compatibility;
-if (
-  !isPlainObject(compatibility) ||
-  compatibility.os !== "darwin" ||
-  compatibility.cpu !== "arm64" ||
-  compatibility.libc !== "none" ||
-  compatibility.minimum_glibc !== null
-) {
-  refuse("native manifest compatibility contract is invalid");
+if (supported.kind === "mach-o-arm64") {
+  if (
+    !isPlainObject(compatibility) ||
+    compatibility.os !== "darwin" ||
+    compatibility.cpu !== "arm64" ||
+    compatibility.libc !== "none" ||
+    compatibility.minimum_glibc !== null
+  ) {
+    refuse("native manifest compatibility contract is invalid");
+  }
+} else {
+  if (
+    !isPlainObject(compatibility) ||
+    compatibility.os !== "linux" ||
+    compatibility.cpu !== "x86_64" ||
+    compatibility.libc !== "glibc" ||
+    typeof compatibility.minimum_glibc !== "string"
+  ) {
+    refuse("native manifest compatibility contract is invalid");
+  }
+  const floor = parseVersion(compatibility.minimum_glibc);
+  if (floor === null) {
+    refuse("native manifest compatibility contract is invalid");
+  }
+  const glibc = hostGlibcVersion();
+  if (glibc === null) {
+    refuse(
+      `unable to determine the host glibc version; glibc ${compatibility.minimum_glibc} ` +
+        "or newer is required. No native payload was started.",
+    );
+  }
+  if (compareVersions(glibc, floor) < 0) {
+    refuse(
+      `glibc ${compatibility.minimum_glibc} or newer is required; ` +
+        `found ${glibc[0]}.${glibc[1]}`,
+    );
+  }
 }
 
 const payloadPath = join(nativeDir, PAYLOAD_PATH);
@@ -282,12 +515,16 @@ if (manifest.payload.byte_count !== payload.length) {
 if ((payloadStat.mode & 0o111) === 0) {
   refuse("native payload is not executable");
 }
-if (
-  payload.length < 8 ||
-  payload.readUInt32LE(0) !== MH_MAGIC_64 ||
-  payload.readUInt32LE(4) !== CPU_TYPE_ARM64
-) {
-  refuse("native payload is not a Darwin arm64 Mach-O binary");
+if (supported.kind === "mach-o-arm64") {
+  if (
+    payload.length < 8 ||
+    payload.readUInt32LE(0) !== MH_MAGIC_64 ||
+    payload.readUInt32LE(4) !== CPU_TYPE_ARM64
+  ) {
+    refuse("native payload is not a Darwin arm64 Mach-O binary");
+  }
+} else if (!isLinuxElf64(payload)) {
+  refuse("native payload is not a Linux x86-64 ELF binary");
 }
 
 const argv = process.argv.slice(2);
@@ -323,7 +560,7 @@ child.on("exit", (code, signal) => {
     // Report the payload's fatal signal as a conventional exit status. Do not
     // re-raise it: the wrapper must not die by a second core-dump signal, which
     // is what a terminal sees as the foreground job (and its shell) crashing.
-    process.exitCode = 128 + (SIGNAL_NUMBERS[signal] ?? 0);
+    process.exitCode = 128 + (SIGNAL_NUMBERS[hostKey]?.[signal] ?? 0);
     return;
   }
   process.exitCode = typeof code === "number" ? code : 1;

package/package.json

@@ -5,10 +5,7 @@
   "bugs": {
     "url": "https://github.com/mithran-hq/aegis/issues"
   },
-  "cpu": [
-    "arm64"
-  ],
-  "description": "Aegis auth, gateway, and Forge CLI for macOS 15+ Apple silicon",
+  "description": "Aegis auth, gateway, and Forge CLI compatible with the host platform package selected at install time",
   "files": [
     "package.json",
     "aegis.mjs",
@@ -28,14 +25,12 @@
   "license": "Apache-2.0",
   "name": "@mithran-hq/aegis",
   "optionalDependencies": {
-    "@mithran-hq/aegis-darwin-arm64": "0.9.14"
+    "@mithran-hq/aegis-darwin-arm64": "0.9.16",
+    "@mithran-hq/aegis-linux-x64": "0.9.16"
   },
-  "os": [
-    "darwin"
-  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mithran-hq/aegis.git"
   },
-  "version": "0.9.14"
+  "version": "0.9.16"
 }