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 802971FF16F for ; Tue, 24 Jun 2025 13:33:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 98A61352DE; Tue, 24 Jun 2025 13:33:33 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 24 Jun 2025 13:33:26 +0200 Message-Id: <20250624113327.134893-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 manager 1/2] cli: pve8to9: check for group and filter sections in notifications.cfg 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" The notification stack removes these sections automatically whenever the configuration is updated, so this should only affect a small number of people - those who used the notification system while it was only available in pvetest, created a filter/group and never changed the configuration afterwards. Signed-off-by: Lukas Wagner --- PVE/CLI/pve8to9.pm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm index 89e2a781..5a80c40f 100644 --- a/PVE/CLI/pve8to9.pm +++ b/PVE/CLI/pve8to9.pm @@ -1416,6 +1416,42 @@ sub check_dkms_modules { } } +sub check_legacy_notification_sections { + log_info("Check for legacy 'filter' or 'group' sections in /etc/pve/notifications.cfg..."); + + my $raw = eval { PVE::Tools::file_get_contents("/etc/pve/notifications.cfg") }; + return if !defined($raw); + + my $failed = 0; + my @lines = split(/\n/, $raw); + + for my $line (@lines) { + # Any line in a section config is either a comment (starts with #), a + # section header (starts with the section type, without any leading + # space) or is a property indented by whitespace. This means we + # should be able to reliably detect the legacy sections by just + # checking the start of the line. + + if ($line =~ /^filter/) { + $failed = 1; + log_fail("found legacy 'filter' section: $line"); + } + + if ($line =~ /^group/) { + $failed = 1; + log_fail("found legacy 'group' section: $line"); + } + } + + if ($failed) { + log_fail("Any modification to the notification configuration via the API or Web UI will" + . " automatically remove these sections. Alternatively, you can remove the offending" + . " sections from /etc/pve/notifications.cfg by hand."); + } else { + log_pass("No legacy 'filter' or 'group' sections found!"); + } +} + sub check_misc { print_header("MISCELLANEOUS CHECKS"); my $ssh_config = eval { PVE::Tools::file_get_contents('/root/.ssh/config') }; @@ -1525,6 +1561,7 @@ sub check_misc { check_nvidia_vgpu_service(); check_bootloader(); check_dkms_modules(); + check_legacy_notification_sections(); } my sub colored_if { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel