From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 4FA2F1FF0C0 for ; Wed, 04 Nov 2026 15:19:45 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id D718C21320; Wed, 04 Nov 2026 15:19:41 +0100 (CET) From: Arthur Bied-Charreton To: pve-devel@lists.proxmox.com Subject: [PATCH pve-firewall 2/3] firewall: parser: factor out error logging Date: Wed, 4 Nov 2026 15:19:30 +0100 Message-ID: <20261104141931.399659-3-a.bied-charreton@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261104141931.399659-1-a.bied-charreton@proxmox.com> References: <20261104141931.399659-1-a.bied-charreton@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793801977746 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.681 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: X2RFI5WWDDVQ7UEI6EKAKG4EKESRFZAH X-Message-ID-Hash: X2RFI5WWDDVQ7UEI6EKAKG4EKESRFZAH X-MailFrom: a.bied-charreton@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: The next commit will add a new caller. Also print errors in deterministic order, no functional changes intended besides that. Signed-off-by: Arthur Bied-Charreton --- src/PVE/Firewall.pm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index dd5d92c..a1fd6a3 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -3343,6 +3343,19 @@ sub get_mark_values { return ($value, $mask); } +my $log_rule_errors = sub { + my ($prefix, $line, $rule) = @_; + + # The verbose flag really means we're running from the CLI and want + # output on the console - in the other case we really want such errors + # to go into the syslog instead. + my $log = $verbose ? sub { warn @_ } : sub { syslog(err => @_) }; + $log->("$prefix - errors in rule parameters: $line\n"); + for my $p (sort keys $rule->{errors}->%*) { + $log->(" $p: $rule->{errors}->{$p}\n"); + } +}; + sub parse_fw_rule { my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env) = @_; @@ -3417,16 +3430,7 @@ sub parse_fw_rule { die "unable to parse rule parameters: $line\n" if length($line); $rule = verify_rule($rule, $cluster_conf, $fw_conf, $rule_env, 1); - if ($rule->{errors}) { - # The verbose flag really means we're running from the CLI and want - # output on the console - in the other case we really want such errors - # to go into the syslog instead. - my $log = $verbose ? sub { warn @_ } : sub { syslog(err => @_) }; - $log->("$prefix - errors in rule parameters: $orig_line\n"); - foreach my $p (keys %{ $rule->{errors} }) { - $log->(" $p: $rule->{errors}->{$p}\n"); - } - } + $log_rule_errors->($prefix, $orig_line, $rule) if $rule->{errors}; return $rule; } -- 2.47.3