saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Adjusted selinux and tests for egrep to grep -E

Browse source
This commit is contained in:
David Murphy 2024-10-23 15:00:16 -06:00 • committed by Daniel Wozniak
parent c61822fbd9
commit d19258590b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/selinux.py
View file

@ -490,7 +490,7 @@ def fcontext_get_policy(
"[[:alpha:] ]+" if filetype is None else filetype_id_to_string(filetype)
)
cmd = (
"semanage fcontext -l | egrep "
"semanage fcontext -l | grep -E "
+ "'^{filespec}{spacer}{filetype}{spacer}{sel_user}:{sel_role}:{sel_type}:{sel_level}{ospacer}$'".format(
**cmd_kwargs
)
@ -616,7 +616,7 @@ def _fcontext_add_or_delete_policy(
if "add" == action:
# need to use --modify if context for name file exists, otherwise ValueError
filespec = re.escape(name)
cmd = f"semanage fcontext -l | egrep '{filespec} '"
cmd = f"semanage fcontext -l | grep -E '{filespec}'"
current_entry_text = __salt__["cmd.shell"](cmd, ignore_retcode=True)
if current_entry_text != "":
action = "modify"
@ -762,7 +762,7 @@ def port_get_policy(name, sel_type=None, protocol=None, port=None):
"port": port,
}
cmd = (
"semanage port -l | egrep "
"semanage port -l | grep -E "
+ "'^{sel_type}{spacer}{protocol}{spacer}((.*)*)[ ]{port}($|,)'".format(
**cmd_kwargs
)

4
tests/pytests/unit/modules/test_selinux.py
View file

@ -401,7 +401,7 @@ def test_selinux_add_policy_regex(name, sel_type):
):
selinux.fcontext_add_policy(name, sel_type=sel_type)
filespec = re.escape(name)
expected_cmd_shell = f"semanage fcontext -l | egrep '{filespec}'"
expected_cmd_shell = f"semanage fcontext -l | grep -E '{filespec}'"
mock_cmd_shell.assert_called_once_with(
expected_cmd_shell,
ignore_retcode=True,
@ -433,7 +433,7 @@ def test_selinux_add_policy_shorter_path(name, sel_type):
):
selinux.fcontext_add_policy(name, sel_type=sel_type)
filespec = re.escape(name)
expected_cmd_shell = f"semanage fcontext -l | egrep '{filespec}'"
expected_cmd_shell = f"semanage fcontext -l | grep -E '{filespec}'"
mock_cmd_shell.assert_called_once_with(
expected_cmd_shell,
ignore_retcode=True,