From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 528179757 for ; Thu, 3 Aug 2023 14:18:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0C2D927AF for ; Thu, 3 Aug 2023 14:17:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 3 Aug 2023 14:17:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E6CFC42660 for ; Thu, 3 Aug 2023 14:17:33 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 3 Aug 2023 14:17:03 +0200 Message-Id: <20230803121719.519207-15-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230803121719.519207-1-l.wagner@proxmox.com> References: <20230803121719.519207-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v6 pve-manager 14/30] api: notification: disallow removing targets if they are used 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: , X-List-Received-Date: Thu, 03 Aug 2023 12:18:32 -0000 Check notification targets configured in datacenter.cfg and jobs.cfg, failing if the group/endpoint to be removed is still in use there. Signed-off-by: Lukas Wagner --- PVE/API2/Cluster/Notifications.pm | 44 ++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Cluster/Notifications.pm b/PVE/API2/Cluster/Notifications.pm index 065d6690..9c9e8243 100644 --- a/PVE/API2/Cluster/Notifications.pm +++ b/PVE/API2/Cluster/Notifications.pm @@ -6,6 +6,7 @@ use strict; use Storable qw(dclone); use JSON; +use PVE::Exception qw(raise_param_exc); use PVE::Tools qw(extract_param); use PVE::JSONSchema qw(get_standard_option); use PVE::RESTHandler; @@ -73,6 +74,31 @@ sub filter_entities_by_privs { return $filtered; } +sub target_used_by { + my ($target) = @_; + + my $used_by = []; + + # Check keys in datacenter.cfg + my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg'); + for my $key (qw(target-package-updates target-replication target-fencing)) { + if ($dc_conf->{notify} && $dc_conf->{notify}->{$key} eq $target) { + push @$used_by, $key; + } + } + + # Check backup jobs + my $jobs_conf = PVE::Cluster::cfs_read_file('jobs.cfg'); + for my $key (keys %{$jobs_conf->{ids}}) { + my $job = $jobs_conf->{ids}->{$key}; + if ($job->{'notification-target'} eq $target) { + push @$used_by, $key; + } + } + + return join(', ', @$used_by); +} + __PACKAGE__->register_method ({ name => 'index', path => '', @@ -482,6 +508,11 @@ __PACKAGE__->register_method ({ my ($param) = @_; my $name = extract_param($param, 'name'); + my $used_by = target_used_by($name); + if ($used_by) { + raise_param_exc({'name' => "Cannot remove $name, used by: $used_by"}); + } + eval { PVE::Notify::lock_config(sub { my $config = PVE::Notify::read_config(); @@ -758,11 +789,17 @@ __PACKAGE__->register_method ({ returns => { type => 'null' }, code => sub { my ($param) = @_; + my $name = extract_param($param, 'name'); + + my $used_by = target_used_by($name); + if ($used_by) { + raise_param_exc({'name' => "Cannot remove $name, used by: $used_by"}); + } eval { PVE::Notify::lock_config(sub { my $config = PVE::Notify::read_config(); - $config->delete_sendmail_endpoint($param->{name}); + $config->delete_sendmail_endpoint($name); PVE::Notify::write_config($config); }); }; @@ -1008,6 +1045,11 @@ __PACKAGE__->register_method ({ my ($param) = @_; my $name = extract_param($param, 'name'); + my $used_by = target_used_by($name); + if ($used_by) { + raise_param_exc({'name' => "Cannot remove $name, used by: $used_by"}); + } + eval { PVE::Notify::lock_config(sub { my $config = PVE::Notify::read_config(); -- 2.39.2