@forgezero/agent 0.1.102 → 0.1.107

package/dist/software-helper.js

@@ -1026,7 +1026,7 @@ function phasePipeline(definition, phase, profile, executeRelease = false) {
 // src/deployment-connectivity.ts
 import { createHash as createHash2 } from "node:crypto";
 import { mkdirSync as mkdirSync2, renameSync as renameSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import { createConnection } from "node:net";
+import { createConnection, isIP } from "node:net";
 import { dirname as dirname2 } from "node:path";
 
 // src/process-input.ts
@@ -1113,21 +1113,99 @@ function validate(request) {
     }
   } else if (request.capabilities.private)
     throw new Error("unexpected private deployment capability");
+  if (request.firewallPolicy) {
+    const policy = request.firewallPolicy;
+    if (!/^sha256:[a-f0-9]{64}$/.test(policy.generation) || !Array.isArray(policy.rules) || policy.rules.length > 256) {
+      throw new Error("deployment firewall policy is malformed");
+    }
+    let expanded = 0;
+    for (const rule of policy.rules) {
+      expanded += rule.sourceAddresses.length;
+      if (!/^[A-Za-z0-9_-]{1,64}$/.test(rule.ruleKey) || !["allow", "deny"].includes(rule.action) || !["tcp", "udp"].includes(rule.protocol) || rule.sourceAddresses.length < 1 || rule.sourceAddresses.length > 1024 || new Set(rule.sourceAddresses).size !== rule.sourceAddresses.length || rule.sourceAddresses.some((address) => isIP(address) !== 4) || !Number.isSafeInteger(rule.portFrom) || rule.portFrom < 1 || rule.portFrom > 65535 || !Number.isSafeInteger(rule.portTo) || rule.portTo < rule.portFrom || rule.portTo > 65535 || !Number.isSafeInteger(rule.priority) || rule.priority < 0 || rule.priority > 1e6) {
+        throw new Error("deployment firewall policy is malformed");
+      }
+    }
+    if (expanded > 2048)
+      throw new Error("deployment firewall policy expands beyond its rule limit");
+  }
+}
+async function replaceTaggedUfwRules(host, comment) {
+  const status = await checked(host, ["/usr/sbin/ufw", "status", "numbered"], "firewall inventory");
+  const numbers = status.split(`
+`).flatMap((line) => {
+    if (!line.includes(comment))
+      return [];
+    const match = line.match(/^\s*\[\s*(\d{1,6})\]/);
+    return match ? [Number(match[1])] : [];
+  }).filter((value) => Number.isSafeInteger(value) && value > 0).sort((left, right) => right - left);
+  for (const number of numbers)
+    await checked(host, ["/usr/sbin/ufw", "--force", "delete", String(number)], `stale firewall rule ${number}`);
 }
 async function applyDeploymentConnectivity(request, host = defaultHost) {
   validate(request);
   const id = idFor(request.key);
   const evidence = { key: request.key };
+  if (request.firewallPolicy) {
+    const policy = request.firewallPolicy;
+    const comment = `fz-policy-${id}`;
+    await replaceTaggedUfwRules(host, comment);
+    const ordered = [...policy.rules].sort((left, right) => left.priority - right.priority || (left.action === right.action ? left.ruleKey.localeCompare(right.ruleKey) : left.action === "deny" ? -1 : 1));
+    const commands = [];
+    for (const rule of ordered)
+      for (const source of rule.sourceAddresses)
+        commands.push([
+          "/usr/sbin/ufw",
+          "insert",
+          "1",
+          rule.action,
+          "from",
+          source,
+          "to",
+          "any",
+          "port",
+          rule.portFrom === rule.portTo ? String(rule.portFrom) : `${rule.portFrom}:${rule.portTo}`,
+          "proto",
+          rule.protocol,
+          "comment",
+          comment
+        ]);
+    const ranges = new Map;
+    for (const rule of ordered)
+      ranges.set(`${rule.protocol}:${rule.portFrom}:${rule.portTo}`, rule);
+    for (const range of ranges.values())
+      commands.push([
+        "/usr/sbin/ufw",
+        "insert",
+        "1",
+        "deny",
+        "to",
+        "any",
+        "port",
+        range.portFrom === range.portTo ? String(range.portFrom) : `${range.portFrom}:${range.portTo}`,
+        "proto",
+        range.protocol,
+        "comment",
+        comment
+      ]);
+    for (const command of commands.toReversed())
+      await checked(host, command, "deployment firewall rule");
+    evidence.firewall = { generation: policy.generation, rules: commands.length, active: true };
+  }
   const topology = request.topology;
   if (topology) {
-    const values = [topology.localRelayAddress, ...topology.localPeerAddresses, ...topology.remoteRelayAddresses];
+    const values = [
+      topology.localRelayAddress,
+      ...topology.localPeerAddresses,
+      ...topology.remoteRelayAddresses,
+      ...topology.remoteMemberAddresses
+    ];
     const identities = [
       topology.nodeIdentity,
       ...topology.localPeerIdentities,
       ...topology.remoteRelayIdentities,
       ...topology.memberIdentities
     ];
-    if (!/^[A-Za-z0-9.-]{1,253}$/.test(topology.site) || !/^(?:\d{1,3}\.){3}0\/24$/.test(topology.siteCidr) || values.some((value) => !/^(?:\d{1,3}\.){3}\d{1,3}$/.test(value)) || identities.some((value) => !/^[A-Za-z0-9.-]{1,253}$/.test(value)) || topology.localPeerIdentities.length !== topology.localPeerAddresses.length || topology.remoteRelayIdentities.length !== topology.remoteRelayAddresses.length || topology.memberIdentities.length < 1 || topology.memberIdentities.length > 1024 || new Set(topology.memberIdentities).size !== topology.memberIdentities.length || !topology.memberIdentities.includes(topology.nodeIdentity) || !/^sha256:[a-f0-9]{64}$/.test(topology.generation) || (topology.role === "member" ? topology.remoteRelayAddresses.length !== 0 : topology.remoteSiteCidrs.length !== topology.remoteRelayAddresses.length) || topology.remoteSiteCidrs.some((value) => !/^(?:\d{1,3}\.){3}0\/24$/.test(value)) || new Set(topology.remoteSiteCidrs).size !== topology.remoteSiteCidrs.length || !Number.isSafeInteger(topology.healthPort) || topology.healthPort < 1 || topology.healthPort > 65535 || topology.routedTcpPorts.length < 1 || topology.routedTcpPorts.length > 64 || new Set(topology.routedTcpPorts).size !== topology.routedTcpPorts.length || !topology.routedTcpPorts.includes(topology.healthPort) || topology.routedTcpPorts.some((port) => !Number.isSafeInteger(port) || port < 1 || port > 65535) || topology.role === "member" && topology.transport !== "private-lan") {
+    if (!/^[A-Za-z0-9.-]{1,253}$/.test(topology.site) || !/^(?:\d{1,3}\.){3}0\/24$/.test(topology.siteCidr) || values.some((value) => isIP(value) !== 4) || identities.some((value) => !/^[A-Za-z0-9.-]{1,253}$/.test(value)) || topology.localPeerIdentities.length !== topology.localPeerAddresses.length || topology.remoteRelayIdentities.length !== topology.remoteRelayAddresses.length || topology.remoteMemberAddresses.length > 1024 || new Set(topology.remoteMemberAddresses).size !== topology.remoteMemberAddresses.length || topology.memberIdentities.length < 1 || topology.memberIdentities.length > 1024 || new Set(topology.memberIdentities).size !== topology.memberIdentities.length || !topology.memberIdentities.includes(topology.nodeIdentity) || !/^sha256:[a-f0-9]{64}$/.test(topology.generation) || (topology.role === "member" ? topology.remoteRelayAddresses.length !== 0 : topology.remoteSiteCidrs.length !== topology.remoteRelayAddresses.length) || topology.remoteSiteCidrs.some((value) => !/^(?:\d{1,3}\.){3}0\/24$/.test(value)) || new Set(topology.remoteSiteCidrs).size !== topology.remoteSiteCidrs.length || !Number.isSafeInteger(topology.healthPort) || topology.healthPort < 1 || topology.healthPort > 65535 || topology.routedTcpPorts.length < 1 || topology.routedTcpPorts.length > 64 || new Set(topology.routedTcpPorts).size !== topology.routedTcpPorts.length || !topology.routedTcpPorts.includes(topology.healthPort) || topology.routedTcpPorts.some((port) => !Number.isSafeInteger(port) || port < 1 || port > 65535) || topology.role === "member" && topology.transport !== "private-lan") {
       throw new Error("deployment topology is malformed");
     }
     if (request.intent.private?.mode === "cloudflare-warp" !== (topology.transport === "cloudflare-warp")) {
@@ -1254,28 +1332,46 @@ ${forwarding}${noOp}${starts}${starts ? `
 [Install]
 WantedBy=multi-user.target
 `, 420);
-    for (const source of [...new Set([topology.siteCidr, ...topology.remoteSiteCidrs])]) {
+    const firewallComment = `fz-topology-${id}`;
+    await replaceTaggedUfwRules(host, firewallComment);
+    for (const source of [...new Set([...topology.localPeerAddresses, ...topology.remoteMemberAddresses])]) {
       for (const port of topology.routedTcpPorts) {
-        await checked(host, ["/usr/sbin/ufw", "allow", "from", source, "to", "any", "port", String(port), "proto", "tcp"], `private service ${source}:${port}`);
+        await checked(host, [
+          "/usr/sbin/ufw",
+          "allow",
+          "from",
+          source,
+          "to",
+          "any",
+          "port",
+          String(port),
+          "proto",
+          "tcp",
+          "comment",
+          firewallComment
+        ], `private service ${source}:${port}`);
       }
     }
     if (topology.role !== "member")
-      for (const remoteCidr of topology.remoteSiteCidrs) {
-        for (const port of topology.routedTcpPorts) {
-          await checked(host, [
-            "/usr/sbin/ufw",
-            "route",
-            "allow",
-            "proto",
-            "tcp",
-            "from",
-            topology.siteCidr,
-            "to",
-            remoteCidr,
-            "port",
-            String(port)
-          ], `private routed service ${topology.siteCidr}->${remoteCidr}:${port}`);
-        }
+      for (const remoteAddress of topology.remoteMemberAddresses) {
+        for (const source of topology.localPeerAddresses)
+          for (const port of topology.routedTcpPorts) {
+            await checked(host, [
+              "/usr/sbin/ufw",
+              "route",
+              "allow",
+              "proto",
+              "tcp",
+              "from",
+              source,
+              "to",
+              remoteAddress,
+              "port",
+              String(port),
+              "comment",
+              firewallComment
+            ], `private routed service ${source}->${remoteAddress}:${port}`);
+          }
       }
     await checked(host, ["/usr/bin/systemctl", "daemon-reload"], "topology daemon reload");
     await checked(host, ["/usr/bin/systemctl", "enable", "--now", routeUnit], "topology routes");

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 /** One package version shared by both public binaries. Pinned to package.json by tests. */
-export declare const VERSION = "0.1.102";
+export declare const VERSION = "0.1.107";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgezero/agent",
-  "version": "0.1.102",
+  "version": "0.1.107",
   "type": "module",
   "scripts": {
     "check": "tsc --noEmit",
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@forgezero/runtime": "0.1.14",
-    "@forgezero/vault": "0.1.19",
+    "@forgezero/vault": "0.1.20",
     "@noble/curves": "2.2.0",
     "@noble/hashes": "2.2.0",
     "@noble/post-quantum": "0.6.1",