mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
migrate test_restartcheck to pytest
This commit is contained in:
Frode Gundersen
Megan Wilhite
parent
fc1f0b30ac
commit
1c8b5a7b05
2 changed files with 380 additions and 434 deletions
|
|
@ -1,4 +1,5 @@
|
|||
import io
|
||||
import os
|
||||
|
||||
import pytest
|
||||
|
||||
|
|
@ -6,7 +7,9 @@ import salt.modules.cmdmod as cmdmod
|
|||
import salt.modules.restartcheck as restartcheck
|
||||
import salt.modules.system as system
|
||||
import salt.modules.systemd_service as service
|
||||
from tests.support.mock import create_autospec, patch
|
||||
import salt.utils.path
|
||||
from tests.support.mock import ANY, MagicMock, create_autospec, patch
|
||||
from tests.support.paths import SALT_CODE_DIR
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
|
@ -262,3 +265,379 @@ def test_when_nilinuxrt_and_not_kernel_modules_changed_or_sysapi_files_changed_a
|
|||
with patch_grains, patch_kernel_versions, patch_salt, patch_sysapi_changed, patch_kernel_mod_changed, patch_del_files:
|
||||
actual_result = restartcheck.restartcheck()
|
||||
assert actual_result == expected_result
|
||||
|
||||
|
||||
def test_kernel_versions_debian():
|
||||
"""
|
||||
Test kernel version debian
|
||||
"""
|
||||
mock = MagicMock(return_value=" Installed: 4.9.82-1+deb9u3")
|
||||
with patch.dict(restartcheck.__grains__, {"os": "Debian"}):
|
||||
with patch.dict(restartcheck.__salt__, {"cmd.run": mock}):
|
||||
assert restartcheck._kernel_versions_debian() == ["4.9.82-1+deb9u3"]
|
||||
|
||||
|
||||
def test_kernel_versions_ubuntu():
|
||||
"""
|
||||
Test kernel version ubuntu
|
||||
"""
|
||||
mock = MagicMock(return_value=" Installed: 4.10.0-42.46")
|
||||
with patch.dict(restartcheck.__grains__, {"os": "Ubuntu"}):
|
||||
with patch.dict(restartcheck.__salt__, {"cmd.run": mock}):
|
||||
assert restartcheck._kernel_versions_debian() == [
|
||||
"4.10.0-42.46",
|
||||
"4.10.0-42-generic #46",
|
||||
"4.10.0-42-lowlatency #46",
|
||||
]
|
||||
|
||||
|
||||
def test_kernel_versions_redhat():
|
||||
"""
|
||||
Test if it return a data structure of the current, in-memory rules
|
||||
"""
|
||||
mock = MagicMock(
|
||||
return_value=(
|
||||
"kernel-3.10.0-862.el7.x86_64 Thu Apr 5 00:40:00 2018"
|
||||
)
|
||||
)
|
||||
with patch.dict(restartcheck.__salt__, {"cmd.run": mock}):
|
||||
assert restartcheck._kernel_versions_redhat() == ["3.10.0-862.el7.x86_64"]
|
||||
|
||||
|
||||
def test_valid_deleted_file_deleted():
|
||||
"""
|
||||
Test (deleted) file
|
||||
"""
|
||||
assert restartcheck._valid_deleted_file("/usr/lib/test (deleted)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_psth_inode():
|
||||
"""
|
||||
Test (path inode=1) file
|
||||
"""
|
||||
assert restartcheck._valid_deleted_file("/usr/lib/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_log():
|
||||
"""
|
||||
Test /var/log/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/log/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/log/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/var/log/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_local_log():
|
||||
"""
|
||||
Test /var/local/log/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/local/log/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/local/log/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/var/local/log/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_run():
|
||||
"""
|
||||
Test /var/run/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/run/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/run/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/var/run/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_local_run():
|
||||
"""
|
||||
Test /var/local/run/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/local/run/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/local/run/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/var/local/run/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_tmp():
|
||||
"""
|
||||
Test /tmp/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/tmp/test")
|
||||
assert not restartcheck._valid_deleted_file("/tmp/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/tmp/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_dev_shm():
|
||||
"""
|
||||
Test /dev/shm/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/dev/shm/test")
|
||||
assert not restartcheck._valid_deleted_file("/dev/shm/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/dev/shm/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_run():
|
||||
"""
|
||||
Test /run/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/run/test")
|
||||
assert not restartcheck._valid_deleted_file("/run/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/run/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_drm():
|
||||
"""
|
||||
Test /drm/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/drm/test")
|
||||
assert not restartcheck._valid_deleted_file("/drm/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/drm/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_tmp():
|
||||
"""
|
||||
Test /var/tmp/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/tmp/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/tmp/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/var/tmp/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_local_tmp():
|
||||
"""
|
||||
Test /var/local/tmp/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/local/tmp/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/local/tmp/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/var/local/tmp/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_dev_zero():
|
||||
"""
|
||||
Test /dev/zero/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/dev/zero/test")
|
||||
assert not restartcheck._valid_deleted_file("/dev/zero/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/dev/zero/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_dev_pts():
|
||||
"""
|
||||
Test /dev/pts/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/dev/pts/test")
|
||||
assert not restartcheck._valid_deleted_file("/dev/pts/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/dev/pts/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_usr_lib_locale():
|
||||
"""
|
||||
Test /usr/lib/locale/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/usr/lib/locale/test")
|
||||
assert not restartcheck._valid_deleted_file("/usr/lib/locale/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/usr/lib/locale/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_home():
|
||||
"""
|
||||
Test /home/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/home/test")
|
||||
assert not restartcheck._valid_deleted_file("/home/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/home/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_icon_theme_cache():
|
||||
"""
|
||||
Test /test.icon-theme.cache
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/dev/test.icon-theme.cache")
|
||||
assert not restartcheck._valid_deleted_file("/dev/test.icon-theme.cache (deleted)")
|
||||
assert not restartcheck._valid_deleted_file(
|
||||
"/dev/test.icon-theme.cache (path inode=1)"
|
||||
)
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_cache_fontconfig():
|
||||
"""
|
||||
Test /var/cache/fontconfig/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/cache/fontconfig/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/cache/fontconfig/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file(
|
||||
"/var/cache/fontconfig/test (path inode=1)"
|
||||
)
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_lib_nagios3_spool():
|
||||
"""
|
||||
Test /var/lib/nagios3/spool/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/lib/nagios3/spool/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/lib/nagios3/spool/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file(
|
||||
"/var/lib/nagios3/spool/test (path inode=1)"
|
||||
)
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_lib_nagios3_spool_checkresults():
|
||||
"""
|
||||
Test /var/lib/nagios3/spool/checkresults/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file(
|
||||
"/var/lib/nagios3/spool/checkresults/test"
|
||||
)
|
||||
assert not restartcheck._valid_deleted_file(
|
||||
"/var/lib/nagios3/spool/checkresults/test (deleted)"
|
||||
)
|
||||
assert not restartcheck._valid_deleted_file(
|
||||
"/var/lib/nagios3/spool/checkresults/test (path inode=1)"
|
||||
)
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_lib_postgresql():
|
||||
"""
|
||||
Test /var/lib/postgresql/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/lib/postgresql/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/lib/postgresql/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file(
|
||||
"/var/lib/postgresql/test (path inode=1)"
|
||||
)
|
||||
|
||||
|
||||
def test_valid_deleted_file_var_lib_vdr():
|
||||
"""
|
||||
Test /var/lib/vdr/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/var/lib/vdr/test")
|
||||
assert not restartcheck._valid_deleted_file("/var/lib/vdr/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/var/lib/vdr/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_aio():
|
||||
"""
|
||||
Test /[aio]/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/opt/test")
|
||||
assert not restartcheck._valid_deleted_file("/opt/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/opt/test (path inode=1)")
|
||||
assert not restartcheck._valid_deleted_file("/apt/test")
|
||||
assert not restartcheck._valid_deleted_file("/apt/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/apt/test (path inode=1)")
|
||||
assert not restartcheck._valid_deleted_file("/ipt/test")
|
||||
assert not restartcheck._valid_deleted_file("/ipt/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/ipt/test (path inode=1)")
|
||||
assert not restartcheck._valid_deleted_file("/aio/test")
|
||||
assert not restartcheck._valid_deleted_file("/aio/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/aio/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_deleted_file_sysv():
|
||||
"""
|
||||
Test /SYSV/
|
||||
"""
|
||||
assert not restartcheck._valid_deleted_file("/SYSV/test")
|
||||
assert not restartcheck._valid_deleted_file("/SYSV/test (deleted)")
|
||||
assert not restartcheck._valid_deleted_file("/SYSV/test (path inode=1)")
|
||||
|
||||
|
||||
def test_valid_command():
|
||||
"""
|
||||
test for CVE-2020-28243
|
||||
"""
|
||||
create_file = os.path.join(SALT_CODE_DIR, "created_file")
|
||||
|
||||
patch_kernel = patch(
|
||||
"salt.modules.restartcheck._kernel_versions_redhat",
|
||||
return_value=["3.10.0-1127.el7.x86_64"],
|
||||
)
|
||||
services = {
|
||||
"NetworkManager": {"ExecMainPID": 123},
|
||||
"auditd": {"ExecMainPID": 456},
|
||||
"crond": {"ExecMainPID": 789},
|
||||
}
|
||||
|
||||
patch_salt = patch.dict(
|
||||
restartcheck.__salt__,
|
||||
{
|
||||
"cmd.run": MagicMock(
|
||||
return_value="Linux localhost.localdomain 3.10.0-1127.el7.x86_64"
|
||||
),
|
||||
"service.get_running": MagicMock(return_value=list(services.keys())),
|
||||
"service.show": MagicMock(side_effect=list(services.values())),
|
||||
"pkg.owner": MagicMock(return_value=""),
|
||||
"service.available": MagicMock(return_value=True),
|
||||
},
|
||||
)
|
||||
|
||||
patch_deleted = patch(
|
||||
"salt.modules.restartcheck._deleted_files",
|
||||
MagicMock(
|
||||
return_value=[(";touch {};".format(create_file), 123, "/root/ (deleted)")]
|
||||
),
|
||||
)
|
||||
|
||||
patch_readlink = patch(
|
||||
"os.readlink", return_value="/root/;touch {};".format(create_file)
|
||||
)
|
||||
|
||||
check_error = True
|
||||
if salt.utils.path.which("repoquery"):
|
||||
check_error = False
|
||||
|
||||
patch_grains = patch.dict(restartcheck.__grains__, {"os_family": "RedHat"})
|
||||
with patch_kernel, patch_salt, patch_deleted, patch_readlink, patch_grains:
|
||||
if check_error:
|
||||
with pytest.raises(FileNotFoundError):
|
||||
restartcheck.restartcheck()
|
||||
else:
|
||||
ret = restartcheck.restartcheck()
|
||||
assert "Found 1 processes using old versions of upgraded files" in ret
|
||||
assert not os.path.exists(create_file)
|
||||
|
||||
|
||||
def test_valid_command_b():
|
||||
"""
|
||||
test for CVE-2020-28243
|
||||
"""
|
||||
create_file = os.path.join(SALT_CODE_DIR, "created_file")
|
||||
|
||||
patch_kernel = patch(
|
||||
"salt.modules.restartcheck._kernel_versions_redhat",
|
||||
return_value=["3.10.0-1127.el7.x86_64"],
|
||||
)
|
||||
services = {
|
||||
"NetworkManager": {"ExecMainPID": 123},
|
||||
"auditd": {"ExecMainPID": 456},
|
||||
"crond": {"ExecMainPID": 789},
|
||||
}
|
||||
|
||||
patch_salt = patch.dict(
|
||||
restartcheck.__salt__,
|
||||
{
|
||||
"cmd.run": MagicMock(
|
||||
return_value="Linux localhost.localdomain 3.10.0-1127.el7.x86_64"
|
||||
),
|
||||
"service.get_running": MagicMock(return_value=list(services.keys())),
|
||||
"service.show": MagicMock(side_effect=list(services.values())),
|
||||
"pkg.owner": MagicMock(return_value=""),
|
||||
"service.available": MagicMock(return_value=True),
|
||||
},
|
||||
)
|
||||
|
||||
patch_deleted = patch(
|
||||
"salt.modules.restartcheck._deleted_files",
|
||||
MagicMock(return_value=[("--admindir tmp dpkg", 123, "/root/ (deleted)")]),
|
||||
)
|
||||
|
||||
patch_readlink = patch("os.readlink", return_value="--admindir tmp dpkg")
|
||||
|
||||
popen_mock = MagicMock()
|
||||
popen_mock.return_value.stdout.readline.side_effect = ["/usr/bin\n", ""]
|
||||
patch_popen = patch("subprocess.Popen", popen_mock)
|
||||
|
||||
patch_grains = patch.dict(restartcheck.__grains__, {"os_family": "RedHat"})
|
||||
with patch_kernel, patch_salt, patch_deleted, patch_readlink, patch_grains, patch_popen:
|
||||
ret = restartcheck.restartcheck()
|
||||
assert "Found 1 processes using old versions of upgraded files" in ret
|
||||
popen_mock.assert_called_with(
|
||||
["repoquery", "-l", "--admindir tmp dpkg"], stdout=ANY
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,433 +0,0 @@
|
|||
"""
|
||||
:codeauthor: :email:`David Homolka <david.homolka@ultimum.io>`
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
import salt.modules.restartcheck as restartcheck
|
||||
import salt.utils.path
|
||||
from tests.support.mixins import LoaderModuleMockMixin
|
||||
from tests.support.mock import ANY, MagicMock, patch
|
||||
from tests.support.runtests import RUNTIME_VARS
|
||||
from tests.support.unit import TestCase
|
||||
|
||||
|
||||
class RestartcheckTestCase(TestCase, LoaderModuleMockMixin):
|
||||
"""
|
||||
Test cases for salt.modules.restartcheck
|
||||
"""
|
||||
|
||||
def setup_loader_modules(self):
|
||||
return {restartcheck: {}}
|
||||
|
||||
def test_kernel_versions_debian(self):
|
||||
"""
|
||||
Test kernel version debian
|
||||
"""
|
||||
mock = MagicMock(return_value=" Installed: 4.9.82-1+deb9u3")
|
||||
with patch.dict(restartcheck.__grains__, {"os": "Debian"}):
|
||||
with patch.dict(restartcheck.__salt__, {"cmd.run": mock}):
|
||||
self.assertListEqual(
|
||||
restartcheck._kernel_versions_debian(), ["4.9.82-1+deb9u3"]
|
||||
)
|
||||
|
||||
def test_kernel_versions_ubuntu(self):
|
||||
"""
|
||||
Test kernel version ubuntu
|
||||
"""
|
||||
mock = MagicMock(return_value=" Installed: 4.10.0-42.46")
|
||||
with patch.dict(restartcheck.__grains__, {"os": "Ubuntu"}):
|
||||
with patch.dict(restartcheck.__salt__, {"cmd.run": mock}):
|
||||
self.assertListEqual(
|
||||
restartcheck._kernel_versions_debian(),
|
||||
[
|
||||
"4.10.0-42.46",
|
||||
"4.10.0-42-generic #46",
|
||||
"4.10.0-42-lowlatency #46",
|
||||
],
|
||||
)
|
||||
|
||||
def test_kernel_versions_redhat(self):
|
||||
"""
|
||||
Test if it return a data structure of the current, in-memory rules
|
||||
"""
|
||||
mock = MagicMock(
|
||||
return_value=(
|
||||
"kernel-3.10.0-862.el7.x86_64 Thu Apr 5 00:40:00 2018"
|
||||
)
|
||||
)
|
||||
with patch.dict(restartcheck.__salt__, {"cmd.run": mock}):
|
||||
self.assertListEqual(
|
||||
restartcheck._kernel_versions_redhat(), ["3.10.0-862.el7.x86_64"]
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_deleted(self):
|
||||
"""
|
||||
Test (deleted) file
|
||||
"""
|
||||
self.assertTrue(restartcheck._valid_deleted_file("/usr/lib/test (deleted)"))
|
||||
|
||||
def test_valid_deleted_file_psth_inode(self):
|
||||
"""
|
||||
Test (path inode=1) file
|
||||
"""
|
||||
self.assertTrue(
|
||||
restartcheck._valid_deleted_file("/usr/lib/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_log(self):
|
||||
"""
|
||||
Test /var/log/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/log/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/log/test (deleted)"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/log/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_local_log(self):
|
||||
"""
|
||||
Test /var/local/log/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/local/log/test"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/local/log/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/local/log/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_run(self):
|
||||
"""
|
||||
Test /var/run/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/run/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/run/test (deleted)"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/run/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_local_run(self):
|
||||
"""
|
||||
Test /var/local/run/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/local/run/test"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/local/run/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/local/run/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_tmp(self):
|
||||
"""
|
||||
Test /tmp/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/tmp/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/tmp/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/tmp/test (path inode=1)"))
|
||||
|
||||
def test_valid_deleted_file_dev_shm(self):
|
||||
"""
|
||||
Test /dev/shm/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/dev/shm/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/dev/shm/test (deleted)"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/dev/shm/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_run(self):
|
||||
"""
|
||||
Test /run/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/run/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/run/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/run/test (path inode=1)"))
|
||||
|
||||
def test_valid_deleted_file_drm(self):
|
||||
"""
|
||||
Test /drm/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/drm/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/drm/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/drm/test (path inode=1)"))
|
||||
|
||||
def test_valid_deleted_file_var_tmp(self):
|
||||
"""
|
||||
Test /var/tmp/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/tmp/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/tmp/test (deleted)"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/tmp/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_local_tmp(self):
|
||||
"""
|
||||
Test /var/local/tmp/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/local/tmp/test"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/local/tmp/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/local/tmp/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_dev_zero(self):
|
||||
"""
|
||||
Test /dev/zero/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/dev/zero/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/dev/zero/test (deleted)"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/dev/zero/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_dev_pts(self):
|
||||
"""
|
||||
Test /dev/pts/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/dev/pts/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/dev/pts/test (deleted)"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/dev/pts/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_usr_lib_locale(self):
|
||||
"""
|
||||
Test /usr/lib/locale/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/usr/lib/locale/test"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/usr/lib/locale/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/usr/lib/locale/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_home(self):
|
||||
"""
|
||||
Test /home/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/home/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/home/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/home/test (path inode=1)"))
|
||||
|
||||
def test_valid_deleted_file_icon_theme_cache(self):
|
||||
"""
|
||||
Test /test.icon-theme.cache
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/dev/test.icon-theme.cache"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/dev/test.icon-theme.cache (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file(
|
||||
"/dev/test.icon-theme.cache (path inode=1)"
|
||||
)
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_cache_fontconfig(self):
|
||||
"""
|
||||
Test /var/cache/fontconfig/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/cache/fontconfig/test"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/cache/fontconfig/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file(
|
||||
"/var/cache/fontconfig/test (path inode=1)"
|
||||
)
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_lib_nagios3_spool(self):
|
||||
"""
|
||||
Test /var/lib/nagios3/spool/
|
||||
"""
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/lib/nagios3/spool/test")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/lib/nagios3/spool/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file(
|
||||
"/var/lib/nagios3/spool/test (path inode=1)"
|
||||
)
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_lib_nagios3_spool_checkresults(self):
|
||||
"""
|
||||
Test /var/lib/nagios3/spool/checkresults/
|
||||
"""
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/lib/nagios3/spool/checkresults/test")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file(
|
||||
"/var/lib/nagios3/spool/checkresults/test (deleted)"
|
||||
)
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file(
|
||||
"/var/lib/nagios3/spool/checkresults/test (path inode=1)"
|
||||
)
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_lib_postgresql(self):
|
||||
"""
|
||||
Test /var/lib/postgresql/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/lib/postgresql/test"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/lib/postgresql/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/lib/postgresql/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_var_lib_vdr(self):
|
||||
"""
|
||||
Test /var/lib/vdr/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/var/lib/vdr/test"))
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/lib/vdr/test (deleted)")
|
||||
)
|
||||
self.assertFalse(
|
||||
restartcheck._valid_deleted_file("/var/lib/vdr/test (path inode=1)")
|
||||
)
|
||||
|
||||
def test_valid_deleted_file_aio(self):
|
||||
"""
|
||||
Test /[aio]/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/opt/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/opt/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/opt/test (path inode=1)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/apt/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/apt/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/apt/test (path inode=1)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/ipt/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/ipt/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/ipt/test (path inode=1)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/aio/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/aio/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/aio/test (path inode=1)"))
|
||||
|
||||
def test_valid_deleted_file_sysv(self):
|
||||
"""
|
||||
Test /SYSV/
|
||||
"""
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/SYSV/test"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/SYSV/test (deleted)"))
|
||||
self.assertFalse(restartcheck._valid_deleted_file("/SYSV/test (path inode=1)"))
|
||||
|
||||
def test_valid_command(self):
|
||||
"""
|
||||
test for CVE-2020-28243
|
||||
"""
|
||||
create_file = os.path.join(RUNTIME_VARS.TMP, "created_file")
|
||||
|
||||
patch_kernel = patch(
|
||||
"salt.modules.restartcheck._kernel_versions_redhat",
|
||||
return_value=["3.10.0-1127.el7.x86_64"],
|
||||
)
|
||||
services = {
|
||||
"NetworkManager": {"ExecMainPID": 123},
|
||||
"auditd": {"ExecMainPID": 456},
|
||||
"crond": {"ExecMainPID": 789},
|
||||
}
|
||||
|
||||
patch_salt = patch.dict(
|
||||
restartcheck.__salt__,
|
||||
{
|
||||
"cmd.run": MagicMock(
|
||||
return_value="Linux localhost.localdomain 3.10.0-1127.el7.x86_64"
|
||||
),
|
||||
"service.get_running": MagicMock(return_value=list(services.keys())),
|
||||
"service.show": MagicMock(side_effect=list(services.values())),
|
||||
"pkg.owner": MagicMock(return_value=""),
|
||||
"service.available": MagicMock(return_value=True),
|
||||
},
|
||||
)
|
||||
|
||||
patch_deleted = patch(
|
||||
"salt.modules.restartcheck._deleted_files",
|
||||
MagicMock(
|
||||
return_value=[
|
||||
(";touch {};".format(create_file), 123, "/root/ (deleted)")
|
||||
]
|
||||
),
|
||||
)
|
||||
|
||||
patch_readlink = patch(
|
||||
"os.readlink", return_value="/root/;touch {};".format(create_file)
|
||||
)
|
||||
|
||||
check_error = True
|
||||
if salt.utils.path.which("repoquery"):
|
||||
check_error = False
|
||||
|
||||
patch_grains = patch.dict(restartcheck.__grains__, {"os_family": "RedHat"})
|
||||
with patch_kernel, patch_salt, patch_deleted, patch_readlink, patch_grains:
|
||||
if check_error:
|
||||
with self.assertRaises(FileNotFoundError):
|
||||
restartcheck.restartcheck()
|
||||
else:
|
||||
ret = restartcheck.restartcheck()
|
||||
self.assertIn(
|
||||
"Found 1 processes using old versions of upgraded files", ret
|
||||
)
|
||||
self.assertFalse(os.path.exists(create_file))
|
||||
|
||||
def test_valid_command_b(self):
|
||||
"""
|
||||
test for CVE-2020-28243
|
||||
"""
|
||||
create_file = os.path.join(RUNTIME_VARS.TMP, "created_file")
|
||||
|
||||
patch_kernel = patch(
|
||||
"salt.modules.restartcheck._kernel_versions_redhat",
|
||||
return_value=["3.10.0-1127.el7.x86_64"],
|
||||
)
|
||||
services = {
|
||||
"NetworkManager": {"ExecMainPID": 123},
|
||||
"auditd": {"ExecMainPID": 456},
|
||||
"crond": {"ExecMainPID": 789},
|
||||
}
|
||||
|
||||
patch_salt = patch.dict(
|
||||
restartcheck.__salt__,
|
||||
{
|
||||
"cmd.run": MagicMock(
|
||||
return_value="Linux localhost.localdomain 3.10.0-1127.el7.x86_64"
|
||||
),
|
||||
"service.get_running": MagicMock(return_value=list(services.keys())),
|
||||
"service.show": MagicMock(side_effect=list(services.values())),
|
||||
"pkg.owner": MagicMock(return_value=""),
|
||||
"service.available": MagicMock(return_value=True),
|
||||
},
|
||||
)
|
||||
|
||||
patch_deleted = patch(
|
||||
"salt.modules.restartcheck._deleted_files",
|
||||
MagicMock(return_value=[("--admindir tmp dpkg", 123, "/root/ (deleted)")]),
|
||||
)
|
||||
|
||||
patch_readlink = patch("os.readlink", return_value="--admindir tmp dpkg")
|
||||
|
||||
popen_mock = MagicMock()
|
||||
popen_mock.return_value.stdout.readline.side_effect = ["/usr/bin\n", ""]
|
||||
patch_popen = patch("subprocess.Popen", popen_mock)
|
||||
|
||||
patch_grains = patch.dict(restartcheck.__grains__, {"os_family": "RedHat"})
|
||||
with patch_kernel, patch_salt, patch_deleted, patch_readlink, patch_grains, patch_popen:
|
||||
ret = restartcheck.restartcheck()
|
||||
self.assertIn("Found 1 processes using old versions of upgraded files", ret)
|
||||
popen_mock.assert_called_with(
|
||||
["repoquery", "-l", "--admindir tmp dpkg"], stdout=ANY
|
||||
)
|
||||
Loading…
Add table
Reference in a new issue