From e9f27f139b2089b9b2f2a31b10fdb4c19581506d Mon Sep 17 00:00:00 2001 From: Daniel Hilst <392820+dhilst@users.noreply.github.com> Date: Fri, 23 Oct 2026 00:56:50 -0300 Subject: [PATCH] fix(xcat-core): the documented repair relabels before the guest exclusions exist The SELinux page carried the repair in two blocks. The first mapped the published artifacts and ran restorecon over the image root. The second mapped the publication directory and excluded both guest trees. An operator with site.installdir=/srv/xcat-install who reads the page in order therefore relabels before any mapping covers that tree, and rootimg/etc/shadow resolves to var_t. The exclusion added afterwards keeps the var_t it finds, because it only stops the next relabel from changing the label again. The order also cost the artifacts. file_contexts keeps the expressions in the order they are read and the last one that matches a path wins, so the exclusions of the second block beat the artifact mappings of the first. Where the image root carries a rootimg component in the middle, the exclusion matches the artifacts as well, and the five expressions with a wildcard, the initrds and the packed images, resolve <>. kernel and hypervisor carry no wildcard and win either way, which is why the defect showed on a subset. The page is now one sequence: the publication directory, both guest exclusions, the artifact mappings, then one restorecon. It says what each step orders and why. xCAT-test/native/selinux_image_repair.t passes 381 of 381 checks on this sequence and fails 47 on the order of the parent commit. selinux_docs.t fails 3 of 30 on the parent commit. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com> --- docs/source/advanced/selinux/index.rst | 58 +++++++++++++++++--------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/docs/source/advanced/selinux/index.rst b/docs/source/advanced/selinux/index.rst index 95e20525c6..d8f4df8234 100644 --- a/docs/source/advanced/selinux/index.rst +++ b/docs/source/advanced/selinux/index.rst @@ -90,25 +90,51 @@ another type, from before the package was installed. ``restorecon`` over the publication directory cannot repair it, with or without ``-F``, because the path has no context to apply. Give it one. -``site.installdir`` selects the publication directory. Read it, and map each -published artifact of that one image root:: +``site.installdir`` selects the publication directory. Add the mappings in this +order, and relabel once at the end:: installdir=$(lsdef -t site -i installdir -c | sed 's/^.*=//; s:/*$::') imgroot=$installdir/netboot/rootimg/rhels9/x86_64/compute + # 1. The publication directory, when site.installdir is not /install. The + # packaged mappings name /install and cover no other directory. + semanage fcontext -a -t public_content_t "$installdir(/.*)?" + + # 2. Both guest trees, before anything relabels them. + semanage fcontext -a -t '<>' "$installdir(/.*)?/rootimg(/.*)?" + semanage fcontext -a -t '<>' "$installdir(/.*)?/rootimg-statelite(/.*)?" + + # 3. The published artifacts of the one image root, after the exclusions. for name in kernel hypervisor 'initrd[^/]*' 'rootimg\.[^/]*' \ 'rootimg-statelite\.[^/]*' 'rootimgtree\.[^/]*' \ 'litefile\.csv' 'common\.filelist'; do semanage fcontext -a -t public_content_t -f f "$imgroot/$name" done - restorecon -R -v "$imgroot" -Each expression names one regular file directly below the image root, so no -path in ``$imgroot/rootimg`` or ``$imgroot/rootimg-statelite`` matches one. -Both guest trees keep the ``<>`` of the packaged mappings, and -``restorecon`` leaves every file in them alone. ``file_contexts.local`` is read -after the packaged file, and the last expression that matches a path wins, so -each mapping above wins against ``/install(/.*)?/rootimg(/.*)?``. + # 4. One relabel, with every mapping in place. + restorecon -R -v "$installdir" + +Steps 1 and 2 come first because a relabel before them writes a generic type +over the guest labels. With ``site.installdir=/srv/xcat-install`` and no mapping +for that tree, ``rootimg/etc/shadow`` resolves to ``var_t``. A mapping added +after such a relabel only stops the next one from changing what is already +wrong. + +Step 3 comes after step 2 because ``file_contexts`` keeps the expressions in the +order they are read, and the last one that matches a path wins. +``$installdir(/.*)?/rootimg(/.*)?`` matches ``$imgroot`` itself when the image +root carries a ``rootimg`` component in the middle, so it matches the published +artifacts too. Read after the exclusions, each artifact mapping wins against +them. Read before, the artifacts resolve to ``<>``. An expression with no +wildcard, such as ``kernel``, wins either way, so the defect shows on the +initrds and the packed images alone. + +Step 4 runs once. Each expression in step 3 names one regular file directly +below the image root, so no path in ``$imgroot/rootimg`` or +``$imgroot/rootimg-statelite`` matches one, and ``restorecon`` leaves every file +in both guest trees alone. Under the standard ``/install`` the packaged +mappings already carry steps 1 and 2, and ``file_contexts.local`` is read after +the packaged file, so step 3 still wins. Do not repair a label with ``chcon``, and do not map the image root as a tree. ``chcon`` writes a type that no mapping selects, so the next relabel of a path @@ -116,19 +142,13 @@ that has a mapping reverts it, and a recursive ``chcon`` relabels both guest trees as well. A tree mapping over the image root relabels them through ``restorecon`` instead. -The packaged mappings name ``/install``. A site that moved ``site.installdir`` -maps the configured directory, and keeps both guest trees out of that mapping:: - - semanage fcontext -a -t public_content_t "$installdir(/.*)?" - semanage fcontext -a -t '<>' "$installdir(/.*)?/rootimg(/.*)?" - semanage fcontext -a -t '<>' "$installdir(/.*)?/rootimg-statelite(/.*)?" - restorecon -R -v "$installdir" - A mapping is persistent, so a later recursive relabel and a policy upgrade both keep the result. ``xCAT-test/native/selinux_image_repair.t`` starts with the wrong type on every published artifact and valid types in both guest trees, -runs each procedure, and reads the labels back after a recursive relabel and -after a reinstall of the module. +runs the four steps in order, and reads the labels back after a recursive +relabel and after a reinstall of the module. It does that for a moved +``installdir`` whose image root also carries a ``rootimg`` component in the +middle, which is the layout that needs every step. The unit holds ``/opt/xcat`` as the default prefix, and ``%post`` writes ``/etc/xcat/xcatroot.env`` with the prefix of the installation, which the unit