RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

python: Do not query the local database if the fcontext is non-local 

Vit Mojzis reports that an error message is produced when modifying
a non-local fcontext.

He gives the following example:
  # semanage fcontext -f f -m -t passwd_file_t /etc/security/opasswd
  libsemanage.dbase_llist_query: could not query record value (No such file or directory).

When modifying an fcontext, the non-local database is checked for the
key and then, if it is not found there, the local database is checked.
If the key doesn't exist, then an error is raised. If the key exists
then the local database is queried first and, if that fails, the non-
local database is queried.

The error is from querying the local database when the fcontext is in
the non-local database.

Instead, if the fcontext is in the non-local database, just query
the non-local database. Only query the local database if the
fcontext was found in it.

Reported-by: Vit Mojzis <vmojzis@redhat.com>
Signed-off-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
James Carter 2022-10-19 14:20:11 -04:00
parent bba6225abc
commit 7238ad32a3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/semanage/seobject.py
View File

@ -2504,18 +2504,21 @@ class fcontextRecords(semanageRecords):
(rc, exists) = semanage_fcontext_exists(self.sh, k) (rc, exists) = semanage_fcontext_exists(self.sh, k)
if rc < 0: if rc < 0:
raise ValueError(_("Could not check if file context for %s is defined") % target) raise ValueError(_("Could not check if file context for %s is defined") % target)
if not exists: if exists:
(rc, exists) = semanage_fcontext_exists_local(self.sh, k)
if not exists:
raise ValueError(_("File context for %s is not defined") % target)
try:
(rc, fcontext) = semanage_fcontext_query_local(self.sh, k)
except OSError:
try: try:
(rc, fcontext) = semanage_fcontext_query(self.sh, k) (rc, fcontext) = semanage_fcontext_query(self.sh, k)
except OSError: except OSError:
raise ValueError(_("Could not query file context for %s") % target) raise ValueError(_("Could not query file context for %s") % target)
else:
(rc, exists) = semanage_fcontext_exists_local(self.sh, k)
if rc < 0:
raise ValueError(_("Could not check if file context for %s is defined") % target)
if not exists:
raise ValueError(_("File context for %s is not defined") % target)
try:
(rc, fcontext) = semanage_fcontext_query_local(self.sh, k)
except OSError:
raise ValueError(_("Could not query file context for %s") % target)
if setype != "<<none>>": if setype != "<<none>>":
con = semanage_fcontext_get_con(fcontext) con = semanage_fcontext_get_con(fcontext)