From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, Aaron Lauterer <a.lauterer@proxmox.com>
Subject: Re: [pve-devel] [PATCH storage] CephConfig: ensure newline in $secret parameter
Date: Mon, 24 Jan 2022 12:26:00 +0100 [thread overview]
Message-ID: <dbbbad44-8e12-9860-6f36-5caa8e38662c@proxmox.com> (raw)
In-Reply-To: <20211126150255.1819278-1-a.lauterer@proxmox.com>
Am 26.11.21 um 16:02 schrieb Aaron Lauterer:
> Ensure that the user provided $secret ends in a newline. Otherwise we
> will have Input/output errors from rados_connect.
>
Reviewed-by: Fabian Ebner <f.ebner@proxmox.com>
Tested-by: Fabian Ebner <f.ebner@proxmox.com>
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
> PVE/CephConfig.pm | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/PVE/CephConfig.pm b/PVE/CephConfig.pm
> index 5c94a04..ac28e76 100644
> --- a/PVE/CephConfig.pm
> +++ b/PVE/CephConfig.pm
> @@ -227,6 +227,7 @@ sub ceph_create_keyfile {
> eval {
> if (defined($secret)) {
> mkdir '/etc/pve/priv/ceph';
> + $secret = "${secret}\n" if $secret !~ m/\n$/;
> PVE::Tools::file_set_contents($ceph_storage_keyring, $secret, 0400);
> } elsif ($type eq 'rbd') {
> mkdir '/etc/pve/priv/ceph';
Just one thing I'm wondering: AFAIU there is no problem for CephFS
currently, but for consistency/future-proving, we might put a newline
there as well when the $secret is not user-provided. I.e. below,
$cephfs_secret isn't newline-terminated:
} 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);
}
next prev parent reply other threads:[~2022-01-24 11:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 15:02 Aaron Lauterer
2022-01-17 10:11 ` Aaron Lauterer
2022-01-24 14:03 ` Thomas Lamprecht
2022-01-24 14:18 ` Aaron Lauterer
2022-01-24 11:26 ` Fabian Ebner [this message]
2022-01-24 14:42 ` Aaron Lauterer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dbbbad44-8e12-9860-6f36-5caa8e38662c@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=a.lauterer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox