almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed error handling for setfiles policy lookup

Browse Source 
Errors from os.scandir were not catched. In addition the path
to run scandir was not properly created
This commit is contained in:
Marcus Schäfer 2022-06-14 18:17:00 +02:00
parent df0f9f2633
commit be4bf8a84f
No known key found for this signature in database
GPG Key ID: A16C1128698C8CAC
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kiwi/system/setup.py
View File

@ -1333,10 +1333,17 @@ class SystemSetup:
def _find_selinux_policy_file(self, policy_name: str) -> str:
policy_dir = f'/etc/selinux/{policy_name}/policy'
with os.scandir(os.path.join(self.root_dir, policy_dir)) as policy_path:
for entry in policy_path:
if entry.is_file() and entry.name.startswith('policy.'):
return os.path.join(policy_dir, entry.name)
policy_dir_in_root = self.root_dir + policy_dir
scandir_error = ''
try:
with os.scandir(policy_dir_in_root) as policy_path:
for entry in policy_path:
if entry.is_file() and entry.name.startswith('policy.'):
return os.path.join(policy_dir, entry.name)
except Exception as issue:
scandir_error = format(issue)
raise KiwiFileNotFound(
f'Unable to find SELinux binary policy file in {policy_dir!r}'
'Unable to find SELinux policy in {0!r} {1}'.format(
policy_dir_in_root, scandir_error
)
)

1
test/unit/system/setup_test.py
View File

@ -1404,6 +1404,7 @@ class TestSystemSetup:
def test_set_selinux_file_contexts_raises(
self, mock_os_scandir, mock_command
):
mock_os_scandir.side_effect = Exception
with raises(KiwiFileNotFound):
self.setup.set_selinux_file_contexts('security_context_file')