From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 488AF1FF16F
for <inbox@lore.proxmox.com>; Tue, 27 May 2025 11:41:07 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 51A591034E;
Tue, 27 May 2025 11:41:18 +0200 (CEST)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 27 May 2025 11:41:11 +0200
Message-Id: <20250527094111.194446-2-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250527094111.194446-1-l.wagner@proxmox.com>
References: <20250527094111.194446-1-l.wagner@proxmox.com>
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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [pve8to9.pm]
Subject: [pve-devel] [PATCH manager 2/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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
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 <l.wagner@proxmox.com>
---
PVE/CLI/pve8to9.pm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
index 42b7073b..9d00e064 100644
--- a/PVE/CLI/pve8to9.pm
+++ b/PVE/CLI/pve8to9.pm
@@ -1372,6 +1372,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 by hand from /etc/pve/notifications.cfg.");
+ } 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') };
@@ -1474,6 +1510,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