From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 628A11FF178 for ; Mon, 15 Dec 2025 16:09:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75011101A1; Mon, 15 Dec 2025 16:10:10 +0100 (CET) From: Robert Obkircher To: pve-devel@lists.proxmox.com Date: Mon, 15 Dec 2025 16:08:44 +0100 Message-ID: <20251215150906.257151-1-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1765811368467 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH firewall/manager/proxmox{-ve-rs, -firewall} 0/5] fix #7068: show rule comments in iptables and nftables X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Pass firewall rule comments from the UI to the underlying firewall configuration. Combines and changes two previously separate patches: New: - added a preserve_comments firewall option to api and UI [1] fix #7068: show rule comments in iptables output - shortened PVECOMMENT: prefix to PVE: - fixed escape logic regex - added tests for print_ipt_command function [2] fix #7068: show rule comments in nftables output - test truncation logic Note that for testing you likely want the fix for '#' symbols inside comments [3] and the fix for "make check" in pve-firewall [4]. At some point I ran into a strange issue, where the options grid displayed "Yes" for boolean options which were clearly 0 in the network response, while the edit dialog displayed the correct value. I'm not sure what caused this but system updates and rebuilding pve-firewall +pve-manager fixed it. [1] https://lore.proxmox.com/pve-devel/20251201123424.94742-1-r.obkircher@proxmox.com/#r [2] https://lore.proxmox.com/pve-devel/75f887c2-fce6-444e-829c-977784dca365@proxmox.com/#r [3] https://lore.proxmox.com/pve-devel/20251215123925.168475-1-r.obkircher@proxmox.com/T/#u [4] https://lore.proxmox.com/pve-devel/20251211141201.143435-1-r.obkircher@proxmox.com/ *** MURPP HERE *** pve-firewall: Robert Obkircher (2): api: firewall: add option to preserve comments fix #7068: show rule comments in iptables output src/PVE/Firewall.pm | 36 +++++++++++++++++- test/Makefile | 1 + test/test_comments.pl | 86 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 121 insertions(+), 2 deletions(-) create mode 100755 test/test_comments.pl pve-manager: Robert Obkircher (1): ui: firewall: add preserve comments option www/manager6/grid/FirewallOptions.js | 1 + 1 file changed, 1 insertion(+) proxmox-ve-rs: Robert Obkircher (1): firewall: parse preserve_comments host firewall option proxmox-ve-config/src/firewall/host.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) proxmox-firewall: Robert Obkircher (2): fix #7068: show rule comments in nftables output firewall: add rule comments to snapshot tests proxmox-firewall/src/rule.rs | 56 ++++++++++++++++++- proxmox-firewall/tests/input/host.fw | 4 +- .../integration_tests__firewall.snap | 44 ++++++++++++++- 3 files changed, 100 insertions(+), 4 deletions(-) Summary over all repositories: 8 files changed, 236 insertions(+), 6 deletions(-) -- Generated by git-murpp 0.8.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel