Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- **srx-dynamic-ip-feed** (1.1.0): keep dynamic-address feeds on Security Director-managed SRXs by defining the feed and the policy's dynamic-address match in configuration groups behind a placeholder address. Field-reported; not lab-validated here.
- **srx-ips** (0.1.4), **srx-mnha-builder** (0.2.7), **srx-mnha-ipsec-builder** (0.1.1): commit confirmed is now in Juniper's own junos-mcp-server — [Juniper/junos-mcp-server#34](https://github.com/Juniper/junos-mcp-server/pull/34), merged 2026-11-02, on `main` but in no tagged release yet — so the "junos-mcp-server with commit confirmed" column points to Juniper instead of a third-party fork. All three skills now say that on Junos a `commit check` or `commit` inside a confirm window **confirms the pending commit**: while one is pending on a device, run only read-only commands there (no dry run, commit check or other push). This matters most for srx-mnha-ipsec-builder's self-restoring uplink test, which a stray check would have left permanently disabled. The merged server refuses such calls with `Error: a commit confirmed is pending on <router>…`, and `confirm_commit` reports `No pending commit confirmed` when the change has already rolled back; both messages are documented. Lab-verified on vSRX 24.4R2.21 (2026-10-05): a dry run inside a 3-minute window made the change permanent on the unguarded server; with the merged guard the dry run was refused and the rollback timer stayed intact.

## 1.12.1 — Documentation accuracy fixes

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ Actionable Junos playbooks — commands, design guidance, verification, troubles

- **[srx-policy](./skills/srx-policy/SKILL.md)** — *(v1.3.2)* Enforced global-policy output with explicit zone-pair opt-outs on 23.x+, now including Branch SRX300/SRX400 after hardware validation, AppID/AppFW, NGWF-first web filtering, SecIntel, ATP, hit-count troubleshooting.
- **[srx-nat](./skills/srx-nat/SKILL.md)** — *(v1.1.3)* Source/destination/static NAT, NAT64/DNS64, CGN/PBA, persistent NAT, hairpin, proxy-ARP, session verification.
- **[srx-ips](./skills/srx-ips/SKILL.md)** — *(v0.1.3, draft)* IPS detection triage and custom signature authoring through a Junos MCP server: build the active rule table, read logs safely, monitor-to-enforce escalation behind an approval gate, and custom signature design with read-only coverage checks, context/direction/binding choice, false-positive-aware patterns, `commit check` validation, and monitor-mode proof before enforcement.
- **[srx-ips](./skills/srx-ips/SKILL.md)** — *(v0.1.4, draft)* IPS detection triage and custom signature authoring through a Junos MCP server: build the active rule table, read logs safely, monitor-to-enforce escalation behind an approval gate, and custom signature design with read-only coverage checks, context/direction/binding choice, false-positive-aware patterns, `commit check` validation, and monitor-mode proof before enforcement.
- **[srx-mnha](./skills/srx-mnha/SKILL.md)** — *(v1.3.8)* Multi-Node High Availability: routed/default-gateway/hybrid modes, SRGs, ICL/ICD, eBGP/BFD failover, VIPs, DHCP caveats.
- **[srx-mnha-builder](./skills/srx-mnha-builder/SKILL.md)** — *(v0.2.6, draft)* Build a new two-node MNHA pair end-to-end through a Junos MCP server (Juniper junos-mcp-server or rust-junosmcp): routing, switching, or hybrid mode selection, dedicated or shared and optionally encrypted ICL, one pair sheet used to write per-node staged configs from a stage reference and checked against a pre-push checklist, with pre-computed undo files, device dry runs, per-stage approval gates, the user-performed HA-activation reboot, formation checks, eBGP signal-route export, and a role-consistency failover test. Works with either MCP server.
- **[srx-mnha-builder](./skills/srx-mnha-builder/SKILL.md)** — *(v0.2.7, draft)* Build a new two-node MNHA pair end-to-end through a Junos MCP server (Juniper junos-mcp-server or rust-junosmcp): routing, switching, or hybrid mode selection, dedicated or shared and optionally encrypted ICL, one pair sheet used to write per-node staged configs from a stage reference and checked against a pre-push checklist, with pre-computed undo files, device dry runs, per-stage approval gates, the user-performed HA-activation reboot, formation checks, eBGP signal-route export, and a role-consistency failover test. Works with either MCP server.
- **[srx-cluster-to-mnha](./skills/srx-cluster-to-mnha/SKILL.md)** — *(v1.0.1)* Convert an existing SRX or vSRX chassis-cluster configuration into two node-local MNHA configs through an SRX-architect interview: cluster inventory, per-segment mode choice, SRG and ICL design, a fidelity report, and a cutover runbook. Offline only.
- **[srx-mnha-ipsec-builder](./skills/srx-mnha-ipsec-builder/SKILL.md)** — *(v0.1.0, draft)* Build a route-based IPsec VPN from an MNHA hub, anchored on a floating loopback in SRG1+, to a spoke SRX through a Junos MCP server: goal choice (least planned-failover loss, fastest BGP/BFD recovery, or quiet logs) mapped to `process-packet-on-backup`, floating statics and anti-replay; a VPN sheet used to write hub and spoke configs from a block reference and checked against a pre-push checklist, with undo files, device dry runs, commit-confirmed pushes behind approval gates, bypass-route cutover, and bidirectional planned and unplanned failover tests reported as % change against your own baseline.
- **[srx-mnha-ipsec-builder](./skills/srx-mnha-ipsec-builder/SKILL.md)** — *(v0.1.1, draft)* Build a route-based IPsec VPN from an MNHA hub, anchored on a floating loopback in SRG1+, to a spoke SRX through a Junos MCP server: goal choice (least planned-failover loss, fastest BGP/BFD recovery, or quiet logs) mapped to `process-packet-on-backup`, floating statics and anti-replay; a VPN sheet used to write hub and spoke configs from a block reference and checked against a pre-push checklist, with undo files, device dry runs, commit-confirmed pushes behind approval gates, bypass-route cutover, and bidirectional planned and unplanned failover tests reported as % change against your own baseline.
- **[srx-advpn](./skills/srx-advpn/SKILL.md)** — *(v1.1.5)* Auto Discovery VPN dynamic spoke-to-spoke shortcuts, suggester/partner roles, multipoint st0, OSPF p2mp, the cert-auth requirement and the `No public key found` fix.
- **[srx-autovpn-full-tunnel](./skills/srx-autovpn-full-tunnel/SKILL.md)** — *(v1.1.5)* AutoVPN hub-and-spoke full-tunnel backhaul: dynamic `group-ike-id`, traffic selectors + ARI, shared st0.0, anti-recursion route.
- **[srx-ipsec-hub-spoke](./skills/srx-ipsec-hub-spoke/SKILL.md)** — *(v1.0.5)* Static point-to-point route-based IPsec hub-and-spoke, one explicit tunnel per spoke, hub source-NAT egress, spoke-to-spoke hairpin.
Expand Down
16 changes: 8 additions & 8 deletions skills/CHECKSUMS.sha256
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ e5ddddbd316bd32dcc50f9f050f94815949e91d5a4af0e44cac9344dba2081fb srx-initial-se
1f453a996e02641ad24b6d91cd8300588f49978d828df4fb10ef17efb1332b6e srx-initial-setup/references/stages/screens.md
f2c1e8c26e977ba870d3c7933fc1483669a7958e1ffc4b91768561e8a2ef8cea srx-initial-setup/references/verification.md
b76cf00a271b11516e61e5de5fc92992d78cfe8f7ec92d637d2bdad2935efe3b srx-initial-setup/references/write-safety.md
425105b5e05fefe1c56d55d31bcd7ccd30ced05f8edfc6037972727853627b53 srx-ips/SKILL.md
5a04a7c01d78b183c364cd5a068509e1792cd9a3b1d63313c6f6e9b957e6e887 srx-ips/SKILL.md
e954cf0e1e6e20abd7f672b79417b21a09f0e0efa3cee0e8fcb8c2af3e6223a5 srx-ips/agents/openai.yaml
f3087f716e63176f38f6337c7b2732c0dd4922e3ebff7aea33a36f58df4dd075 srx-ips/references/commit-and-verification.md
f9e6bc5190301c7db5453a3188b229ffce771e409dc14625b1ac32bf43bf83a9 srx-ips/references/commit-and-verification.md
c7ef19f9769b5950964f3882fb5077ead8d2465c9bff0475a940146b066b4667 srx-ips/references/lab-signature-notes.md
fdbbea30a18dd64ff00517872bbf125971018e885f777c0ceed38837cb9ee551 srx-ips/references/mcp-server-notes.md
a13904d5626e9ef1ab7ca04a54d109775081fa6c7b701812c47b2d4a5bbee9db srx-ips/references/mcp-server-notes.md
1ed8a35e814e01b556eb72ceca5d7e28e4337e2011ae3e1d56c6382b0ef57582 srx-ips/references/runtime-intake.md
d7dd52b18eff3f3843a6242643df552b7c11d8e8074d42b57ec533dc59a4132c srx-ipsec-hub-spoke/SKILL.md
2d531be519f6977bd9d6cdcbb897c691ff8154bf2d089563ab0f7264c4d099fe srx-ipsec-hub-spoke/agents/openai.yaml
Expand All @@ -212,23 +212,23 @@ baf3f506fc9533ba23d25ab9ccdb0b73f0b6953364e2d2ddd1edf1be613321b4 srx-mnha/refer
d256c4df17f0b0f38507cf78446769028ed37df6e2f4eb64a06def559864bab6 srx-mnha/references/source-multi-node-high-availability-basics.md
ff7e6adbd24bff487119beba4f752991f4d78b269838ceb7441f5c5b012deb90 srx-mnha/references/source-srx-from-chassis-cluster-to-mnha.md
f12887b619681e804407faef8c1d7e647f011e72a9128977033ea4ce438a36f5 srx-mnha/references/srg-details.md
377ec1cd763d01a49aea90284d9ecd6cb136d182bb842c9b03725d7e290169a8 srx-mnha-builder/SKILL.md
eda31947fa2a901d78687cad8b96785e50a1604ef63f3e636f33f644b9b4461b srx-mnha-builder/SKILL.md
8deb493052588ee01664ff6b82ad47f6f1f8a70736ffb5a9f3daedd5f261ec97 srx-mnha-builder/agents/openai.yaml
33851cab4e3feaf4d683a2996621ae86342790116f910009c8d3a5759c0977aa srx-mnha-builder/references/config-stages.md
da174e37483c5f27ac8ccb647337983982c6c7a070e849b752a8af66c5d23403 srx-mnha-builder/references/mcp-server-notes.md
07b4d019e1e26f9ff9a14c79267195df44103230b04b89284b02846a41f1c686 srx-mnha-builder/references/mcp-server-notes.md
92e1017293de19594d24f9dd45673389c6450404daa0dcdd5a9b9e134b1b1859 srx-mnha-builder/references/pair-sheet.example.yaml
16cb49b204dbf34fa06846e8088962a15700ef5e76ed73c2dec68387c9d95fa0 srx-mnha-builder/references/runtime-intake.md
0ef4ed6cc3acb23d50120a47139f95288e8bd9eb6cedac31eba555f8c123f3f8 srx-mnha-builder/references/verification.md
d62c07fe8a1eb184ffb2fa62523b3f44be5f160be92facd4c1bac631c8969f4c srx-mnha-ipsec-builder/SKILL.md
e2959687fc381f5118da81ba5485191e0fbe1c12d6cdab6a6be2b0fd1d5c7a83 srx-mnha-ipsec-builder/SKILL.md
823019ab7f77060dc5df0c1d19ddd88d6597ba1a0bc836f20973e8c576a4f849 srx-mnha-ipsec-builder/agents/openai.yaml
3d8194df6bf360774cee510907a06fd20dc8de43603a9816fe3c3a5c91310f6a srx-mnha-ipsec-builder/references/config-blocks.md
d2aabc50216945fa8d27ee40405fe26113b419246ba1e53a9289217206f30d0a srx-mnha-ipsec-builder/references/example.yaml
fa09c5bbce0f261e176f84d1b84c6948b0c647523a6f96d8e4bd8c7f3ba5c50b srx-mnha-ipsec-builder/references/intake-questions.md
a31aced5fdbdda6c143f08eeaf1958ac15619d31ed609b86c79601118ac55c83 srx-mnha-ipsec-builder/references/mcp-server-notes.md
667c250afbbd09169a40276b6b54cf3a70580b1a8c38311622c53bf8b8ab7541 srx-mnha-ipsec-builder/references/mcp-server-notes.md
d4d0ca95cb7fb913afa8a7d551dfc153e7712e576c9afbb5679b01236b973d5b srx-mnha-ipsec-builder/references/mnha-ipsec.md
ef7b040ff81d2bf0cffe4ae1e1e929fcd249f38fb63c78b86db73545758ff097 srx-mnha-ipsec-builder/references/runtime-intake.md
29649f7d579db33970cb626b3904b2417700591b51c76b9f83a2568e67794b99 srx-mnha-ipsec-builder/references/testing.md
6ec4f66d86c9ae1a3054afa633b6b090e74af8bcbe8101adbac7f7ac26232709 srx-mnha-ipsec-builder/references/traffic-generation.md
02632b898beebdda7d2036248736c5ec14b16a060773a7fb9c9b5c798e062f7b srx-mnha-ipsec-builder/references/traffic-generation.md
3c152814a53e82e8beb32270be4c940a31a1915fc48e1b42d08e2e34e67d4e29 srx-mnha-ipsec-builder/references/vpn-sheet.example.yaml
b5c1f2b26aa2ea7a9d700ea6c53470e83a1032798d2e54411018538237c1c357 srx-mpls-in-flow/SKILL.md
289ed901844233dbc9682f903a09438712596ff3e0bc505144fd20d6cd9096ce srx-mpls-in-flow/agents/openai.yaml
Expand Down
2 changes: 1 addition & 1 deletion skills/srx-ips/SKILL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: srx-ips
description: Manage SRX IPS (Junos IDP) lifecycle through a Junos MCP server - triage detections, propose monitor-to-enforce changes, design and validate custom signatures for findings the predefined database does not cover. Reads IDP policy and logs, reports what fired and each rule's action, stages changes behind approval gates, checks coverage read-only, chooses context/direction/pattern, validates syntax without activating. Use when reviewing IDP logs, investigating suspicious traffic, deciding which no-action rules to enforce, when a scanner finding needs IDP detection, or when extending IDP coverage. Not for attack database updates or IDP license maintenance.
version: 0.1.3
version: 0.1.4
author:
- fastrevmd-lab
- Claude
Expand Down
9 changes: 8 additions & 1 deletion skills/srx-ips/references/commit-and-verification.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ Every commit here follows the repository write policy:
fires. If the tool cannot do a confirmed commit, say so, and get
approval that explicitly accepts a manual rollback plan (`rollback 1` then
`commit`) before pushing.
4. **Verified on vSRX 26.2R1.7, 2026-09-23:** `commit confirmed` works correctly
4. **Inside the confirm window, run only read-only commands on that device.** On
Junos a `commit check` or `commit` confirms the pending commit, so a dry run
or another push there silently cancels the rollback (see
`references/mcp-server-notes.md`). If `confirm_commit` reports nothing
pending, the change has already rolled back: re-check before saying it is
live.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the same point as srx-mnha-builder/SKILL.md. "Already rolled back" and "re-check before saying it is live" contradict each other:

Suggested change
`references/mcp-server-notes.md`). If `confirm_commit` reports nothing
pending, the change has already rolled back: re-check before saying it is
live.
`references/mcp-server-notes.md`). If `confirm_commit` reports nothing
pending, the change either rolled back or was already confirmed: compare the
configuration with the baseline before reporting which.

5. **Verified on vSRX 26.2R1.7, 2026-09-23:** `commit confirmed` works correctly
with IDP configured. The device auto-rolled back a 1-minute confirmed commit
cleanly and logged `UI_COMMIT_NOT_CONFIRMED`. **Operational timing:** the
rollback fires roughly 30–45 seconds AFTER the nominal window expires, not on
Expand Down Expand Up @@ -60,6 +66,7 @@ each node.
- [ ] One combined proposal with exact lines, blast radius, and rollback
- [ ] Explicit approval received for the push
- [ ] Commit used a rollback window, or the lack of one was approved
- [ ] No dry run, commit check, or other push on the device while its commit was pending
- [ ] `policy-commit-status` shows the new policy loaded, per node
- [ ] Before-and-after log evidence shows the new action

Expand Down
42 changes: 36 additions & 6 deletions skills/srx-ips/references/mcp-server-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,20 @@ Identify the server from its tool list, not its name: `confirm_commit` (with
commit confirmed; `commit_check_config` and `create_junos_change_set` mark
rust-junosmcp; neither marks Juniper v1.1.1.

### A commit check confirms a pending commit (every server)

On Junos, a `commit check` or `commit` issued while a `commit confirmed` is
pending **confirms it** and cancels the automatic rollback, without adding a
commit entry. A dry run is therefore not side-effect-free inside a confirm
window. **Verified on vSRX 24.4R2.21, 2026-10-05:** a dry run inside a 3-minute
window made the change permanent while reporting that nothing was committed.

Between a confirmed commit and its confirm, run only read-only commands on that
device: no dry run, commit check, or other push. A pending commit shows
`rollback pending` on entry 0 of `show system commit`. junos-mcp-server with
commit confirmed enforces this itself (see below); the other servers are not
verified to, so the skill must.

## Juniper junos-mcp-server

**Version checked:** tag **v1.1.1**
Expand Down Expand Up @@ -112,10 +126,13 @@ usually the whole story — adjust the value and retry.

## junos-mcp-server with commit confirmed

**Version checked:** `main` at `094c320`
**Repository:** <https://github.com/jgrizzuti/junos-mcp-server> (fork of
Juniper's server; proposed upstream as
[Juniper/junos-mcp-server#34](https://github.com/Juniper/junos-mcp-server/pull/34))
**Version checked:** Juniper `main` at `2fb721a`, which includes
[Juniper/junos-mcp-server#34](https://github.com/Juniper/junos-mcp-server/pull/34)
(merged 2026-11-02). No tagged release includes it yet: v1.1.1 is the latest
tag and has none of this, so identify the server by its tool list.
**Repository:** <https://github.com/Juniper/junos-mcp-server> (the
[`jgrizzuti/junos-mcp-server`](https://github.com/jgrizzuti/junos-mcp-server)
fork it was developed in now matches upstream `main`)

Ten tools: Juniper's nine plus `confirm_commit`. Everything in the Juniper
section above still applies, except the commit behavior:
Expand All @@ -130,12 +147,25 @@ section above still applies, except the commit behavior:
confirm by re-sending `load_and_commit_config`: with no diff it returns "No
configuration changes detected" and commits nothing, so the rollback still
fires.
- **Refuses while a commit confirmed is pending.** `load_and_commit_config` and
`render_and_apply_j2_template`, dry run included, return `Error: a commit
confirmed is pending on <router>…` instead of loading anything. Confirm the
pending change with `confirm_commit` once it is verified, or let it roll back;
do not work around the refusal.
- `confirm_commit` returns `Error: No pending commit confirmed on <router>;
nothing to confirm` when nothing is pending, usually because the window
expired and the change already rolled back. Re-check the configuration; never
report the change as live.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Never report the change as live" is wrong when the change was confirmed and the reply was lost. The PR's own evidence shows this: a second confirm_commit reported nothing pending.

Suggested change
- `confirm_commit` returns `Error: No pending commit confirmed on <router>;
nothing to confirm` when nothing is pending, usually because the window
expired and the change already rolled back. Re-check the configuration; never
report the change as live.
- `confirm_commit` returns `Error: No pending commit confirmed on <router>;
nothing to confirm` when nothing is pending: the window expired and the
change rolled back, or it was already confirmed (a lost reply, another
session, or a `commit check`). Compare the configuration with the baseline
before reporting either.

- A confirmed commit's result ends with `⏳ Commit is pending confirmation: …`.

**Verified on vSRX 24.4R2.21, 2026-10-02:** a `dry_run` left no commit; a
2-minute confirmed commit that was not confirmed rolled back automatically about
45 seconds after the window (`by root via other`), matching the timing recorded
in `SKILL.md`; a 2-minute confirmed commit followed by `confirm_commit` was still
present after the window.
in `commit-and-verification.md`; a 2-minute confirmed commit followed by
`confirm_commit` was still present after the window. **2026-10-05:** with a
commit confirmed pending, a `dry_run` was refused and `rollback pending` stayed
intact; `confirm_commit` then confirmed it, and a second `confirm_commit`
reported nothing pending.

## rust-junosmcp

Expand Down
7 changes: 6 additions & 1 deletion skills/srx-mnha-builder/SKILL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: srx-mnha-builder
description: Build a new two-node SRX/vSRX Multi-Node High Availability pair from standalone nodes over a Junos MCP server, covering routing, switching or hybrid mode, dedicated or shared ICL, pair sheet, staged configs with pre-push checks and approval gates, HA-activation reboot, formation checks and failover test. Use when standing up an MNHA pair or turning two SRXs into HA. For design or troubleshooting a running pair, use srx-mnha.
version: 0.2.6
version: 0.2.7
author:
- fastrevmd-lab
- Claude
Expand Down Expand Up @@ -241,6 +241,11 @@ an undo would remove.
roll back, wait past the window with margin and check the diff against the baseline;
otherwise run `undo-stage1`. Diagnose before going on.

While a stage is pending on a node, run only read-only checks there: no dry run or other
push, because a commit check confirms the pending commit (see
`references/mcp-server-notes.md`). If `confirm_commit` reports nothing pending, the stage
has already rolled back.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing pending doesn't prove the stage rolled back. It may already have been confirmed, for example by a lost confirm reply or by a commit check. The baseline diff tells which:

Suggested change
`references/mcp-server-notes.md`). If `confirm_commit` reports nothing pending, the stage
has already rolled back.
`references/mcp-server-notes.md`). If `confirm_commit` reports nothing pending, the stage
either rolled back or was already confirmed; diff against the baseline to tell which.


## Step 8 - Stage 2: HA stanza

1. Push `stage2.set` on Node0, then Node1, using the same push tool/confirm flow as Step 7.
Expand Down
Loading
Loading