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 84D026036C for ; Wed, 2 Dec 2020 10:21:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7C38819082 for ; Wed, 2 Dec 2020 10:21:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 333791904F for ; Wed, 2 Dec 2020 10:21:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F22E5448B3 for ; Wed, 2 Dec 2020 10:21:14 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 2 Dec 2020 10:21:04 +0100 Message-Id: <20201202092113.15911-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201202092113.15911-1-d.csapak@proxmox.com> References: <20201202092113.15911-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.303 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tools.pm] Subject: [pve-devel] [PATCH common 1/1] tools: add extract_sensitive_params 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: Wed, 02 Dec 2020 09:21:46 -0000 moved and generalized from pve-storage, since we'll need it in more places Signed-off-by: Dominik Csapak --- src/PVE/Tools.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index 4b445ea..bda236a 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -48,6 +48,7 @@ template_replace safe_print trim extract_param +extract_sensitive_params file_copy get_host_arch O_PATH @@ -807,6 +808,29 @@ sub extract_param { return $res; } +sub extract_sensitive_params :prototype($$$) { + my ($param, $sensitive_list, $delete_list) = @_; + + my $sensitive; + + my %delete = map { $_ => 1 } ($delete_list || [])->@*; + + # always extract sensitive keys, so they don't get written to the www-data readable scfg + for my $opt (@$sensitive_list) { + # First handle deletions as explicitly setting `undef`, afterwards new values may override + # it. + if (exists($delete{$opt})) { + $sensitive->{$opt} = undef; + } + + if (defined(my $value = extract_param($param, $opt))) { + $sensitive->{$opt} = $value; + } + } + + return $sensitive; +} + # Note: we use this to wait until vncterm/spiceterm is ready sub wait_for_vnc_port { my ($port, $family, $timeout) = @_; -- 2.20.1