sos updates to 8.9

Resolves: bz2143272 bz2177282 bz2184062

Signed-off-by: Jan Jansky <jjansky@redhat.com>

.gitignore

@@ -4,3 +4,4 @@
 /sos-4.4.tar.gz
 /sos-4.5.0.tar.gz
 /sos-4.5.1.tar.gz
+/sos-4.5.3.tar.gz

sos-bz2175650-microshift-plugin-oc-command.patch

@@ -1,46 +0,0 @@
-From ff5e73b29b1fcc4c5531654d4f67f808408aa989 Mon Sep 17 00:00:00 2001
-From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
-Date: Thu, 2 Mar 2023 12:12:06 +0100
-Subject: [PATCH] [microshift] Fix microshift get and add commands
-
-Drop microshift get usage in favor of oc get commands.
-Add version and show-config commands before running inspect.
-
-Closes https://issues.redhat.com/browse/USHIFT-932
-
-Signed-off-by: Pablo Acevedo Montserrat <pacevedo@redhat.com>
----
- sos/report/plugins/microshift.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/sos/report/plugins/microshift.py b/sos/report/plugins/microshift.py
-index 953eb88e..69981d63 100644
---- a/sos/report/plugins/microshift.py
-+++ b/sos/report/plugins/microshift.py
-@@ -86,9 +86,10 @@ class Microshift(Plugin, RedHatPlugin):
- 
-     def _get_namespaces(self):
-         res = self.exec_cmd(
--            'microshift get namespaces'
-+            'oc get namespaces'
-             ' -o custom-columns=NAME:.metadata.name'
--            ' --no-headers')
-+            ' --no-headers'
-+            ' --kubeconfig=%s' % self.get_option('kubeconfig'))
-         if res['status'] == 0:
-             return self._reduce_namespace_list(res['output'].split('\n'))
-         return []
-@@ -146,6 +147,10 @@ class Microshift(Plugin, RedHatPlugin):
-         which is used to retrieve all API resources from the cluster.
-         """
-         self.add_forbidden_path('/var/lib/microshift')
-+        self.add_cmd_output([
-+            'microshift version',
-+            'microshift show-config -m effective'
-+        ])
- 
-         _cluster_resources_to_collect = ",".join(
-             self._get_cluster_resources())
--- 
-2.39.2
-

sos-bz2176086-iprconfig-sg-kmod.patch

@@ -1,56 +0,0 @@
-From e8dc0e55988b36d0476bcae741652208356f0f07 Mon Sep 17 00:00:00 2001
-From: Pavel Moravec <pmoravec@redhat.com>
-Date: Tue, 7 Mar 2023 10:10:33 +0100
-Subject: [PATCH] [iprconfig] guard whole plugin by sg kmod predicate
-
-Calling any iprconfig command loads 'sg' kernel module. So guard
-collecting anything from the plugin by that kmod predicate.
-
-Resolves: #3159
-
-Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
----
- sos/report/plugins/iprconfig.py | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/sos/report/plugins/iprconfig.py b/sos/report/plugins/iprconfig.py
-index 6b4fb895..a304107f 100644
---- a/sos/report/plugins/iprconfig.py
-+++ b/sos/report/plugins/iprconfig.py
-@@ -9,7 +9,7 @@
- # This plugin enables collection of logs for Power systems
- 
- import re
--from sos.report.plugins import Plugin, IndependentPlugin
-+from sos.report.plugins import Plugin, IndependentPlugin, SoSPredicate
- 
- 
- class IprConfig(Plugin, IndependentPlugin):
-@@ -22,6 +22,13 @@ class IprConfig(Plugin, IndependentPlugin):
- 
-     def setup(self):
- 
-+        show_ioas = self.collect_cmd_output(
-+                "iprconfig -c show-ioas",
-+                pred=SoSPredicate(self, kmods=['sg'])
-+        )
-+        if not show_ioas['status'] == 0:
-+            return
-+
-         self.add_cmd_output([
-             "iprconfig -c show-config",
-             "iprconfig -c show-alt-config",
-@@ -35,10 +42,6 @@ class IprConfig(Plugin, IndependentPlugin):
-             "iprconfig -c dump"
-         ])
- 
--        show_ioas = self.collect_cmd_output("iprconfig -c show-ioas")
--        if not show_ioas['status'] == 0:
--            return
--
-         devices = []
-         if show_ioas['output']:
-             p = re.compile('sg')
--- 
-2.39.2
-

sos-bz2176218-sos-clean-tmp.patch

@@ -1,85 +0,0 @@
-From d4d4d5509fe4f0e29260b33a1c51bf62297ef0b9 Mon Sep 17 00:00:00 2001
-From: Pavel Moravec <pmoravec@redhat.com>
-Date: Tue, 7 Mar 2023 13:16:02 +0100
-Subject: [PATCH 1/2] [cleaner] dont clean sys_tmp from final_path
-
-When generating location of final tarball, apply cleaner obfuscation to
-the filename but not to the tmp path itself. Otherwise
-
-sos clean --keywords tmp
-
-fails in attempt to move file to nonexisting /var/obfuscatedword0
-directory.
-
-Resolves: #3160
-
-Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
----
- sos/cleaner/__init__.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/sos/cleaner/__init__.py b/sos/cleaner/__init__.py
-index d3e32992..b8e4aafd 100644
---- a/sos/cleaner/__init__.py
-+++ b/sos/cleaner/__init__.py
-@@ -400,8 +400,9 @@ third party.
-                     cf.write(checksum)
-             self.write_cleaner_log()
- 
--        final_path = self.obfuscate_string(
--            os.path.join(self.sys_tmp, arc_path.split('/')[-1])
-+        final_path = os.path.join(
-+            self.sys_tmp,
-+            self.obfuscate_string(arc_path.split('/')[-1])
-         )
-         shutil.move(arc_path, final_path)
-         arcstat = os.stat(final_path)
--- 
-2.39.2
-
-
-From 622a26ee2faff91df03532892ca386c39e36a5fe Mon Sep 17 00:00:00 2001
-From: Pavel Moravec <pmoravec@redhat.com>
-Date: Tue, 7 Mar 2023 17:55:19 +0100
-Subject: [PATCH 2/2] [tests] add a test covering #3160
-
-Run the cleaner tests with obfuscating (also) "tmp" to cover files
-handling under sys_tmp.
-
-Related to: #3160
-
-Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
----
- tests/cleaner_tests/existing_archive.py | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/tests/cleaner_tests/existing_archive.py b/tests/cleaner_tests/existing_archive.py
-index e13d1cae..7f31f88e 100644
---- a/tests/cleaner_tests/existing_archive.py
-+++ b/tests/cleaner_tests/existing_archive.py
-@@ -89,3 +89,22 @@ class ExistingArchiveCleanTest(StageTwoReportTest):
-         """Ensure that the 'testuser1' user created at install is obfuscated
-         """
-         self.assertFileNotHasContent('var/log/anaconda/journal.log', 'testuser1')
-+
-+class ExistingArchiveCleanTmpTest(StageTwoReportTest):
-+    """Continuation of above tests which requires cleaning var / tmp keywords
-+
-+    Note that this copies heavily from the full_report_run test.
-+
-+    :avocado: tags=stagetwo
-+    """
-+
-+    sos_cmd = '-v --keywords var,tmp,avocado --disable-parsers ip,ipv6,mac,username \
-+        --no-update tests/test_data/%s.tar.xz' % ARCHIVE
-+    sos_component = 'clean'
-+
-+    def test_sys_tmp_not_obfuscated(self):
-+        """ Ensure that keywords var, tmp and avocado remains in the final archive
-+        path despite they are parts of the --tmp-dir
-+        """
-+        self.assertTrue(self.archive.startswith(os.getenv('AVOCADO_TESTS_COMMON_TMPDIR')))
-+
--- 
-2.39.2
-

sos.spec

@@ -4,28 +4,23 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.5.1
+Version: 4.5.3
-Release: 3%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
-License: GPLv2+
+License: GPL-2.0-or-later
 BuildArch: noarch
 Url: https://github.com/sosreport/sos
 BuildRequires: python3-devel
 BuildRequires: gettext
 BuildRequires: python3-setuptools
-Requires: bzip2
-Requires: xz
 Requires: python3-requests
 Recommends: python3-magic
 Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector
-Patch1: sos-bz2175650-microshift-plugin-oc-command.patch
-Patch2: sos-bz2176086-iprconfig-sg-kmod.patch
-Patch3: sos-bz2176218-sos-clean-tmp.patch
 
 
 %description
@@ -37,9 +32,6 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 
 %build
@@ -47,8 +39,11 @@ support technicians and developers.
 
 %install
 %py3_install '--install-scripts=%{_sbindir}'
-
+rm -f %{buildroot}/usr/config/sos.conf
+rm -f %{buildroot}/usr/config/tmpfilesd-sos-rh.conf
 install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
+install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 
 %find_lang %{name} || echo 0
 
@@ -67,6 +62,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
 %dir /etc/sos/presets.d
 %dir /etc/sos/extras.d
 %dir /etc/sos/groups.d
+/etc/tmpfiles.d/%{name}.conf
 %{python3_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
 %{_mandir}/man1/sos-clean.1.gz
@@ -81,7 +77,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/sos/sos.conf
 %config(noreplace) %{_sysconfdir}/sos/cleaner
-%config /usr/config/sos.conf
 
 %package audit
 Summary: Audit use of some commands for support purposes
@@ -110,6 +105,14 @@ of the system. Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
 %changelog
+* Fri May 05 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
+- [report] Ignore case when scrubbing via do_file_sub
+  Resolves: bz2143272
+- [subscription_manager] Scrub proxy passwords from repo_server_val
+  Resolves: bz2177282
+- [virsh] Scrub passwords in virt-manager logs
+  Resolves: bz2184062
+
 * Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
 - Rebase on upstream 4.5.1
   Resolves: bz2175806

sources

@@ -1,2 +1,2 @@
-SHA512 (sos-4.5.1.tar.gz) = d42b6a236acac69050141109add54913b33f827f410c9b74c14d3b54d2fea2f9d9d8fc8195b85807149c5c0e6c92e3513f935c2d30d00094ead748f6fee38be5
+SHA512 (sos-4.5.3.tar.gz) = c3864a0589b3c278b98023e6814407e401f8afd6a5a8d346fa561e179f3b09ee2d94504b171251a0789b1dff147963f6a1deb32851c22a1e4ba11d92e806b9b1
 SHA512 (sos-audit-0.3.tgz) = 32597baf6350804d08179a0dbe48470a93df148e83d2e49bb3288f6bcc2d151bb1433761913bfbccd912c14de92435939fef5bcd7e091dfe33a345d61ea842ea