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 D64591FF16F for ; Tue, 16 Sep 2025 11:32:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 02716EDC5; Tue, 16 Sep 2025 11:31:55 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Tue, 16 Sep 2025 11:31:11 +0200 Message-ID: <20250916093116.114942-3-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250916093116.114942-1-g.goller@proxmox.com> References: <20250916093116.114942-1-g.goller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758015073045 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.005 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 ve-rs 2/2] firewall: correctly return errors when parsing icmpv6 types and codes. 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" Correctly capture and output the error when parsing a icmpv6 type or code. This makes it easier to debug icmpv6 parsing errors. Signed-off-by: Gabriel Goller --- .../src/firewall/types/rule_match.rs | 56 ++++++++++++------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/proxmox-ve-config/src/firewall/types/rule_match.rs b/proxmox-ve-config/src/firewall/types/rule_match.rs index 8202cda57895..28d3e16b27ba 100644 --- a/proxmox-ve-config/src/firewall/types/rule_match.rs +++ b/proxmox-ve-config/src/firewall/types/rule_match.rs @@ -493,17 +493,25 @@ impl FromStr for Icmp { fn from_str(s: &str) -> Result { let mut this = Self::default(); - if let Ok(ty) = s.parse() { - this.ty = Some(ty); - return Ok(this); - } - - if let Ok(code) = s.parse() { - this.code = Some(code); - return Ok(this); + match s.parse::() { + Ok(ty) => { + this.ty = Some(ty); + Ok(this) + } + Err(type_error) => match s.parse::() { + Ok(code) => { + this.code = Some(code); + Ok(this) + } + Err(code_error) => { + bail!( + "supplied string is neither a valid icmp type nor code: {:?} - {:?}", + type_error, + code_error, + ); + } + }, } - - bail!("supplied string is neither a valid icmp type nor code"); } } @@ -652,17 +660,25 @@ impl FromStr for Icmpv6 { fn from_str(s: &str) -> Result { let mut this = Self::default(); - if let Ok(ty) = s.parse() { - this.ty = Some(ty); - return Ok(this); - } - - if let Ok(code) = s.parse() { - this.code = Some(code); - return Ok(this); + match s.parse::() { + Ok(ty) => { + this.ty = Some(ty); + Ok(this) + } + Err(type_error) => match s.parse::() { + Ok(code) => { + this.code = Some(code); + Ok(this) + } + Err(code_error) => { + bail!( + "supplied string is neither a valid icmpv6 type nor code: {:?} - {:?}", + type_error, + code_error, + ); + } + }, } - - bail!("supplied string is neither a valid icmpv6 type nor code"); } } -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel