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 4FE6C90A97 for ; Mon, 12 Feb 2024 14:33:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 306D419B4F for ; Mon, 12 Feb 2024 14:32:52 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 12 Feb 2024 14:32:51 +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 36A2D478D5 for ; Mon, 12 Feb 2024 14:32:51 +0100 (CET) Date: Mon, 12 Feb 2024 14:32:44 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20240205175419.1271680-1-m.carrara@proxmox.com> <20240205175419.1271680-2-m.carrara@proxmox.com> In-Reply-To: <20240205175419.1271680-2-m.carrara@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1707740058.pb6hydm5w2.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH v2 master ceph 01/11] debian: add patch to fix ceph crash dir permissions in postinst hook 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, 12 Feb 2024 13:33:22 -0000 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= '. >=20 > This patch therefore also updates the permissions of '/var/lib/ceph/*/*'. >=20 > Signed-off-by: Max Carrara > --- > Changes v1 --> v2: > * use `find` instead of for-loop >=20 > ...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-subdirector= ies-of-var-l.patch >=20 > diff --git a/patches/0015-debian-adjust-permissions-of-subdirectories-of-= var-l.patch b/patches/0015-debian-adjust-permissions-of-subdirectories-of-v= ar-l.patch > new file mode 100644 > index 000000000..7445f3945 > --- /dev/null > +++ b/patches/0015-debian-adjust-permissions-of-subdirectories-of-var-l.p= atch > @@ -0,0 +1,50 @@ > +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 > +From: Max Carrara > +Date: Thu, 1 Feb 2024 18:43:36 +0100 > +Subject: [PATCH] debian: adjust permissions of subdirectories of /var/li= b/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 > +--- > + 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 || : > +=20 > +- # 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=3D"dpkg-statoverride --list {} > /dev/null || chown ${SER= VER_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=20 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) > + : > +--=20 > +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 > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20