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 87779A2BA8 for ; Tue, 20 Jun 2023 12:55:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C7203396F for ; Tue, 20 Jun 2023 12:54:43 +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 ; Tue, 20 Jun 2023 12:54:42 +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 8972341C88 for ; Tue, 20 Jun 2023 12:54:42 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 20 Jun 2023 12:54:34 +0200 Message-Id: <20230620105438.121605-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620105438.121605-1-f.ebner@proxmox.com> References: <20230620105438.121605-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 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] [RFC v2 ha-manager 5/7] pve2 env: validate shutdown policy from override file 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: Tue, 20 Jun 2023 10:55:13 -0000 for future-proofing. Signed-off-by: Fiona Ebner --- Not sure if this is worth it. (Build-)dependency bump for libpve-cluster-perl needed No changes in v2. src/PVE/HA/Env/PVE2.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 6a75bd4..6eb4aa7 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -12,6 +12,7 @@ use PVE::Tools; use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file cfs_lock_file); use PVE::DataCenterConfig; use PVE::INotify; +use PVE::JSONSchema; use PVE::RPCEnvironment; use PVE::HA::Tools ':exit_codes'; @@ -463,7 +464,17 @@ sub get_datacenter_settings { $self->log('warning', "error reading shutdown policy override from $sp_override_fn - $@") if $@; my $overrides = {}; - $overrides->{ha}->{shutdown_policy} = $shutdown_policy_override if $shutdown_policy_override; + + if ($shutdown_policy_override) { + eval { + PVE::JSONSchema::validate( + $shutdown_policy_override, + PVE::JSONSchema::get_standard_option('pve-ha-shutdown-policy'), + ); + $overrides->{ha}->{shutdown_policy} = $shutdown_policy_override; + }; + $self->log('warning', "error validating shutdown policy override - $@") if $@; + } return { ha => $datacenterconfig->{ha} // {}, -- 2.39.2