@takodotid/circuit 0.33.1 → 0.34.1

package/dist/cli/index.js

@@ -2450,6 +2450,9 @@ function routed(entry, device, name, settings, access) {
       entry.set("allowaccess", access);
     return;
   }
+  const answering = device.management?.interfaces;
+  if (answering && !answering.includes(name))
+    access = "ping";
   const addresses = addressesOf2(settings);
   const ipv4 = addresses.filter((address) => familyOf2(host2(address)) === "ipv4");
   const ipv6 = addresses.filter((address) => familyOf2(host2(address)) === "ipv6");
@@ -4890,6 +4893,8 @@ function unsupported2(device) {
   }
   if (management.console)
     found.push("management.console, the console uses the device's users");
+  if (management.interfaces)
+    found.push("management.interfaces, which only FortiOS builds for now");
   if (management.native?.interfaces?.length)
     found.push("management.native.interfaces, NETCONF runs over IP only");
   if (management.ssh?.auth_timeout || management.ssh?.auth_retries)
@@ -5613,6 +5618,8 @@ async function read3(device, _network = [], options = {}) {
 }
 function unsupported3(device) {
   const found = [];
+  if (device.management?.interfaces)
+    found.push("management.interfaces, which only FortiOS builds for now");
   for (const [name, iface] of Object.entries(device.interfaces ?? {})) {
     if (iface.type === "bridge")
       found.push(`interfaces.${name}, a bridge, which only FortiOS builds for now`);
@@ -7624,6 +7631,8 @@ function unsupported4(device) {
   const management = device.management;
   if (management?.console)
     found.push("management.console, the console uses the device's users");
+  if (management?.interfaces)
+    found.push("management.interfaces, which only FortiOS builds for now");
   if (management?.privilege_password)
     found.push("management.privilege_password, the platform has no privileged mode");
   if (management?.snmp?.port)
@@ -8276,6 +8285,8 @@ function configurationOf(device, dump) {
 }
 function unsupported5(device) {
   const found = [];
+  if (device.management?.interfaces)
+    found.push("management.interfaces, which only FortiOS builds for now");
   for (const [name, iface] of Object.entries(device.interfaces ?? {})) {
     if (iface.type === "bridge")
       found.push(`interfaces.${name}, a bridge, which only FortiOS builds for now`);

package/dist/presets/index.js

@@ -33,10 +33,6 @@ var AMPLIFIERS = {
 };
 var ASKED = new Set([AMPLIFIERS.dns, AMPLIFIERS.ntp, AMPLIFIERS.snmp]);
 function antiAmplification(destinations, options = {}) {
-  const below1024Except = (port) => [
-    { min: 0, max: port - 1 },
-    { min: port + 1, max: 1023 }
-  ];
   return destinations.flatMap((dst) => [
     ...(options.keep_fragments ?? []).filter((prefix) => contains2(dst, prefix)).map((prefix) => ({
       description: `UDP fragments to ${prefix} kept`,
@@ -44,11 +40,18 @@ function antiAmplification(destinations, options = {}) {
       action: "accept"
     })),
     { description: `UDP fragments to ${dst}`, match: { protocol: "udp", dst, src_port: 0 }, action: "drop" },
-    ...Object.entries(AMPLIFIERS).map(([name, port]) => ({
-      description: ASKED.has(port) ? `UDP to ${dst} from ${name}, to a port below 1024` : `UDP to ${dst} from ${name}`,
-      match: { protocol: "udp", dst, src_port: port, ...ASKED.has(port) ? { dst_port: below1024Except(port) } : {} },
-      action: "drop"
-    }))
+    ...Object.entries(AMPLIFIERS).flatMap(([name, port]) => ASKED.has(port) ? [
+      {
+        description: `UDP to ${dst} from ${name}, between two servers`,
+        match: { protocol: "udp", dst, src_port: port, dst_port: port },
+        action: "accept"
+      },
+      {
+        description: `UDP to ${dst} from ${name}, to a port below 1024`,
+        match: { protocol: "udp", dst, src_port: port, dst_port: { min: 0, max: 1023 } },
+        action: "drop"
+      }
+    ] : [{ description: `UDP to ${dst} from ${name}`, match: { protocol: "udp", dst, src_port: port }, action: "drop" }])
   ]);
 }
 var BAD_TCP_FLAGS = [

package/dist/types/presets/index.d.ts

@@ -37,7 +37,7 @@ export type AntiAmplificationOptions = {
  * Hardware ACL rules dropping reflected UDP floods toward `destinations`, in the switch chip, without limiting anything else.
  *
  * - Replies from an amplifier no host asks across the internet are dropped.
- * - Replies from DNS, NTP and SNMP are dropped only toward a port below 1024 that is not the service's own. A host that runs its own resolver, time server or monitoring keeps its answers.
+ * - Replies from DNS, NTP and SNMP are dropped only toward a port below 1024 that is not the service's own. A host that runs its own resolver, time server or monitoring keeps its answers. The service's own port passes first, so every drop takes the one range 0 to 1023: a switch chip has few port-range checkers, and on RouterOS a rule past them is invalid with every rule after it.
  * - The fragments after the first carry no port, and a switch chip reads them as port 0. They are dropped, but toward `keep_fragments`.
  */
 export declare function antiAmplification(destinations: readonly Prefix[], options?: AntiAmplificationOptions): AclRule<never>[];

package/dist/types/schema/system.d.ts

@@ -84,6 +84,8 @@ export type SnmpUser = {
 export type Management<I extends string, C extends string> = {
     /** Sources allowed to every service that does not set its own. */
     allow?: readonly Prefix[];
+    /** The ports and interfaces the services answer on; every other one answers ping alone. Every one with an address when absent. */
+    interfaces?: readonly I[];
     /** Secure shell. */
     ssh?: Service & {
         /** Also offer legacy ciphers, MACs and key exchanges. Off when absent. */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@takodotid/circuit",
-    "version": "0.33.1",
+    "version": "0.34.1",
     "description": "Declarative, vendor-neutral network configuration: describe each device in TypeScript, and Circuit makes the device match. Alpha.",
     "keywords": [
         "network",

package/src/adapters/devices/fortios/render.ts

@@ -495,6 +495,10 @@ function routed(entry: Block, device: Device, name: string, settings: RoutedSett
         return;
     }
 
+    // Services answer only where the config says, when it says; ping everywhere.
+    const answering = device.management?.interfaces;
+    if (answering && !answering.includes(name)) access = "ping";
+
     const addresses = addressesOf(settings);
     const ipv4 = addresses.filter((address) => familyOf(host(address)) === "ipv4");
     const ipv6 = addresses.filter((address) => familyOf(host(address)) === "ipv6");

package/src/adapters/devices/junos/index.ts

@@ -595,6 +595,7 @@ export function unsupported(device: Device): string[] {
     }
 
     if (management.console) found.push("management.console, the console uses the device's users");
+    if (management.interfaces) found.push("management.interfaces, which only FortiOS builds for now");
     if (management.native?.interfaces?.length) found.push("management.native.interfaces, NETCONF runs over IP only");
     if (management.ssh?.auth_timeout || management.ssh?.auth_retries) found.push("management.ssh.auth_timeout and auth_retries");
 

package/src/adapters/devices/raisecom-ros/index.ts

@@ -420,6 +420,8 @@ export async function read(device: Device, _network: readonly Device[] = [], opt
 export function unsupported(device: Device): string[] {
     const found: string[] = [];
 
+    if (device.management?.interfaces) found.push("management.interfaces, which only FortiOS builds for now");
+
     for (const [name, iface] of Object.entries(device.interfaces ?? {})) {
         if (iface.type === "bridge") found.push(`interfaces.${name}, a bridge, which only FortiOS builds for now`);
         if (iface.type === "vlan" && iface.mac) found.push(`interfaces.${name}.mac, which only RouterOS sets for now`);

package/src/adapters/devices/routeros/TRAPS.md

@@ -44,3 +44,5 @@ Behaviour that looks like something else. Each one has been hit on a real device
 - On the serial console, the prompt can come twice after a login. The console echoes a long command wrapped at 80 columns, and a `print` that fills the screen stops at `-- [Q quit|D dump|down]`, where `D` prints the rest.
 - Every VLAN interface on the bridge has the bridge's MAC, and the bridge keeps a frame to that MAC on whatever VLAN it arrives. A gateway in front of a transparent firewall then never gets its replies: they come back on the inside VLAN and stop at the bridge. A MACVLAN on the VLAN interface gives the gateway a MAC of its own, and its replies cross the firewall back; proved with a FortiGate 3700D in transparent mode, the session offloaded to its NP6.
 - A second VLAN interface with the same VLAN ID on the same interface is refused, `already have such vlan`, so a VLAN interface is known by its interface and VLAN ID, and a new name is a rename.
+- A switch rule the chip cannot hold is flagged `I`, invalid, and every rule after it is invalid too, with no log line. On a CCR2216 (98DX8525, 7.23) it came at the sixth distinct `dst-port` range, with 66 rules in all, far below the 1,024 MikroTik lists: the amplifier drops toward every VLAN after it did nothing. Few distinct ranges, and check `print count-only where invalid` after an apply.
+- A MACVLAN on a VLAN interface is not routed in the switch chip: its connected route never takes the `H` flag, even with `l3-hw-offloading=yes` on the VLAN under it.

package/src/adapters/devices/routeros/index.ts

@@ -192,6 +192,7 @@ export function unsupported(device: Device): string[] {
     const management = device.management;
 
     if (management?.console) found.push("management.console, the console uses the device's users");
+    if (management?.interfaces) found.push("management.interfaces, which only FortiOS builds for now");
     if (management?.privilege_password) found.push("management.privilege_password, the platform has no privileged mode");
 
     if (management?.snmp?.port) found.push("management.snmp.port");

package/src/adapters/devices/vrp/index.ts

@@ -639,6 +639,8 @@ function configurationOf(device: Device, dump: string): string {
 export function unsupported(device: Device): string[] {
     const found: string[] = [];
 
+    if (device.management?.interfaces) found.push("management.interfaces, which only FortiOS builds for now");
+
     for (const [name, iface] of Object.entries(device.interfaces ?? {})) {
         if (iface.type === "bridge") found.push(`interfaces.${name}, a bridge, which only FortiOS builds for now`);
         if (iface.type === "vlan" && iface.mac) found.push(`interfaces.${name}.mac, which only RouterOS sets for now`);

package/src/presets/index.ts

@@ -54,15 +54,10 @@ export type AntiAmplificationOptions = {
  * Hardware ACL rules dropping reflected UDP floods toward `destinations`, in the switch chip, without limiting anything else.
  *
  * - Replies from an amplifier no host asks across the internet are dropped.
- * - Replies from DNS, NTP and SNMP are dropped only toward a port below 1024 that is not the service's own. A host that runs its own resolver, time server or monitoring keeps its answers.
+ * - Replies from DNS, NTP and SNMP are dropped only toward a port below 1024 that is not the service's own. A host that runs its own resolver, time server or monitoring keeps its answers. The service's own port passes first, so every drop takes the one range 0 to 1023: a switch chip has few port-range checkers, and on RouterOS a rule past them is invalid with every rule after it.
  * - The fragments after the first carry no port, and a switch chip reads them as port 0. They are dropped, but toward `keep_fragments`.
  */
 export function antiAmplification(destinations: readonly Prefix[], options: AntiAmplificationOptions = {}): AclRule<never>[] {
-    const below1024Except = (port: number) => [
-        { min: 0, max: port - 1 },
-        { min: port + 1, max: 1023 },
-    ];
-
     return destinations.flatMap((dst) => [
         ...(options.keep_fragments ?? [])
             .filter((prefix) => contains(dst, prefix))
@@ -72,11 +67,22 @@ export function antiAmplification(destinations: readonly Prefix[], options: Anti
                 action: "accept",
             })),
         { description: `UDP fragments to ${dst}`, match: { protocol: "udp", dst, src_port: 0 }, action: "drop" },
-        ...Object.entries(AMPLIFIERS).map(([name, port]): AclRule<never> => ({
-            description: ASKED.has(port) ? `UDP to ${dst} from ${name}, to a port below 1024` : `UDP to ${dst} from ${name}`,
-            match: { protocol: "udp", dst, src_port: port, ...(ASKED.has(port) ? { dst_port: below1024Except(port) } : {}) },
-            action: "drop",
-        })),
+        ...Object.entries(AMPLIFIERS).flatMap(([name, port]): AclRule<never>[] =>
+            ASKED.has(port)
+                ? [
+                      {
+                          description: `UDP to ${dst} from ${name}, between two servers`,
+                          match: { protocol: "udp", dst, src_port: port, dst_port: port },
+                          action: "accept",
+                      },
+                      {
+                          description: `UDP to ${dst} from ${name}, to a port below 1024`,
+                          match: { protocol: "udp", dst, src_port: port, dst_port: { min: 0, max: 1023 } },
+                          action: "drop",
+                      },
+                  ]
+                : [{ description: `UDP to ${dst} from ${name}`, match: { protocol: "udp", dst, src_port: port }, action: "drop" }]
+        ),
     ]);
 }
 

package/src/schema/system.ts

@@ -89,6 +89,8 @@ export type SnmpUser = {
 export type Management<I extends string, C extends string> = {
     /** Sources allowed to every service that does not set its own. */
     allow?: readonly Prefix[];
+    /** The ports and interfaces the services answer on; every other one answers ping alone. Every one with an address when absent. */
+    interfaces?: readonly I[];
     /** Secure shell. */
     ssh?: Service & {
         /** Also offer legacy ciphers, MACs and key exchanges. Off when absent. */