From 1164b0fc5b6910464f80ac111ad41ed9121eaaa6 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 9 Oct 2026 05:58:34 +0800 Subject: [PATCH] Accept canonical bridge emergency rules --- engine/tests/test_fabric.py | 123 ++++++++++++++++++++++++++++++++--- engine/virsh_panel/fabric.py | 12 +++- 2 files changed, 124 insertions(+), 11 deletions(-) diff --git a/engine/tests/test_fabric.py b/engine/tests/test_fabric.py index aa745bae..296fb75f 100644 --- a/engine/tests/test_fabric.py +++ b/engine/tests/test_fabric.py @@ -2947,25 +2947,126 @@ def _emergency_nft_table(token: str) -> str: ''' -def _emergency_bridge_nft_table(token: str) -> str: +def _emergency_bridge_nft_table( + token: str, *, canonical_meta: bool = True, + priority: str = "300", +) -> str: + meta = "meta " if canonical_meta else "" return f'''table bridge virt_cloud_fabric_emergency {{ chain input {{ - type filter hook input priority 300; policy accept; - ibrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" + type filter hook input priority {priority}; policy accept; + {meta}ibrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" }} chain output {{ - type filter hook output priority 300; policy accept; - obrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" + type filter hook output priority {priority}; policy accept; + {meta}obrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" }} chain forward {{ - type filter hook forward priority 300; policy accept; - ibrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" - obrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" + type filter hook forward priority {priority}; policy accept; + {meta}ibrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" + {meta}obrname "vcv-*" counter drop comment "virt-cloud-fabric-emergency-v2:{token}" }} }} ''' +def _run_emergency_bridge_shape( + table: str, token: str, +) -> subprocess.CompletedProcess[str]: + script = "\n".join(( + "set -eu", + _FIREWALL_MODE_GUARD_SH, + 'vc_fabric_emergency_bridge_shape "$1" "$2"', + )) + return subprocess.run( + ["/bin/sh", "-c", script, "bridge-shape", table, token], + env={"PATH": "/usr/bin:/bin"}, + check=False, capture_output=True, text=True, + ) + + +@pytest.mark.parametrize("platform", [ + pytest.param("debian-13-nftables-1.1.3", id="debian-13-nftables-1.1.3"), + pytest.param("almalinux-10-nftables-1.1.5", + id="almalinux-10-nftables-1.1.5"), +]) +def test_emergency_bridge_shape_accepts_canonical_host_output(platform): + token = "K" * 24 + result = _run_emergency_bridge_shape( + _emergency_bridge_nft_table(token), token, + ) + + assert result.returncode == 0, f"{platform}: {result.stderr}" + + +@pytest.mark.parametrize(("canonical_meta", "priority"), [ + pytest.param(False, "300", id="legacy-unprefixed-meta-expression"), + pytest.param(True, "filter + 300", id="canonical-symbolic-priority"), +]) +def test_emergency_bridge_shape_keeps_exact_supported_serializations( + canonical_meta, priority, +): + token = "L" * 24 + result = _run_emergency_bridge_shape( + _emergency_bridge_nft_table( + token, canonical_meta=canonical_meta, priority=priority, + ), + token, + ) + + assert result.returncode == 0, result.stderr + + +@pytest.mark.parametrize("case", [ + "wrong-ingress-meta-key", + "wrong-egress-meta-key", + "wrong-ingress-interface", + "wrong-egress-interface", + "wrong-verdict", + "wrong-token", + "double-meta", + "missing-rule", + "extra-rule", + "extra-statement", + "wrong-chain", + "wrong-priority", + "wrong-policy", +]) +def test_emergency_bridge_shape_rejects_noncanonical_or_drifted_rules(case): + token = "M" * 24 + table = _emergency_bridge_nft_table(token) + first_rule = ( + f' meta ibrname "vcv-*" counter drop comment ' + f'"virt-cloud-fabric-emergency-v2:{token}"\n' + ) + replacements = { + "wrong-ingress-meta-key": ("meta ibrname", "meta iifname"), + "wrong-egress-meta-key": ("meta obrname", "meta oifname"), + "wrong-ingress-interface": ( + 'meta ibrname "vcv-*"', 'meta ibrname "vcx-*"', + ), + "wrong-egress-interface": ( + 'meta obrname "vcv-*"', 'meta obrname "vcx-*"', + ), + "wrong-verdict": ("counter drop", "counter accept"), + "wrong-token": (token, "N" * 24), + "double-meta": ("meta ibrname", "meta meta ibrname"), + "missing-rule": (first_rule, ""), + "extra-rule": (first_rule, first_rule + first_rule), + "extra-statement": (first_rule, first_rule + " counter drop\n"), + "wrong-chain": ("chain input {", "chain ingress {"), + "wrong-priority": ("priority 300", "priority 301"), + "wrong-policy": ("policy accept", "policy drop"), + } + old, new = replacements[case] + drifted = table.replace(old, new, 1) + assert drifted != table + + result = _run_emergency_bridge_shape(drifted, token) + + assert result.returncode != 0 + + def _write_emergency_nft_mock( tmp_path: Path, table: str, *, table_present: bool = True, families: tuple[str, ...] = ("inet", "bridge"), @@ -3024,7 +3125,11 @@ def _write_emergency_nft_mock( "'table inet virt_cloud_fabric_emergency' " "'table bridge virt_cloud_fabric_emergency' > \"$VC_NFT_TABLES\"; " "extract_table inet \"$2\" \"$VC_NFT_LIVE\"; " - "extract_table bridge \"$2\" \"$VC_NFT_BRIDGE_LIVE\"; fi ;;\n" + "extract_table bridge \"$2\" \"$VC_NFT_BRIDGE_LIVE.raw\"; " + "sed -e 's/ ibrname / meta ibrname /' " + "-e 's/ obrname / meta obrname /' " + "\"$VC_NFT_BRIDGE_LIVE.raw\" > \"$VC_NFT_BRIDGE_LIVE\"; " + "rm -f \"$VC_NFT_BRIDGE_LIVE.raw\"; fi ;;\n" " *) exit 2 ;;\n" "esac\n", encoding="utf-8", diff --git a/engine/virsh_panel/fabric.py b/engine/virsh_panel/fabric.py index 15b9561f..3912592d 100644 --- a/engine/virsh_panel/fabric.py +++ b/engine/virsh_panel/fabric.py @@ -1800,8 +1800,16 @@ vc_fabric_emergency_bridge_shape() { if (current != "" && (line == plain || line == symbolic)) {meta[current]++; next} ingress="ibrname \"vcv-*\" counter drop comment \"virt-cloud-fabric-emergency-v2:" token "\"" egress="obrname \"vcv-*\" counter drop comment \"virt-cloud-fabric-emergency-v2:" token "\"" - if ((current == "input" || current == "forward") && line == ingress) {ingress_rules[current]++; next} - if ((current == "output" || current == "forward") && line == egress) {egress_rules[current]++; next} + canonical_ingress="meta " ingress + canonical_egress="meta " egress + if ((current == "input" || current == "forward") && + (line == ingress || line == canonical_ingress)) { + ingress_rules[current]++; next + } + if ((current == "output" || current == "forward") && + (line == egress || line == canonical_egress)) { + egress_rules[current]++; next + } bad=1 } END {