From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 master ceph 01/11] debian: add patch to fix ceph crash dir permissions in postinst hook
Date: Mon, 12 Feb 2024 14:32:44 +0100 [thread overview]
Message-ID: <1707740058.pb6hydm5w2.astroid@yuna.none> (raw)
In-Reply-To: <20240205175419.1271680-2-m.carrara@proxmox.com>
On February 5, 2024 6:54 pm, Max Carrara wrote:
> Ceph has a postinst hook that sets the ownership of '/var/lib/ceph/*'
> to ceph:ceph (in our case), but misses out on '/var/lib/ceph/crash/posted'.
>
> This patch therefore also updates the permissions of '/var/lib/ceph/*/*'.
>
> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
> ---
> Changes v1 --> v2:
> * use `find` instead of for-loop
>
> ...rmissions-of-subdirectories-of-var-l.patch | 50 +++++++++++++++++++
> patches/series | 1 +
> 2 files changed, 51 insertions(+)
> create mode 100644 patches/0015-debian-adjust-permissions-of-subdirectories-of-var-l.patch
>
> diff --git a/patches/0015-debian-adjust-permissions-of-subdirectories-of-var-l.patch b/patches/0015-debian-adjust-permissions-of-subdirectories-of-var-l.patch
> new file mode 100644
> index 000000000..7445f3945
> --- /dev/null
> +++ b/patches/0015-debian-adjust-permissions-of-subdirectories-of-var-l.patch
> @@ -0,0 +1,50 @@
> +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
> +From: Max Carrara <m.carrara@proxmox.com>
> +Date: Thu, 1 Feb 2024 18:43:36 +0100
> +Subject: [PATCH] debian: adjust permissions of subdirectories of /var/lib/ceph
> +
> +A rather recent PR made ceph-crash run as "ceph" user instead of
> +root [0]. However, because /var/lib/ceph/crash/posted belongs to root,
> +ceph-crash cannot actually post any crash logs now.
> +
> +This commit fixes this by also updating the permissions of
> +/var/lib/ceph/*/* - the subdirectories and files of the directories in
> +/var/lib/ceph - by using `find` instead of a loop over a glob pattern.
> +
> +[0]: https://github.com/ceph/ceph/pull/48713
> +
> +Signed-off-by: Max Carrara <m.carrara@proxmox.com>
> +---
> + debian/ceph-base.postinst | 16 +++++++++-------
> + 1 file changed, 9 insertions(+), 7 deletions(-)
> +
> +diff --git a/debian/ceph-base.postinst b/debian/ceph-base.postinst
> +index 75eeb59c624..70d07977f82 100644
> +--- a/debian/ceph-base.postinst
> ++++ b/debian/ceph-base.postinst
> +@@ -33,13 +33,15 @@ case "$1" in
> + rm -f /etc/init/ceph.conf
> + [ -x /sbin/start ] && start ceph-all || :
> +
> +- # adjust file and directory permissions
> +- for DIR in /var/lib/ceph/* ; do
> +- if ! dpkg-statoverride --list $DIR >/dev/null
> +- then
> +- chown $SERVER_USER:$SERVER_GROUP $DIR
> +- fi
> +- done
> ++ PERM_COMMAND="dpkg-statoverride --list {} > /dev/null || chown ${SERVER_USER}:${SERVER_GROUP} {}"
this doesn't quote {} properly, files with spaces or other things in
them can cause issues including shell command injection as root when
this is executed by dpkg..
> ++
> ++ # adjust directory permissions
> ++ find /var/lib/ceph -mindepth 1 -maxdepth 2 -type d -print0 \
> ++ | xargs -0 -I '{}' sh -c "${PERM_COMMAND}"
> ++
> ++ # adjust file permissions
> ++ find /var/lib/ceph -mindepth 1 -maxdepth 2 -type f -print0 \
> ++ | xargs -0 -I '{}' sh -c "${PERM_COMMAND}"
> + ;;
do we need the depth stuff or the split by type? we want to make
everything under /var/lib/ceph owned by ceph:ceph, unless the admin has
specifically overriden a particular path.
a simple
find /var/lib/ceph -print0 | ...
should work and be much simpler (or if we want to limit to dirs and
files, that can also be simply done in one go by ORing the two checks)
> + abort-upgrade|abort-remove|abort-deconfigure)
> + :
> +--
> +2.39.2
> +
> diff --git a/patches/series b/patches/series
> index 865caf23d..cf8f1ea31 100644
> --- a/patches/series
> +++ b/patches/series
> @@ -12,3 +12,4 @@
> 0012-backport-mgr-dashboard-simplify-authentication-proto.patch
> 0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch
> 0014-rocksb-inherit-parent-cmake-cxx-flags.patch
> +0015-debian-adjust-permissions-of-subdirectories-of-var-l.patch
> --
> 2.39.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
next prev parent reply other threads:[~2024-02-12 13:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 17:54 [pve-devel] [PATCH v2 master ceph, quincy-stable 8 ceph, pve-storage, pve-manager 00/11] Fix #4759: Configure Permissions for ceph-crash.service Max Carrara
2024-02-05 17:54 ` [pve-devel] [PATCH v2 master ceph 01/11] debian: add patch to fix ceph crash dir permissions in postinst hook Max Carrara
2024-02-12 13:32 ` Fabian Grünbichler [this message]
2024-02-13 8:25 ` Max Carrara
2024-02-05 17:54 ` [pve-devel] [PATCH v2 master ceph 02/11] patches: add patch that reorders clients used by ceph-crash Max Carrara
2024-02-12 13:33 ` Fabian Grünbichler
2024-02-05 17:54 ` [pve-devel] [PATCH v2 quincy-stable-8 ceph 03/11] debian: add patch to fix ceph crash dir permissions in postinst hook Max Carrara
2024-02-12 13:32 ` Fabian Grünbichler
2024-02-05 17:54 ` [pve-devel] [PATCH v2 quincy-stable-8 ceph 04/11] patches: add patch that reorders clients used by ceph-crash Max Carrara
2024-02-12 13:33 ` Fabian Grünbichler
2024-02-05 17:54 ` [pve-devel] [PATCH v2 pve-storage 05/11] cephconfig: align our parser more with Ceph's parser Max Carrara
2024-02-12 13:33 ` Fabian Grünbichler
2024-02-13 8:34 ` Max Carrara
2024-02-05 17:54 ` [pve-devel] [PATCH v2 pve-storage 06/11] cephconfig: allow writing arbitrary sections Max Carrara
2024-02-12 13:33 ` Fabian Grünbichler
2024-02-13 8:46 ` Max Carrara
2024-02-05 17:54 ` [pve-devel] [PATCH v2 pve-storage 07/11] amend! " Max Carrara
2024-02-12 13:33 ` Fabian Grünbichler
2024-02-13 8:50 ` Max Carrara
2024-02-05 17:54 ` [pve-devel] [PATCH v2 pve-manager 08/11] ceph: fix edge case of wrong files being deleted on purge Max Carrara
2024-02-12 13:33 ` [pve-devel] applied: " Fabian Grünbichler
2024-02-05 17:54 ` [pve-devel] [PATCH v2 pve-manager 09/11] fix #4759: ceph: configure keyring for ceph-crash.service Max Carrara
2024-02-12 13:34 ` Fabian Grünbichler
2024-02-13 9:09 ` Max Carrara
2024-02-14 12:43 ` Max Carrara
2024-02-05 17:54 ` [pve-devel] [PATCH v2 pve-manager 10/11] ceph: create '/etc/pve/ceph' during `pveceph init` Max Carrara
2024-02-05 17:54 ` [pve-devel] [PATCH v2 pve-manager 11/11] fix #4759: debian/postinst: configure ceph-crash.service and its key Max Carrara
2024-02-12 13:34 ` Fabian Grünbichler
2024-02-13 9:25 ` Max Carrara
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=1707740058.pb6hydm5w2.astroid@yuna.none \
--to=f.gruenbichler@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