import sos-4.8.1-1.el8_10

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/sos-4.7.2.tar.gz
+SOURCES/sos-4.8.1.tar.gz
 SOURCES/sos-audit-0.3.tgz

.sos.metadata

@@ -1,2 +1,2 @@
-e01a25f05322cf56b75e07b5102dd61dbd4f0869 SOURCES/sos-4.7.2.tar.gz
+26aee6ec0ad73c12a4ad0cf50c02082777d654cc SOURCES/sos-4.8.1.tar.gz
 9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz

SOURCES/sos-RHEL-22732-reverted.patch

@@ -1,77 +0,0 @@
-From 11879fbb1adc33d8abc0cb70dc63e7e88c39fc3f Mon Sep 17 00:00:00 2001
-From: Jose Castillo <jcastillo@redhat.com>
-Date: Wed, 21 Feb 2024 12:24:37 +0000
-Subject: [PATCH] [redhat|policy] Check for archive size before upload
-
-The Red Hat Customer Portal has a max limit for
-single http requests of 1Gb. From sos side, we never checked this
-and so customers had to wait for the whole upload to be attempted
-before receiving an error from the portal.
-This patch attempts to stop the upload before it starts, informing
-customers of such limit, and switching to secure FTP where there's
-no limit.
-
-Related: RHEL-22732
-
-Signed-off-by: Jose Castillo <jcastillo@redhat.com>
----
- sos/policies/distros/redhat.py | 29 +++++++++++++++++++++++------
- 1 file changed, 23 insertions(+), 6 deletions(-)
-
-diff --git a/sos/policies/distros/redhat.py b/sos/policies/distros/redhat.py
-index edea151e2..2fb0df3fa 100644
---- a/sos/policies/distros/redhat.py
-+++ b/sos/policies/distros/redhat.py
-@@ -22,7 +22,7 @@
- from sos.policies.package_managers.rpm import RpmPackageManager
- from sos.policies.package_managers.flatpak import FlatpakPackageManager
- from sos.policies.package_managers import MultiPackageManager
--from sos.utilities import bold
-+from sos.utilities import bold, convert_bytes
- from sos import _sos as _
- 
- try:
-@@ -232,6 +232,8 @@ class RHELPolicy(RedHatPolicy):
-     _upload_url = RH_SFTP_HOST
-     _upload_method = 'post'
-     _device_token = None
-+    # Max size for an http single request is 1Gb
-+    _max_size_request = 1073741824
- 
-     def __init__(self, sysroot=None, init=None, probe_runtime=True,
-                  remote_exec=None):
-@@ -429,15 +429,30 @@ support representative.
-             return super().upload_sftp(user=_user, password=_token)
-         raise Exception("Could not retrieve valid or anonymous credentials")
- 
-+    def check_file_too_big(self, archive):
-+        size = os.path.getsize(archive)
-+        # Lets check if the size is bigger than the limit.
-+        # There's really no need to transform the size to Gb,
-+        # so we don't need to call any size converter implemented
-+        # in tools.py
-+        if (size >= self._max_size_request):
-+            self.ui_log.warning(
-+                _("Size of archive is bigger than Red Hat Customer Portal "
-+                  "limit for uploads of "
-+                  f"{convert_bytes(self._max_size_request)} "
-+                  " via sos http upload. \n")
-+                  )
-+            return RH_SFTP_HOST
-+        else:
-+            return RH_API_HOST
-+
-     def upload_archive(self, archive):
-         """Override the base upload_archive to provide for automatic failover
-         from RHCP failures to the public RH dropbox
-         """
-         try:
--            if self.upload_url and self.upload_url.startswith(RH_API_HOST) and\
--                    (not self.get_upload_user() or
--                     not self.get_upload_password()):
--                self.upload_url = RH_SFTP_HOST
-+            if self.get_upload_url().startswith(RH_API_HOST):
-+                self.upload_url = self.check_file_too_big(archive)
-             uploaded = super().upload_archive(archive)
-         except Exception as e:
-             uploaded = False

SPECS/sos.spec

@@ -4,8 +4,8 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.7.2
+Version: 4.8.1
-Release: 2%{?dist}.inferit
+Release: 1%{?dist}.inferit
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -22,7 +22,6 @@ Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector
-Patch0: sos-RHEL-22732-reverted.patch
 
 # MSVSphere patches
 Patch1001: 0001-Add-MSVSphere-policy-implementation.patch
@@ -36,7 +35,6 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
-%patch0 -p1 -R
 %patch1001 -p1
 
 %build
@@ -110,6 +108,22 @@ of the system. Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
 %changelog
+* Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1
+- Update to 4.8.1 in RHEL 8
+  Resolves: RHEL-64160
+
+* Fri Sep 27 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-3
+- Added credentials obfuscation from multiple files
+  Resolves: RHEL-58097
+
+* Sat Sep 14 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-2
+- Resolves: RHEL-22732
+  Fix wrong formatting
+
+* Mon Sep 09 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-1
+- New upstream release
+  Resolves: RHEL-58097
+
 * Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-2
 - reverting RHEL-22732 patch due to regressions
   Resolves: RHEL-49779