From b805fb000c0f257c74de8bc7a00f96bba9c16541 Mon Sep 17 00:00:00 2001 From: Jake Hunsaker Date: Fri, 7 Oct 2022 12:11:00 -0400 Subject: [krb5] Enable on Ubuntu/Debian, expand package tuple It was found that the `krb5` plugin was not executing on Ubuntu/Debian systems due to a legacy change that inadvertently removed support for those distributions. Re-enable support by defining a new plugin class for those distros, setting the kdc directory appropriately. Additionally, expand the package tuple to include newer package names. Closes: #3041 Signed-off-by: Jake Hunsaker --- tests/report_tests/plugin_tests/krb5.py | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 tests/report_tests/plugin_tests/krb5.py (limited to 'tests/report_tests') diff --git a/tests/report_tests/plugin_tests/krb5.py b/tests/report_tests/plugin_tests/krb5.py new file mode 100644 index 00000000..ab6b2379 --- /dev/null +++ b/tests/report_tests/plugin_tests/krb5.py @@ -0,0 +1,39 @@ +# This file is part of the sos project: https://github.com/sosreport/sos +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# version 2 of the GNU General Public License. +# +# See the LICENSE file in the source distribution for further information. + + +from sos_tests import StageTwoReportTest, redhat_only, ubuntu_only + +class Krb5PluginTest(StageTwoReportTest): + """Ensure that the krb5 plugin activates for the distros that we support it + on. + + See https://github.com/sosreport/sos/issues/3041 + + :avocado: tags=stageone + """ + + sos_cmd = '-o krb5' + packages = { + 'rhel': ['krb5-libs', 'krb5-server'], + 'Ubuntu': ['krb5-user', 'krb5-kdc'] + } + + def test_plugin_ran(self): + self.assertPluginIncluded('krb5') + + def test_conf_collected(self): + self.assertFileCollected('/etc/krb5.conf') + + @ubuntu_only + def test_ubuntu_kdcdir_collected(self): + self.assertFileGlobInArchive('/var/lib/krb5kdc/*') + + @redhat_only + def test_redhat_kdcdir_collected(self): + self.assertFileGlobInArchive('/var/kerberos/krb5kdc/*') -- cgit