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 DD0FD1FF13C for ; Thu, 30 Apr 2026 14:33:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B24EE54C3; Thu, 30 Apr 2026 14:33:01 +0200 (CEST) Message-ID: Date: Thu, 30 Apr 2026 14:32:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 proxmox-ve-rs] fix #6399: firewall: fix parsing rule comments that contain hash signs To: pve-devel@lists.proxmox.com References: <20251215123925.168475-1-r.obkircher@proxmox.com> Content-Language: en-US, de-AT From: Robert Obkircher In-Reply-To: <20251215123925.168475-1-r.obkircher@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777552247510 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 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 Message-ID-Hash: DI763KAZODQY7LVRUONPMLY2VFKZGEA4 X-Message-ID-Hash: DI763KAZODQY7LVRUONPMLY2VFKZGEA4 X-MailFrom: r.obkircher@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ping Someone ran into this again and opened a duplicate bug. On 15.12.25 13:39, Robert Obkircher wrote: > Match the behavior of the corresponding perl code in parse_fw_rule and > treat everything after the first '#' on a line as the comment. This > works because validation prevents fields like the interface name from > contianing that symbol. > > This fixes a bug where the firewall wouldn't start if a comment on a > rule contained a number sign. > > Signed-off-by: Robert Obkircher > Tested-by: Stefan Hanreich > Reviewed-by: Stefan Hanreich > --- > Change since v1: removed unrelated newline introduced by cargo fmt. > > proxmox-ve-config/src/firewall/cluster.rs | 63 ++++++++++++++++++++ > proxmox-ve-config/src/firewall/types/rule.rs | 8 ++- > 2 files changed, 68 insertions(+), 3 deletions(-) > > diff --git a/proxmox-ve-config/src/firewall/cluster.rs b/proxmox-ve-config/src/firewall/cluster.rs > index 69d3bcd..697f8c1 100644 > --- a/proxmox-ve-config/src/firewall/cluster.rs > +++ b/proxmox-ve-config/src/firewall/cluster.rs > @@ -394,4 +394,67 @@ IN BGP(REJECT) -log crit -source 1.2.3.4 > assert!(empty_config.config.ipsets.is_empty()); > assert!(empty_config.config.groups.is_empty()); > } > + > + #[test] > + fn test_parse_config_comments() { > + const CONFIG: &str = r#" > +# ignore lines that start with a # symbol > +[OPTIONS] > +[ALIASES] > + > +alias1 192.168.0.1 # comment # on alias1 > + > +[IPSET ipset1] # comment # on ipset1 > + > +dc/alias1 # comment # on ipset1 #1 > + > +[RULES] > + > +GROUP testgroup # comment # on rule #1 > +IN ACCEPT -p udp -dport 1234 -log nolog # comment # on rule #2 > + > +[group testgroup] # comment # on testgroup > + > +IN ACCEPT -source dc/alias1 -p tcp -sport 1111 -log nolog # comment # on testgroup #1 > + > +"#; > + > + let mut config = CONFIG.as_bytes(); > + let config = Config::parse(&mut config).unwrap(); > + > + assert_eq!(config.config.aliases.len(), 1); > + assert_eq!( > + config.config.aliases["alias1"].comment(), > + Some("comment # on alias1") > + ); > + > + assert_eq!(config.config.ipsets.len(), 1); > + > + let ipset1 = &config.config.ipsets["ipset1"]; > + assert_eq!(ipset1.comment.as_deref(), Some("comment # on ipset1")); > + > + assert_eq!(ipset1.len(), 1); > + assert_eq!(ipset1[0].comment.as_deref(), Some("comment # on ipset1 #1")); > + > + assert_eq!(config.config.rules.len(), 2); > + assert_eq!( > + config.config.rules[0].comment.as_deref(), > + Some("comment # on rule #1") > + ); > + assert_eq!( > + config.config.rules[1].comment.as_deref(), > + Some("comment # on rule #2") > + ); > + > + assert_eq!(config.config.groups.len(), 1); > + > + let entry = &config.config.groups["testgroup"]; > + assert_eq!(entry.comment(), Some("comment # on testgroup")); > + > + assert_eq!(entry.rules().len(), 1); > + assert_eq!( > + entry.rules()[0].comment.as_deref(), > + Some("comment # on testgroup #1") > + ); > + } > } > diff --git a/proxmox-ve-config/src/firewall/types/rule.rs b/proxmox-ve-config/src/firewall/types/rule.rs > index 811256c..2648fa8 100644 > --- a/proxmox-ve-config/src/firewall/types/rule.rs > +++ b/proxmox-ve-config/src/firewall/types/rule.rs > @@ -115,7 +115,7 @@ impl FromStr for Rule { > bail!("rule must not contain any newlines!"); > } > > - let (line, comment) = match input.rsplit_once('#') { > + let (line, comment) = match input.split_once('#') { > Some((line, comment)) if !comment.is_empty() => (line.trim(), Some(comment.trim())), > _ => (input.trim(), None), > }; > @@ -261,13 +261,15 @@ mod tests { > > #[test] > fn test_parse_rule() { > - let mut rule: Rule = "|GROUP tgr -i eth0 # acomm".parse().expect("valid rule"); > + let mut rule: Rule = "|GROUP tgr -i eth0 # acomm #comment" > + .parse() > + .expect("valid rule"); > > assert_eq!( > rule, > Rule { > disabled: true, > - comment: Some("acomm".to_string()), > + comment: Some("acomm #comment".to_string()), > kind: Kind::Group(RuleGroup { > group: "tgr".to_string(), > iface: Some("eth0".to_string()),