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 6C2F4632B8 for ; Mon, 24 Jan 2022 16:12:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5B558244FF for ; Mon, 24 Jan 2022 16:11:55 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D2B51244F5 for ; Mon, 24 Jan 2022 16:11:54 +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 7B89D4613D for ; Mon, 24 Jan 2022 16:11:54 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 24 Jan 2022 16:11:53 +0100 Message-Id: <20220124151153.1390196-1-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cephconfig.pm] Subject: [pve-devel] [PATCH v2 storage] CephConfig: ensure newline in $secret and $cephfs_secret parameter 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: Mon, 24 Jan 2022 15:12:25 -0000 Ensure that the user provided $secret ends in a newline. Otherwise we will have Input/output errors from rados_connect. For consistency and possible future proofing, also add a newline to CephFS secrets. Signed-off-by: Aaron Lauterer --- changes: - instead conditional with regex, use chomp and always adding the newline - do the same to $cephfs_secret >From previous version (though not sure if they still apply with these changes): Reviewed-by: Fabian Ebner Tested-by: Fabian Ebner PVE/CephConfig.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/CephConfig.pm b/PVE/CephConfig.pm index 5c94a04..c388f02 100644 --- a/PVE/CephConfig.pm +++ b/PVE/CephConfig.pm @@ -227,14 +227,16 @@ sub ceph_create_keyfile { eval { if (defined($secret)) { mkdir '/etc/pve/priv/ceph'; - PVE::Tools::file_set_contents($ceph_storage_keyring, $secret, 0400); + chomp $secret; + PVE::Tools::file_set_contents($ceph_storage_keyring, "${secret}\n", 0400); } elsif ($type eq 'rbd') { mkdir '/etc/pve/priv/ceph'; PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring); } elsif ($type eq 'cephfs') { my $cephfs_secret = $ceph_get_key->($ceph_admin_keyring, 'admin'); mkdir '/etc/pve/priv/ceph'; - PVE::Tools::file_set_contents($ceph_storage_keyring, $cephfs_secret, 0400); + chomp $cephfs_secret; + PVE::Tools::file_set_contents($ceph_storage_keyring, "${cephfs_secret}\n", 0400); } }; if (my $err = $@) { -- 2.30.2