semanage: Fix parsing of ignoredirs #758
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
This fix works, and the solution is in-line with the existing Inifile module.
In the event of someone using the previous version of the semange.aug lens to modify an ignoredirs entry with just a single directory, that person would need to update their Augeas path from (eg. for a value of /root ):
set /files/etc/selinux/semanage.conf/ignoredirs "/root"
to
set /files/etc/selinux/semanage.conf/ignoredirs/1 "/root"
Given that the previous version of the semange.aug lens did not allow ; in the ignoredirs value, this use-case is likely to be rare.
From /etc/selinux/semanage.conf from a RHEL 9.1 system, this line caused problems: ignoredirs=/root;/bin;/boot;/dev;/etc [...] Parse this as a list of modified Rx.fspath, generating a tree like: /files/etc/selinux/semanage.conf/ignoredirs/1 = /root /files/etc/selinux/semanage.conf/ignoredirs/2 = /bin /files/etc/selinux/semanage.conf/ignoredirs/3 = /dev /files/etc/selinux/semanage.conf/ignoredirs/4 = /etc [...] Also this adds the RHEL 9 file as another test case and adjusts the output of the existing test case. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2077120 Signed-off-by: Richard W.M. Jones <[email protected]>
rwmjones
force-pushed
the
rhbz2077120
branch
from
3d34777 to
5522ab7
Compare
|
(rebased on top of master, no other changes) |
georgehansper
approved these changes
Sep 20, 2022
rwmjones
added a commit
to rwmjones/augeas
that referenced
this pull request
Oct 12, 2022
From /etc/selinux/semanage.conf from a RHEL 9.1 system, this line caused problems: ignoredirs=/root;/bin;/boot;/dev;/etc [...] Parse this as a list of modified Rx.fspath, generating a tree like: /files/etc/selinux/semanage.conf/ignoredirs/1 = /root /files/etc/selinux/semanage.conf/ignoredirs/2 = /bin /files/etc/selinux/semanage.conf/ignoredirs/3 = /dev /files/etc/selinux/semanage.conf/ignoredirs/4 = /etc [...] Also this adds the RHEL 9 file as another test case and adjusts the output of the existing test case. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2077120 Signed-off-by: Richard W.M. Jones <[email protected]> Signed-off-by: Richard W.M. Jones <[email protected]> (cherry picked from commit a3ba6e2)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
From /etc/selinux/semanage.conf from a RHEL 9.1 system, this line
caused problems:
ignoredirs=/root;/bin;/boot;/dev;/etc [...]
Parse this as a list of Rx.fspath.
Also this adds the RHEL 9 file as another test case and adjusts the
output of the existing test case.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2077120
Signed-off-by: Richard W.M. Jones [email protected]