@forgezero/agent 0.1.135 → 0.1.137

package/dist/fz.js

@@ -6007,7 +6007,7 @@ var UPDATE_RETRY_BASE_MS = 5 * 60000;
 var UPDATE_RETRY_MAX_MS = 24 * 60 * 60000;
 
 // src/version.ts
-var VERSION2 = "0.1.135";
+var VERSION2 = "0.1.137";
 
 // src/software.ts
 var PINNED_BUN_VERSION = "1.3.14";
@@ -11572,11 +11572,13 @@ function compileDeployment(sourceValue) {
       if (provisioning.metalHostname !== undefined && !/^(?=.{1,253}$)[A-Za-z0-9](?:[A-Za-z0-9.-]*[A-Za-z0-9])?$/.test(String(provisioning.metalHostname)))
         fail2(`deployment.spec.targets.${targetName}.provisioning.metalHostname`, "is invalid.");
       const provisionedResources = object(provisioning.resources, `deployment.spec.targets.${targetName}.provisioning.resources`);
-      exact3(provisionedResources, ["physicalCores", "vcpu", "memoryGib", "diskGib", "egressGuaranteedMbps", "egressBurstMbps", "confidential"], `deployment.spec.targets.${targetName}.provisioning.resources`);
+      exact3(provisionedResources, ["physicalCores", "vcpu", "memoryGib", "diskGib", "diskEncryption", "egressGuaranteedMbps", "egressBurstMbps", "confidential"], `deployment.spec.targets.${targetName}.provisioning.resources`);
       integer(provisionedResources.physicalCores, `deployment.spec.targets.${targetName}.provisioning.resources.physicalCores`, 1, 1024);
       integer(provisionedResources.vcpu, `deployment.spec.targets.${targetName}.provisioning.resources.vcpu`, 1, 4096);
       integer(provisionedResources.memoryGib, `deployment.spec.targets.${targetName}.provisioning.resources.memoryGib`, 1, 4194304);
       integer(provisionedResources.diskGib, `deployment.spec.targets.${targetName}.provisioning.resources.diskGib`, 1, 1048576);
+      if (provisionedResources.diskEncryption !== undefined && !["none", "luks2"].includes(String(provisionedResources.diskEncryption)))
+        fail2(`deployment.spec.targets.${targetName}.provisioning.resources.diskEncryption`, "must be none or luks2.");
       integer(provisionedResources.egressGuaranteedMbps, `deployment.spec.targets.${targetName}.provisioning.resources.egressGuaranteedMbps`, 0, 1e7);
       integer(provisionedResources.egressBurstMbps, `deployment.spec.targets.${targetName}.provisioning.resources.egressBurstMbps`, Number(provisionedResources.egressGuaranteedMbps), 1e7);
       if (typeof provisionedResources.confidential !== "boolean")
@@ -11945,7 +11947,7 @@ function initCoordinates(options) {
       if (!/^[a-z][a-z0-9-]{0,62}$/.test(value))
         throw new Error(`deployment provisioning ${label} must be a lowercase typed name`);
     const resources = options.provisioning.resources;
-    for (const [label, value] of Object.entries(resources).filter(([key]) => key !== "confidential")) {
+    for (const [label, value] of Object.entries(resources).filter(([key]) => !["confidential", "diskEncryption"].includes(key))) {
       if (!Number.isSafeInteger(value) || Number(value) < 0)
         throw new Error(`deployment provisioning ${label} must be a non-negative integer`);
     }
@@ -11954,6 +11956,8 @@ function initCoordinates(options) {
     }
     if (result.isolation === "sev-snp" && !resources.confidential)
       throw new Error("deployment provisioning must provide confidential capacity for sev-snp");
+    if (resources.diskEncryption !== undefined && !["none", "luks2"].includes(resources.diskEncryption))
+      throw new Error("deployment provisioning disk encryption mode is unsupported");
     if (!/^\d{1,18}$/.test(options.provisioning.monthlyAmountCents))
       throw new Error("deployment provisioning monthly amount must be a bounded USD-cent amount");
     if (!/^\d{1,18}$/.test(options.provisioning.maxMonthlySpendMinor))
@@ -11965,7 +11969,10 @@ function initCoordinates(options) {
     if (options.provisioning.metalHostname && !/^(?=.{1,253}$)[A-Za-z0-9](?:[A-Za-z0-9.-]*[A-Za-z0-9])?$/.test(options.provisioning.metalHostname))
       throw new Error("deployment provisioning metal hostname is invalid");
   }
-  return { ...result, ...options.provisioning ? { provisioning: options.provisioning } : {} };
+  return { ...result, ...options.provisioning ? { provisioning: {
+    ...options.provisioning,
+    resources: { ...options.provisioning.resources, diskEncryption: options.provisioning.resources.diskEncryption ?? "luks2" }
+  } } : {} };
 }
 function defaultTypeScriptDeployment(name, options = {}) {
   const selected = initCoordinates(options);
@@ -12430,6 +12437,10 @@ function validatePlatformGenesisGuests(guests, expectedCount = 3) {
       throw new Error("platform genesis vCPU count cannot be smaller than physical cores");
     const memoryGib = integer2(input.memoryGib, 1, 8192, "memory");
     const diskGib = integer2(input.diskGib, 8, 65536, "disk");
+    const diskEncryption = input.diskEncryption ?? "none";
+    if (!["none", "luks2"].includes(diskEncryption)) {
+      throw new Error("platform genesis disk encryption mode is unsupported");
+    }
     const egressGuaranteedMbps = integer2(input.egressGuaranteedMbps, 0, 1e6, "guaranteed egress");
     const egressBurstMbps = integer2(input.egressBurstMbps, egressGuaranteedMbps, 1e6, "burst egress");
     return {
@@ -12441,6 +12452,7 @@ function validatePlatformGenesisGuests(guests, expectedCount = 3) {
       vcpu,
       memoryGib,
       diskGib,
+      diskEncryption,
       egressGuaranteedMbps,
       egressBurstMbps,
       confidential: input.confidential
@@ -12471,6 +12483,7 @@ var claimFor = (guest, keys, action) => {
       vcpu: guest.vcpu,
       memoryGib: guest.memoryGib,
       diskGib: guest.diskGib,
+      diskEncryption: guest.diskEncryption,
       egressGuaranteedMbps: guest.egressGuaranteedMbps,
       egressBurstMbps: guest.egressBurstMbps,
       confidential: guest.confidential
@@ -12560,6 +12573,7 @@ function validatePlatformInitialInventory(value) {
       "vcpu",
       "memoryGib",
       "diskGib",
+      "diskEncryption",
       "egressGuaranteedMbps",
       "egressBurstMbps",
       "confidential",
@@ -15866,6 +15880,7 @@ function strictBootstrapDocument(value) {
           "vcpu",
           "memoryGib",
           "diskGib",
+          "diskEncryption",
           "egressGuaranteedMbps",
           "egressBurstMbps",
           "confidential",
@@ -17100,6 +17115,7 @@ async function applyMetalBootstrap(config, options) {
     "qemu-utils",
     "cloud-image-utils",
     "lvm2",
+    "cryptsetup",
     "nftables",
     "curl",
     "ca-certificates"
@@ -17534,11 +17550,12 @@ var validateMetalRequestValue = (value, options = {}) => {
       "vcpu",
       "memoryGib",
       "diskGib",
+      "diskEncryption",
       "egressGuaranteedMbps",
       "egressBurstMbps",
       "confidential"
     ], label);
-    if (typeof row2.name !== "string" || typeof row2.address !== "string" || typeof row2.imageKey !== "string" || row2.cpuPoolKey !== undefined && typeof row2.cpuPoolKey !== "string" || !["physicalCores", "vcpu", "memoryGib", "diskGib", "egressGuaranteedMbps", "egressBurstMbps"].every((key) => typeof row2[key] === "number") || typeof row2.confidential !== "boolean") {
+    if (typeof row2.name !== "string" || typeof row2.address !== "string" || typeof row2.imageKey !== "string" || row2.cpuPoolKey !== undefined && typeof row2.cpuPoolKey !== "string" || !["physicalCores", "vcpu", "memoryGib", "diskGib", "egressGuaranteedMbps", "egressBurstMbps"].every((key) => typeof row2[key] === "number") || row2.diskEncryption !== undefined && !["none", "luks2"].includes(row2.diskEncryption) || typeof row2.confidential !== "boolean") {
       throw new Error(`${label} has invalid resource coordinates`);
     }
     return {
@@ -17550,6 +17567,7 @@ var validateMetalRequestValue = (value, options = {}) => {
       vcpu: row2.vcpu,
       memoryGib: row2.memoryGib,
       diskGib: row2.diskGib,
+      diskEncryption: row2.diskEncryption ?? "none",
       egressGuaranteedMbps: row2.egressGuaranteedMbps,
       egressBurstMbps: row2.egressBurstMbps,
       confidential: row2.confidential
@@ -19153,6 +19171,13 @@ function parseOptions(argv2) {
     } else if (token === "--provision-metal") {
       options.deployProvisionMetal = argv2[++index];
       options.deployInitCustomized = true;
+    } else if (token === "--provision-disk-encryption") {
+      const value = argv2[++index];
+      options.deployInitCustomized = true;
+      if (value === "none" || value === "luks2")
+        options.deployProvisionDiskEncryption = value;
+      else
+        options.optionError = "--provision-disk-encryption must be none or luks2.";
     } else if (["--provision-physical-cores", "--provision-vcpu", "--provision-memory-gib", "--provision-disk-gib", "--provision-guaranteed-mbps", "--provision-burst-mbps"].includes(token)) {
       const value = Number(argv2[++index] ?? "");
       options.deployInitCustomized = true;
@@ -20001,6 +20026,7 @@ function interactiveGenesisGuests() {
     vcpu: bootstrapNumber(`Guest ${index} vCPUs`),
     memoryGib: bootstrapNumber(`Guest ${index} memory GiB`),
     diskGib: bootstrapNumber(`Guest ${index} disk GiB`),
+    diskEncryption: bootstrapBoolean(`Guest ${index} encrypts its persistent disk with LUKS2?`, "yes") ? "luks2" : "none",
     egressGuaranteedMbps: bootstrapNumber(`Guest ${index} guaranteed egress Mbps`),
     egressBurstMbps: bootstrapNumber(`Guest ${index} burst egress Mbps`),
     confidential: bootstrapBoolean(`Guest ${index} requires confidential SEV-SNP compute?`)
@@ -21014,6 +21040,7 @@ async function cmdDeploy(options, args) {
           options.deployProvisionMemoryGib,
           options.deployProvisionDiskGib,
           options.deployProvisionGuaranteedMbps,
+          options.deployProvisionDiskEncryption,
           options.deployProvisionBurstMbps,
           options.deployProvisionMonthlyAmountCents,
           options.deployMaxMonthlySpendMinor
@@ -21029,6 +21056,7 @@ async function cmdDeploy(options, args) {
               vcpu: options.deployProvisionVcpu ?? 0,
               memoryGib: options.deployProvisionMemoryGib ?? 0,
               diskGib: options.deployProvisionDiskGib ?? 0,
+              diskEncryption: options.deployProvisionDiskEncryption ?? "luks2",
               egressGuaranteedMbps: options.deployProvisionGuaranteedMbps ?? 0,
               egressBurstMbps: options.deployProvisionBurstMbps ?? 0,
               confidential: options.deployIsolation === "sev-snp"
@@ -21376,7 +21404,7 @@ function usage() {
 	 --provision-environment <key> --provision-ownership <platform|tenant-metal>
 	 --provision-metal <host>      Required only for tenant-metal ownership
 	 --provision-physical-cores <n> --provision-vcpu <n>
-	 --provision-memory-gib <n> --provision-disk-gib <n>
+	 --provision-memory-gib <n> --provision-disk-gib <n> --provision-disk-encryption <none|luks2>
 	 --provision-guaranteed-mbps <n> --provision-burst-mbps <n>
 	 --provision-monthly-amount-cents <n> Exact approved USD cost per created compute
 	 --max-monthly-spend-minor <n> Hard approved scale-out spend ceiling

package/dist/metal-bootstrap.js

@@ -366,7 +366,7 @@ function systemdAgentEgressDirectives(loopbackTcpPorts = []) {
 }
 
 // src/version.ts
-var VERSION = "0.1.135";
+var VERSION = "0.1.137";
 
 // src/otel-collector.ts
 var FORGEZERO_OTEL_COLLECTOR_UNIT = "forgezero-otel-collector.service";
@@ -1058,6 +1058,7 @@ async function applyMetalBootstrap(config, options) {
     "qemu-utils",
     "cloud-image-utils",
     "lvm2",
+    "cryptsetup",
     "nftables",
     "curl",
     "ca-certificates"

package/dist/metal-helper-socket.js

@@ -56,6 +56,10 @@ function guestUnit(spec) {
     `ExecStopPost=-/usr/sbin/ip link del ${spec.tap}`
   ].join(`
 `) : "";
+  const encryptedDisk = spec.diskEncryption ? `LoadCredentialEncrypted=${spec.diskEncryption.credentialName}:${spec.diskEncryption.credentialPath}
+ExecStartPre=/usr/sbin/cryptsetup open --type luks2 --key-file %d/${spec.diskEncryption.credentialName} ${spec.diskEncryption.source} ${spec.diskEncryption.mapper}
+ExecStopPost=-/usr/sbin/cryptsetup close ${spec.diskEncryption.mapper}
+` : "";
   return `[Unit]
 Description=ForgeZero guest ${spec.name}
 Documentation=https://www.forgezero.net
@@ -65,7 +69,7 @@ Wants=network-online.target
 [Service]
 Type=simple
 Slice=forgezero-guests.slice
-${tapSetup}
+${encryptedDisk}${tapSetup}
 ExecStart=${argv}
 Restart=always
 RestartSec=5
@@ -754,8 +758,9 @@ function assertSupportedGuestImage(imageKey, confidential = false) {
 }
 
 // src/metal-provision.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash2, randomBytes } from "node:crypto";
 import {
+  chmodSync as chmodSync2,
   existsSync as existsSync2,
   mkdirSync as mkdirSync2,
   readFileSync as readFileSync2,
@@ -828,6 +833,7 @@ var macForAddress = (address) => {
   }
   return `52:54:00:f0:${octets[2].toString(16).padStart(2, "0")}:${octets[3].toString(16).padStart(2, "0")}`;
 };
+var shouldCloseGuestMapper = (openedHere, active) => openedHere && active;
 function validateMetalProfile(profile) {
   if (!SAFE_NAME.test(profile.volumeGroup))
     throw new MetalProvisionError("invalid volume group");
@@ -989,6 +995,8 @@ function guestBootstrapOperations(profile, attested = Boolean(profile.confidenti
   validateMetalProfile(profile);
   const agentBun = "/usr/local/lib/forgezero/bun";
   return [
+    ["/usr/sbin/swapoff", "--all"],
+    ["/usr/bin/systemctl", "mask", "--now", "swap.target"],
     ...attested ? [
       ["/usr/sbin/modprobe", "sev-guest"],
       ["/usr/bin/test", "-c", "/dev/sev-guest"]
@@ -1065,6 +1073,7 @@ ${access.sshPublicKeys.map((key) => `      - ${JSON.stringify(key)}`).join(`
   return {
     userData: `#cloud-config
 package_update: true
+swap: { size: 0 }
 ${users}disable_root: true
 # Git is part of the deployment transport, not a tenant-selected prerequisite:
 # every dynamically claimed repository must be cloneable on a clean image.
@@ -1097,7 +1106,8 @@ var checked = async (exec, argv) => {
 async function provisionMetalGuest(profile, claim, exec) {
   validateMetalProfile(profile);
   assertSupportedGuestImage(claim.spec.imageKey, claim.spec.confidential);
-  if (!claim.computeKey || !claim.spec.reference || !SAFE_NAME.test(claim.spec.imageKey) || claim.spec.guestName !== undefined && !SAFE_NAME.test(claim.spec.guestName) || claim.spec.cpuPoolKey !== undefined && !SAFE_NAME.test(claim.spec.cpuPoolKey) || !Number.isInteger(claim.spec.physicalCores) || claim.spec.physicalCores < 1 || claim.spec.physicalCores > 256 || !Number.isInteger(claim.spec.vcpu) || claim.spec.vcpu < 1 || claim.spec.vcpu > 512 || !Number.isInteger(claim.spec.memoryGib) || claim.spec.memoryGib < 1 || claim.spec.memoryGib > 8192 || !Number.isInteger(claim.spec.diskGib) || claim.spec.diskGib < 8 || claim.spec.diskGib > 65536 || !Number.isInteger(claim.spec.egressGuaranteedMbps) || claim.spec.egressGuaranteedMbps < 0 || !Number.isInteger(claim.spec.egressBurstMbps) || claim.spec.egressBurstMbps < claim.spec.egressGuaranteedMbps)
+  const diskEncryption = claim.spec.diskEncryption ?? "none";
+  if (!claim.computeKey || !claim.spec.reference || !SAFE_NAME.test(claim.spec.imageKey) || claim.spec.guestName !== undefined && !SAFE_NAME.test(claim.spec.guestName) || claim.spec.cpuPoolKey !== undefined && !SAFE_NAME.test(claim.spec.cpuPoolKey) || !Number.isInteger(claim.spec.physicalCores) || claim.spec.physicalCores < 1 || claim.spec.physicalCores > 256 || !Number.isInteger(claim.spec.vcpu) || claim.spec.vcpu < 1 || claim.spec.vcpu > 512 || !Number.isInteger(claim.spec.memoryGib) || claim.spec.memoryGib < 1 || claim.spec.memoryGib > 8192 || !Number.isInteger(claim.spec.diskGib) || claim.spec.diskGib < 8 || claim.spec.diskGib > 65536 || !["none", "luks2"].includes(diskEncryption) || !Number.isInteger(claim.spec.egressGuaranteedMbps) || claim.spec.egressGuaranteedMbps < 0 || !Number.isInteger(claim.spec.egressBurstMbps) || claim.spec.egressBurstMbps < claim.spec.egressGuaranteedMbps)
     throw new MetalProvisionError("invalid compute claim");
   const image = profile.images[claim.spec.imageKey];
   if (!image || !isAbsolute(image.path) || !SHA256.test(image.sha256)) {
@@ -1126,6 +1136,9 @@ async function provisionMetalGuest(profile, claim, exec) {
   const prior = manifests.find((row) => row.computeKey === claim.computeKey);
   if (prior && prior.reference !== claim.spec.reference)
     throw new MetalProvisionError("compute identity conflicts with host inventory");
+  if (prior && (prior.diskEncryption ?? "none") !== diskEncryption) {
+    throw new MetalProvisionError("an allocated guest disk encryption mode is immutable");
+  }
   const address = requestedAddress(profile, claim, manifests);
   const cpuPool = allocateCpuPool(profile, claim, manifests);
   const manifest = prior ?? {
@@ -1137,6 +1150,7 @@ async function provisionMetalGuest(profile, claim, exec) {
     cpuPoolKey: cpuPool.key,
     allowedCpus: cpuPool.cpus,
     allowedMemoryNodes: cpuPool.memoryNodes,
+    diskEncryption,
     phase: "allocating"
   };
   const save = () => writeFileSync2(manifestPath, `${JSON.stringify(manifest, null, 2)}
@@ -1146,8 +1160,72 @@ async function provisionMetalGuest(profile, claim, exec) {
   const exists = (await exec(["lvs", "--noheadings", lv])).exitCode === 0;
   if (!exists)
     await checked(exec, ["lvcreate", "-y", "-n", name, "-L", `${claim.spec.diskGib}G`, profile.volumeGroup]);
+  const encrypted = diskEncryption === "luks2";
+  const mapper = `fz-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const mappedDisk = `/dev/mapper/${mapper}`;
+  const credentialName = `guest-disk-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const credentialPath = `/etc/forgezero/creds/${credentialName}.cred`;
+  const keyPath = `/run/forgezero/${credentialName}.key`;
+  let imageTarget = lv;
+  let mapperOpenedHere = false;
+  if (encrypted) {
+    mkdirSync2(dirname2(credentialPath), { recursive: true, mode: 448 });
+    mkdirSync2(dirname2(keyPath), { recursive: true, mode: 448 });
+    if (existsSync2(keyPath))
+      unlinkSync2(keyPath);
+    if (!existsSync2(credentialPath)) {
+      if (exists && (await exec(["cryptsetup", "isLuks", lv])).exitCode === 0) {
+        throw new MetalProvisionError("encrypted guest disk exists without its sealed unlock credential");
+      }
+      writeFileSync2(keyPath, randomBytes(64), { mode: 384, flag: "wx" });
+      try {
+        await checked(exec, ["systemd-creds", "encrypt", `--name=${credentialName}`, keyPath, credentialPath]);
+        chmodSync2(credentialPath, 384);
+      } catch (cause) {
+        if (existsSync2(credentialPath))
+          unlinkSync2(credentialPath);
+        throw cause;
+      }
+    } else {
+      await checked(exec, ["systemd-creds", "decrypt", `--name=${credentialName}`, credentialPath, keyPath]);
+    }
+    try {
+      if ((await exec(["cryptsetup", "isLuks", lv])).exitCode !== 0) {
+        await checked(exec, [
+          "cryptsetup",
+          "luksFormat",
+          "--batch-mode",
+          "--type",
+          "luks2",
+          "--cipher",
+          "aes-xts-plain64",
+          "--key-size",
+          "512",
+          "--key-file",
+          keyPath,
+          lv
+        ]);
+      }
+      if ((await exec(["cryptsetup", "status", mapper])).exitCode !== 0) {
+        await checked(exec, ["cryptsetup", "open", "--type", "luks2", "--key-file", keyPath, lv, mapper]);
+        mapperOpenedHere = true;
+      }
+      imageTarget = mappedDisk;
+      if (manifest.phase === "allocating") {
+        await checked(exec, ["qemu-img", "convert", "-O", "raw", image.path, imageTarget]);
+        manifest.phase = "image-ready";
+        save();
+      }
+    } finally {
+      if (existsSync2(keyPath))
+        unlinkSync2(keyPath);
+      if (shouldCloseGuestMapper(mapperOpenedHere, (await exec(["cryptsetup", "status", mapper])).exitCode === 0)) {
+        await checked(exec, ["cryptsetup", "close", mapper]);
+      }
+    }
+  }
   if (manifest.phase === "allocating") {
-    await checked(exec, ["qemu-img", "convert", "-O", "raw", image.path, lv]);
+    await checked(exec, ["qemu-img", "convert", "-O", "raw", image.path, imageTarget]);
     manifest.phase = "image-ready";
     save();
   }
@@ -1171,7 +1249,8 @@ async function provisionMetalGuest(profile, claim, exec) {
     memoryGib: claim.spec.memoryGib,
     allowedCpus: manifest.allowedCpus,
     allowedMemoryNodes: manifest.allowedMemoryNodes,
-    disk: lv,
+    disk: encrypted ? mappedDisk : lv,
+    ...encrypted ? { diskEncryption: { source: lv, mapper, credentialName, credentialPath } } : {},
     seed,
     bridge: profile.bridge,
     mac: manifest.mac,
@@ -1229,6 +1308,7 @@ function legacyPlatformManifest(profile, claim, name) {
     cpuPoolKey: claim.spec.cpuPoolKey ?? "",
     allowedCpus: values.get("CPUSET") ?? "",
     allowedMemoryNodes: values.get("NUMA"),
+    diskEncryption: "none",
     phase: "running",
     disk,
     unit: `forgezero-guest@${name}.service`
@@ -1243,6 +1323,9 @@ async function removeMetalGuest(profile, claim, exec) {
   const service = `forgezero-guest@${name}.service`;
   const unitPath = join2(profile.unitDir, service);
   const lv = `/dev/${profile.volumeGroup}/${name}`;
+  const mapper = `fz-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const credentialName = `guest-disk-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const credentialPath = `/etc/forgezero/creds/${credentialName}.cred`;
   const manifest = existsSync2(manifestPath) ? JSON.parse(readFileSync2(manifestPath, "utf8")) : legacyPlatformManifest(profile, claim, name);
   if (!manifest) {
     const seedBase = join2(profile.seedDir, name);
@@ -1277,9 +1360,14 @@ async function removeMetalGuest(profile, claim, exec) {
   else if ((await exec(["systemctl", "is-active", service])).exitCode === 0) {
     throw new MetalProvisionError("guest unit is active but its owned unit file is missing");
   }
+  const encrypted = (manifest.diskEncryption ?? "none") === "luks2";
+  if (encrypted && (await exec(["cryptsetup", "status", mapper])).exitCode === 0) {
+    throw new MetalProvisionError("guest disk mapping remained active after the guest stopped");
+  }
   if ((await exec(["lvs", "--noheadings", lv])).exitCode === 0)
     await checked(exec, ["lvremove", "-fy", lv]);
   for (const path2 of [
+    ...encrypted ? [credentialPath] : [],
     unitPath,
     join2(profile.seedDir, `${name}-seed.iso`),
     join2(profile.seedDir, `${name}-user-data`),
@@ -1302,7 +1390,7 @@ async function removeMetalGuest(profile, claim, exec) {
 }
 
 // src/metal-helper-socket.ts
-import { chmodSync as chmodSync2, existsSync as existsSync3, unlinkSync as unlinkSync3 } from "node:fs";
+import { chmodSync as chmodSync3, existsSync as existsSync3, unlinkSync as unlinkSync3 } from "node:fs";
 import { connect, createServer } from "node:net";
 var DEFAULT_METAL_HELPER_SOCKET = "/run/forgezero-metal/helper.sock";
 var MAX_REQUEST_BYTES = 32 * 1024;
@@ -1382,7 +1470,7 @@ function startMetalHelper(options) {
     });
     socket.on("error", () => socket.destroy());
   });
-  server.listen(socketPath, () => chmodSync2(socketPath, 432));
+  server.listen(socketPath, () => chmodSync3(socketPath, 432));
   return {
     server,
     async stop() {

package/dist/metal-provision.d.ts

@@ -63,6 +63,7 @@ export interface GuestManifest {
     cpuPoolKey: string;
     allowedCpus: string;
     allowedMemoryNodes?: string;
+    diskEncryption?: 'none' | 'luks2';
     phase: 'allocating' | 'image-ready' | 'running';
 }
 export declare class MetalProvisionError extends Error {
@@ -71,6 +72,8 @@ export declare const guestNameFor: (computeKey: string) => string;
 /** Linux interface names are capped at 15 bytes. */
 export declare const tapNameFor: (computeKey: string) => string;
 export declare const macForAddress: (address: string) => string;
+/** A reconciler may close only the transient mapper it opened itself. */
+export declare const shouldCloseGuestMapper: (openedHere: boolean, active: boolean) => boolean;
 export declare function validateMetalProfile(profile: MetalProvisionProfile): void;
 export declare function allocateAddress(profile: MetalProvisionProfile, computeKey: string, rows: GuestManifest[]): string;
 /** Stable tight-fit allocation of exact physical cores inside one NUMA-local pool. */

package/dist/metal-provision.js

@@ -56,6 +56,10 @@ function guestUnit(spec) {
     `ExecStopPost=-/usr/sbin/ip link del ${spec.tap}`
   ].join(`
 `) : "";
+  const encryptedDisk = spec.diskEncryption ? `LoadCredentialEncrypted=${spec.diskEncryption.credentialName}:${spec.diskEncryption.credentialPath}
+ExecStartPre=/usr/sbin/cryptsetup open --type luks2 --key-file %d/${spec.diskEncryption.credentialName} ${spec.diskEncryption.source} ${spec.diskEncryption.mapper}
+ExecStopPost=-/usr/sbin/cryptsetup close ${spec.diskEncryption.mapper}
+` : "";
   return `[Unit]
 Description=ForgeZero guest ${spec.name}
 Documentation=https://www.forgezero.net
@@ -65,7 +69,7 @@ Wants=network-online.target
 [Service]
 Type=simple
 Slice=forgezero-guests.slice
-${tapSetup}
+${encryptedDisk}${tapSetup}
 ExecStart=${argv}
 Restart=always
 RestartSec=5
@@ -754,8 +758,9 @@ function assertSupportedGuestImage(imageKey, confidential = false) {
 }
 
 // src/metal-provision.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash2, randomBytes } from "node:crypto";
 import {
+  chmodSync as chmodSync2,
   existsSync as existsSync2,
   mkdirSync as mkdirSync2,
   readFileSync as readFileSync2,
@@ -828,6 +833,7 @@ var macForAddress = (address) => {
   }
   return `52:54:00:f0:${octets[2].toString(16).padStart(2, "0")}:${octets[3].toString(16).padStart(2, "0")}`;
 };
+var shouldCloseGuestMapper = (openedHere, active) => openedHere && active;
 function validateMetalProfile(profile) {
   if (!SAFE_NAME.test(profile.volumeGroup))
     throw new MetalProvisionError("invalid volume group");
@@ -989,6 +995,8 @@ function guestBootstrapOperations(profile, attested = Boolean(profile.confidenti
   validateMetalProfile(profile);
   const agentBun = "/usr/local/lib/forgezero/bun";
   return [
+    ["/usr/sbin/swapoff", "--all"],
+    ["/usr/bin/systemctl", "mask", "--now", "swap.target"],
     ...attested ? [
       ["/usr/sbin/modprobe", "sev-guest"],
       ["/usr/bin/test", "-c", "/dev/sev-guest"]
@@ -1065,6 +1073,7 @@ ${access.sshPublicKeys.map((key) => `      - ${JSON.stringify(key)}`).join(`
   return {
     userData: `#cloud-config
 package_update: true
+swap: { size: 0 }
 ${users}disable_root: true
 # Git is part of the deployment transport, not a tenant-selected prerequisite:
 # every dynamically claimed repository must be cloneable on a clean image.
@@ -1097,7 +1106,8 @@ var checked = async (exec, argv) => {
 async function provisionMetalGuest(profile, claim, exec) {
   validateMetalProfile(profile);
   assertSupportedGuestImage(claim.spec.imageKey, claim.spec.confidential);
-  if (!claim.computeKey || !claim.spec.reference || !SAFE_NAME.test(claim.spec.imageKey) || claim.spec.guestName !== undefined && !SAFE_NAME.test(claim.spec.guestName) || claim.spec.cpuPoolKey !== undefined && !SAFE_NAME.test(claim.spec.cpuPoolKey) || !Number.isInteger(claim.spec.physicalCores) || claim.spec.physicalCores < 1 || claim.spec.physicalCores > 256 || !Number.isInteger(claim.spec.vcpu) || claim.spec.vcpu < 1 || claim.spec.vcpu > 512 || !Number.isInteger(claim.spec.memoryGib) || claim.spec.memoryGib < 1 || claim.spec.memoryGib > 8192 || !Number.isInteger(claim.spec.diskGib) || claim.spec.diskGib < 8 || claim.spec.diskGib > 65536 || !Number.isInteger(claim.spec.egressGuaranteedMbps) || claim.spec.egressGuaranteedMbps < 0 || !Number.isInteger(claim.spec.egressBurstMbps) || claim.spec.egressBurstMbps < claim.spec.egressGuaranteedMbps)
+  const diskEncryption = claim.spec.diskEncryption ?? "none";
+  if (!claim.computeKey || !claim.spec.reference || !SAFE_NAME.test(claim.spec.imageKey) || claim.spec.guestName !== undefined && !SAFE_NAME.test(claim.spec.guestName) || claim.spec.cpuPoolKey !== undefined && !SAFE_NAME.test(claim.spec.cpuPoolKey) || !Number.isInteger(claim.spec.physicalCores) || claim.spec.physicalCores < 1 || claim.spec.physicalCores > 256 || !Number.isInteger(claim.spec.vcpu) || claim.spec.vcpu < 1 || claim.spec.vcpu > 512 || !Number.isInteger(claim.spec.memoryGib) || claim.spec.memoryGib < 1 || claim.spec.memoryGib > 8192 || !Number.isInteger(claim.spec.diskGib) || claim.spec.diskGib < 8 || claim.spec.diskGib > 65536 || !["none", "luks2"].includes(diskEncryption) || !Number.isInteger(claim.spec.egressGuaranteedMbps) || claim.spec.egressGuaranteedMbps < 0 || !Number.isInteger(claim.spec.egressBurstMbps) || claim.spec.egressBurstMbps < claim.spec.egressGuaranteedMbps)
     throw new MetalProvisionError("invalid compute claim");
   const image = profile.images[claim.spec.imageKey];
   if (!image || !isAbsolute(image.path) || !SHA256.test(image.sha256)) {
@@ -1126,6 +1136,9 @@ async function provisionMetalGuest(profile, claim, exec) {
   const prior = manifests.find((row) => row.computeKey === claim.computeKey);
   if (prior && prior.reference !== claim.spec.reference)
     throw new MetalProvisionError("compute identity conflicts with host inventory");
+  if (prior && (prior.diskEncryption ?? "none") !== diskEncryption) {
+    throw new MetalProvisionError("an allocated guest disk encryption mode is immutable");
+  }
   const address = requestedAddress(profile, claim, manifests);
   const cpuPool = allocateCpuPool(profile, claim, manifests);
   const manifest = prior ?? {
@@ -1137,6 +1150,7 @@ async function provisionMetalGuest(profile, claim, exec) {
     cpuPoolKey: cpuPool.key,
     allowedCpus: cpuPool.cpus,
     allowedMemoryNodes: cpuPool.memoryNodes,
+    diskEncryption,
     phase: "allocating"
   };
   const save = () => writeFileSync2(manifestPath, `${JSON.stringify(manifest, null, 2)}
@@ -1146,8 +1160,72 @@ async function provisionMetalGuest(profile, claim, exec) {
   const exists = (await exec(["lvs", "--noheadings", lv])).exitCode === 0;
   if (!exists)
     await checked(exec, ["lvcreate", "-y", "-n", name, "-L", `${claim.spec.diskGib}G`, profile.volumeGroup]);
+  const encrypted = diskEncryption === "luks2";
+  const mapper = `fz-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const mappedDisk = `/dev/mapper/${mapper}`;
+  const credentialName = `guest-disk-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const credentialPath = `/etc/forgezero/creds/${credentialName}.cred`;
+  const keyPath = `/run/forgezero/${credentialName}.key`;
+  let imageTarget = lv;
+  let mapperOpenedHere = false;
+  if (encrypted) {
+    mkdirSync2(dirname2(credentialPath), { recursive: true, mode: 448 });
+    mkdirSync2(dirname2(keyPath), { recursive: true, mode: 448 });
+    if (existsSync2(keyPath))
+      unlinkSync2(keyPath);
+    if (!existsSync2(credentialPath)) {
+      if (exists && (await exec(["cryptsetup", "isLuks", lv])).exitCode === 0) {
+        throw new MetalProvisionError("encrypted guest disk exists without its sealed unlock credential");
+      }
+      writeFileSync2(keyPath, randomBytes(64), { mode: 384, flag: "wx" });
+      try {
+        await checked(exec, ["systemd-creds", "encrypt", `--name=${credentialName}`, keyPath, credentialPath]);
+        chmodSync2(credentialPath, 384);
+      } catch (cause) {
+        if (existsSync2(credentialPath))
+          unlinkSync2(credentialPath);
+        throw cause;
+      }
+    } else {
+      await checked(exec, ["systemd-creds", "decrypt", `--name=${credentialName}`, credentialPath, keyPath]);
+    }
+    try {
+      if ((await exec(["cryptsetup", "isLuks", lv])).exitCode !== 0) {
+        await checked(exec, [
+          "cryptsetup",
+          "luksFormat",
+          "--batch-mode",
+          "--type",
+          "luks2",
+          "--cipher",
+          "aes-xts-plain64",
+          "--key-size",
+          "512",
+          "--key-file",
+          keyPath,
+          lv
+        ]);
+      }
+      if ((await exec(["cryptsetup", "status", mapper])).exitCode !== 0) {
+        await checked(exec, ["cryptsetup", "open", "--type", "luks2", "--key-file", keyPath, lv, mapper]);
+        mapperOpenedHere = true;
+      }
+      imageTarget = mappedDisk;
+      if (manifest.phase === "allocating") {
+        await checked(exec, ["qemu-img", "convert", "-O", "raw", image.path, imageTarget]);
+        manifest.phase = "image-ready";
+        save();
+      }
+    } finally {
+      if (existsSync2(keyPath))
+        unlinkSync2(keyPath);
+      if (shouldCloseGuestMapper(mapperOpenedHere, (await exec(["cryptsetup", "status", mapper])).exitCode === 0)) {
+        await checked(exec, ["cryptsetup", "close", mapper]);
+      }
+    }
+  }
   if (manifest.phase === "allocating") {
-    await checked(exec, ["qemu-img", "convert", "-O", "raw", image.path, lv]);
+    await checked(exec, ["qemu-img", "convert", "-O", "raw", image.path, imageTarget]);
     manifest.phase = "image-ready";
     save();
   }
@@ -1171,7 +1249,8 @@ async function provisionMetalGuest(profile, claim, exec) {
     memoryGib: claim.spec.memoryGib,
     allowedCpus: manifest.allowedCpus,
     allowedMemoryNodes: manifest.allowedMemoryNodes,
-    disk: lv,
+    disk: encrypted ? mappedDisk : lv,
+    ...encrypted ? { diskEncryption: { source: lv, mapper, credentialName, credentialPath } } : {},
     seed,
     bridge: profile.bridge,
     mac: manifest.mac,
@@ -1229,6 +1308,7 @@ function legacyPlatformManifest(profile, claim, name) {
     cpuPoolKey: claim.spec.cpuPoolKey ?? "",
     allowedCpus: values.get("CPUSET") ?? "",
     allowedMemoryNodes: values.get("NUMA"),
+    diskEncryption: "none",
     phase: "running",
     disk,
     unit: `forgezero-guest@${name}.service`
@@ -1243,6 +1323,9 @@ async function removeMetalGuest(profile, claim, exec) {
   const service = `forgezero-guest@${name}.service`;
   const unitPath = join2(profile.unitDir, service);
   const lv = `/dev/${profile.volumeGroup}/${name}`;
+  const mapper = `fz-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const credentialName = `guest-disk-${createHash2("sha256").update(claim.computeKey).digest("hex").slice(0, 20)}`;
+  const credentialPath = `/etc/forgezero/creds/${credentialName}.cred`;
   const manifest = existsSync2(manifestPath) ? JSON.parse(readFileSync2(manifestPath, "utf8")) : legacyPlatformManifest(profile, claim, name);
   if (!manifest) {
     const seedBase = join2(profile.seedDir, name);
@@ -1277,9 +1360,14 @@ async function removeMetalGuest(profile, claim, exec) {
   else if ((await exec(["systemctl", "is-active", service])).exitCode === 0) {
     throw new MetalProvisionError("guest unit is active but its owned unit file is missing");
   }
+  const encrypted = (manifest.diskEncryption ?? "none") === "luks2";
+  if (encrypted && (await exec(["cryptsetup", "status", mapper])).exitCode === 0) {
+    throw new MetalProvisionError("guest disk mapping remained active after the guest stopped");
+  }
   if ((await exec(["lvs", "--noheadings", lv])).exitCode === 0)
     await checked(exec, ["lvremove", "-fy", lv]);
   for (const path2 of [
+    ...encrypted ? [credentialPath] : [],
     unitPath,
     join2(profile.seedDir, `${name}-seed.iso`),
     join2(profile.seedDir, `${name}-user-data`),
@@ -1303,6 +1391,7 @@ async function removeMetalGuest(profile, claim, exec) {
 export {
   validateMetalProfile,
   tapNameFor,
+  shouldCloseGuestMapper,
   removeMetalGuest,
   provisionMetalGuest,
   macForAddress,