@takodotid/circuit 0.26.1 → 0.26.2

package/dist/cli/index.js

@@ -3384,11 +3384,14 @@ function servicesFilter(out, device, names) {
       const [protocol, standardPort] = SERVICE_PORTS[service];
       const port = management[service]?.port ?? standardPort;
       const term = `${filter} term ${service}`;
-      for (const source of sources.filter(ofFamily))
-        out.set(term, "from source-address", source);
-      out.set(term, "from", protocolWord, protocol);
-      out.set(term, "from destination-port", port);
-      out.set(term, "then accept");
+      const allowed = sources.filter(ofFamily);
+      if (allowed.length) {
+        for (const source of allowed)
+          out.set(term, "from source-address", source);
+        out.set(term, "from", protocolWord, protocol);
+        out.set(term, "from destination-port", port);
+        out.set(term, "then accept");
+      }
       const others = `${filter} term ${service}-others`;
       out.set(others, "from", protocolWord, protocol);
       out.set(others, "from destination-port", port);
@@ -4699,7 +4702,9 @@ var DEVICE_FACTS2 = [
   "quit",
   "config",
   "exit",
-  "portswitch"
+  "portswitch",
+  "speed auto",
+  "duplex auto"
 ];
 var OPPOSITES = [
   [/^mode manual$/, "mode lacp"],
@@ -4708,9 +4713,10 @@ var OPPOSITES = [
   [/^spanning-tree disable$/, "spanning-tree enable"],
   [/^switchport mode trunk$/, "switchport mode access"],
   [/^telnet-server disable$/, "telnet-server enable"],
-  [/^shutdown$/, "no shutdown"]
+  [/^shutdown$/, "no shutdown"],
+  [/^storm-control mode pps$/, "storm-control mode kbps"]
 ];
-var UNDO_BY_KEYWORD = /^(description|switchport access vlan|switchport trunk native vlan|switchport trunk allowed vlan|storm-control broadcast|storm-control mode|ip address|port-channel|ip ospf cost|ip ospf network)\b/;
+var UNDO_BY_KEYWORD = /^(description|switchport access vlan|switchport trunk native vlan|switchport trunk allowed vlan|storm-control broadcast|ip address|port-channel|ip ospf cost|ip ospf network)\b/;
 function undo(line) {
   for (const [pattern, opposite] of OPPOSITES)
     if (pattern.test(line))

package/package.json

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

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

@@ -497,11 +497,15 @@ function servicesFilter(out: Statements, device: Device, names: Names): void {
             const [protocol, standardPort] = SERVICE_PORTS[service];
             const port = management[service]?.port ?? standardPort;
             const term = `${filter} term ${service}`;
-
-            for (const source of sources.filter(ofFamily)) out.set(term, "from source-address", source);
-            out.set(term, "from", protocolWord, protocol);
-            out.set(term, "from destination-port", port);
-            out.set(term, "then accept");
+            const allowed = sources.filter(ofFamily);
+
+            // A term without a source would accept every source, so a family no source is in gets only the discard.
+            if (allowed.length) {
+                for (const source of allowed) out.set(term, "from source-address", source);
+                out.set(term, "from", protocolWord, protocol);
+                out.set(term, "from destination-port", port);
+                out.set(term, "then accept");
+            }
 
             const others = `${filter} term ${service}-others`;
             out.set(others, "from", protocolWord, protocol);

package/src/adapters/devices/raisecom-ros/TRAPS.md

@@ -9,6 +9,9 @@ Behaviour that looks like something else. Each one has been hit on a RAX721 runn
 - An access-list cannot change while any service uses it: `ACL 1000 is in use`. Every service that uses it is unbound first and bound again after. `no ssh2 access-list` needs the list number.
 - `portswitch`, `switchport trunk allowed vlan` and `switchport mode` ask for `y` and do nothing without it, except when they need no confirming: `switchport mode trunk` on a port leaving access mode answers `Set successfully` at once, and a `y` sent after it is refused, `Error input`.
 - A VLAN is removed with `no vlan <id>`, not `no create vlan`.
+- `no storm-control mode` is refused with `Error input`. The modes are `kbps`, the default, which prints nothing, and `pps`; leaving `pps` is setting `kbps`.
+- A port's speed or duplex set to something else and back to auto prints `speed auto` and `duplex auto` from then on, though auto is the default. `no duplex auto` is refused with `Error input`.
+- Tab after a word the CLI does not know answers `Error input`, as if the line were sent. Like `?`, it is not a safe way to explore.
 - The factory account `raisecom` cannot be removed and its service type cannot change. Only its password is ours.
 - Factory SNMP communities survive hardening, and `private` can write. The render removes both.
 - Several commands are not the usual spelling: `terminal page-break disable`, `telnet-server disable`, `ip rarp server disable`.

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

@@ -27,6 +27,9 @@ const DEVICE_FACTS = [
     "exit",
     // Implied by any layer 2 setting on a port; the plan sends it where needed.
     "portswitch",
+    // A port's speed or duplex set back to auto prints as the default it is, and `no duplex` is refused.
+    "speed auto",
+    "duplex auto",
 ];
 
 /** Lines whose opposite is not `no` and the line. */
@@ -38,11 +41,13 @@ const OPPOSITES: [RegExp, string][] = [
     [/^switchport mode trunk$/, "switchport mode access"],
     [/^telnet-server disable$/, "telnet-server enable"],
     [/^shutdown$/, "no shutdown"],
+    // The device refuses `no storm-control mode`; kbps is its default and prints nothing.
+    [/^storm-control mode pps$/, "storm-control mode kbps"],
 ];
 
 /** Lines whose removal takes only their keyword, not their value. */
 const UNDO_BY_KEYWORD =
-    /^(description|switchport access vlan|switchport trunk native vlan|switchport trunk allowed vlan|storm-control broadcast|storm-control mode|ip address|port-channel|ip ospf cost|ip ospf network)\b/;
+    /^(description|switchport access vlan|switchport trunk native vlan|switchport trunk allowed vlan|storm-control broadcast|ip address|port-channel|ip ospf cost|ip ospf network)\b/;
 
 function undo(line: string): string {
     for (const [pattern, opposite] of OPPOSITES) if (pattern.test(line)) return opposite;