Auto sync2gitlab import of sos-4.4-3.el8.src.rpm
This commit is contained in:
parent
7dd86d1132
commit
ca2566d8d9
79
sos-bz2138173-clean-host-before-domain.patch
Normal file
79
sos-bz2138173-clean-host-before-domain.patch
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
From 21101d80610c43a7c00de3dfaa5ff043d1f8324a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pavel Moravec <pmoravec@redhat.com>
|
||||||
|
Date: Thu, 27 Oct 2022 18:00:28 +0200
|
||||||
|
Subject: [PATCH] [cleaner] Apply compile_regexes after a regular parse line
|
||||||
|
|
||||||
|
Hostname parser treats strings like 'host.domain.com' with precompiled
|
||||||
|
domain 'domain.com' in a wrong way. It first obfuscates the domain while
|
||||||
|
subsequent _parse_line skips host obfuscation.
|
||||||
|
|
||||||
|
Calling _parse_line before _parse_line_with_compiled_regexes does clean
|
||||||
|
both the host name and the domain name well.
|
||||||
|
|
||||||
|
Adding a unittest with a reproducer.
|
||||||
|
|
||||||
|
Resolves: #3054
|
||||||
|
|
||||||
|
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
||||||
|
---
|
||||||
|
sos/cleaner/parsers/hostname_parser.py | 19 +++++++++++++++++++
|
||||||
|
tests/unittests/cleaner_tests.py | 7 +++++++
|
||||||
|
2 files changed, 26 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/sos/cleaner/parsers/hostname_parser.py b/sos/cleaner/parsers/hostname_parser.py
|
||||||
|
index debdf182..07eb40f6 100644
|
||||||
|
--- a/sos/cleaner/parsers/hostname_parser.py
|
||||||
|
+++ b/sos/cleaner/parsers/hostname_parser.py
|
||||||
|
@@ -8,6 +8,7 @@
|
||||||
|
#
|
||||||
|
# See the LICENSE file in the source distribution for further information.
|
||||||
|
|
||||||
|
+import re
|
||||||
|
from sos.cleaner.parsers import SoSCleanerParser
|
||||||
|
from sos.cleaner.mappings.hostname_map import SoSHostnameMap
|
||||||
|
|
||||||
|
@@ -29,6 +30,24 @@ class SoSHostnameParser(SoSCleanerParser):
|
||||||
|
self.load_short_names_from_mapping()
|
||||||
|
self.mapping.set_initial_counts()
|
||||||
|
|
||||||
|
+ def parse_line(self, line):
|
||||||
|
+ """This will be called for every line in every file we process, so that
|
||||||
|
+ every parser has a chance to scrub everything.
|
||||||
|
+
|
||||||
|
+ We are overriding parent method since we need to swap ordering of
|
||||||
|
+ _parse_line_with_compiled_regexes and _parse_line calls.
|
||||||
|
+ """
|
||||||
|
+ count = 0
|
||||||
|
+ for skip_pattern in self.skip_line_patterns:
|
||||||
|
+ if re.match(skip_pattern, line, re.I):
|
||||||
|
+ return line, count
|
||||||
|
+ line, _count = self._parse_line(line)
|
||||||
|
+ count += _count
|
||||||
|
+ if self.compile_regexes:
|
||||||
|
+ line, _rcount = self._parse_line_with_compiled_regexes(line)
|
||||||
|
+ count += _rcount
|
||||||
|
+ return line, count
|
||||||
|
+
|
||||||
|
def load_short_names_from_mapping(self):
|
||||||
|
"""When we load the mapping file into the hostname map, we have to do
|
||||||
|
some dancing to get those loaded properly into the "intermediate" dicts
|
||||||
|
diff --git a/tests/unittests/cleaner_tests.py b/tests/unittests/cleaner_tests.py
|
||||||
|
index d27481c1..9759b38a 100644
|
||||||
|
--- a/tests/unittests/cleaner_tests.py
|
||||||
|
+++ b/tests/unittests/cleaner_tests.py
|
||||||
|
@@ -171,6 +171,13 @@ class CleanerParserTests(unittest.TestCa
|
||||||
|
_test = self.host_parser.parse_line(line)[0]
|
||||||
|
self.assertNotEqual(line, _test)
|
||||||
|
|
||||||
|
+ def test_obfuscate_whole_fqdn_for_given_domainname(self):
|
||||||
|
+ self.host_parser.load_hostname_into_map('sostestdomain.domain')
|
||||||
|
+ line = 'let obfuscate soshost.sostestdomain.domain'
|
||||||
|
+ _test = self.host_parser.parse_line(line)[0]
|
||||||
|
+ self.assertFalse('soshost' in _test)
|
||||||
|
+ self.assertFalse('sostestdomain' in _test)
|
||||||
|
+
|
||||||
|
def test_keyword_parser_valid_line(self):
|
||||||
|
line = 'this is my foobar test line'
|
||||||
|
_test = self.kw_parser.parse_line(line)[0]
|
||||||
|
--
|
||||||
|
2.37.3
|
9
sos.spec
9
sos.spec
@ -5,7 +5,7 @@
|
|||||||
Summary: A set of tools to gather troubleshooting information from a system
|
Summary: A set of tools to gather troubleshooting information from a system
|
||||||
Name: sos
|
Name: sos
|
||||||
Version: 4.4
|
Version: 4.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
||||||
Source1: sos-audit-%{auditversion}.tgz
|
Source1: sos-audit-%{auditversion}.tgz
|
||||||
@ -19,10 +19,12 @@ Requires: xz
|
|||||||
Requires: python3-requests
|
Requires: python3-requests
|
||||||
Recommends: python3-magic
|
Recommends: python3-magic
|
||||||
Recommends: python3-pexpect
|
Recommends: python3-pexpect
|
||||||
|
Recommends: python3-pyyaml
|
||||||
Conflicts: vdsm < 4.40
|
Conflicts: vdsm < 4.40
|
||||||
Obsoletes: sos-collector
|
Obsoletes: sos-collector
|
||||||
Patch1: sos-bz2129038-relax-magic-dep.patch
|
Patch1: sos-bz2129038-relax-magic-dep.patch
|
||||||
Patch2: sos-bz2100154-yum-legacy-links.patch
|
Patch2: sos-bz2100154-yum-legacy-links.patch
|
||||||
|
Patch3: sos-bz2138173-clean-host-before-domain.patch
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -36,6 +38,7 @@ support technicians and developers.
|
|||||||
%setup -T -D -a1 -q
|
%setup -T -D -a1 -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -104,6 +107,10 @@ of the system. Currently storage and filesystem commands are audited.
|
|||||||
%ghost /etc/audit/rules.d/40-sos-storage.rules
|
%ghost /etc/audit/rules.d/40-sos-storage.rules
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 28 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-3
|
||||||
|
- [cleaner] Apply compile_regexes after a regular parse line
|
||||||
|
Resolves: bz2138173
|
||||||
|
|
||||||
* Thu Sep 22 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-2
|
* Thu Sep 22 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-2
|
||||||
- [utilities] Relax from hard dependency of python3-magic
|
- [utilities] Relax from hard dependency of python3-magic
|
||||||
Resolves: bz2129038
|
Resolves: bz2129038
|
||||||
|
Loading…
Reference in New Issue
Block a user