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 4DED9634F1 for ; Tue, 25 Jan 2022 10:54:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2A0D32BA9D for ; Tue, 25 Jan 2022 10:54:17 +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 1C4892BA92 for ; Tue, 25 Jan 2022 10:54:16 +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 EB84B45C57 for ; Tue, 25 Jan 2022 10:54:15 +0100 (CET) Message-ID: Date: Tue, 25 Jan 2022 10:54:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Content-Language: en-US To: Aaron Lauterer , pve-devel@lists.proxmox.com References: <20220124151153.1390196-1-a.lauterer@proxmox.com> From: Fabian Ebner In-Reply-To: <20220124151153.1390196-1-a.lauterer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.135 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [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: Tue, 25 Jan 2022 09:54:47 -0000 Am 24.01.22 um 16:11 schrieb Aaron Lauterer: > 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 since I gave the new version a go. > > 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 = $@) {