|
 |
15b4e2 |
From 0b81b7ef780171af4431db656809f10d1683bc4c Mon Sep 17 00:00:00 2001
|
|
|
15b4e2 |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
15b4e2 |
Date: Tue, 20 Sep 2022 22:11:48 +0200
|
|
|
15b4e2 |
Subject: [PATCH 1/2] [dnf] Collect legacy yum config and dnf global vars
|
|
|
15b4e2 |
|
|
|
15b4e2 |
Some systems might rely on legacy yum config with default symlinks to
|
|
|
15b4e2 |
dnf config - sos should collect the symlinks.
|
|
|
15b4e2 |
|
|
|
15b4e2 |
Additionally, collect dnf global vars.
|
|
|
15b4e2 |
|
|
|
15b4e2 |
Related: #3031
|
|
|
15b4e2 |
|
|
|
15b4e2 |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
15b4e2 |
---
|
|
|
15b4e2 |
sos/report/plugins/dnf.py | 7 ++++++-
|
|
|
15b4e2 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
15b4e2 |
|
|
|
15b4e2 |
diff --git a/sos/report/plugins/dnf.py b/sos/report/plugins/dnf.py
|
|
|
15b4e2 |
index 59b8de6c..82078faf 100644
|
|
|
15b4e2 |
--- a/sos/report/plugins/dnf.py
|
|
|
15b4e2 |
+++ b/sos/report/plugins/dnf.py
|
|
|
15b4e2 |
@@ -55,7 +55,12 @@ class DNFPlugin(Plugin, RedHatPlugin):
|
|
|
15b4e2 |
'/etc/dnf/modules.d/.*.module': 'dnf_modules'
|
|
|
15b4e2 |
})
|
|
|
15b4e2 |
|
|
|
15b4e2 |
- self.add_copy_spec("/etc/dnf/")
|
|
|
15b4e2 |
+ self.add_copy_spec([
|
|
|
15b4e2 |
+ "/etc/dnf/",
|
|
|
15b4e2 |
+ "/etc/yum.conf",
|
|
|
15b4e2 |
+ "/etc/yum/pluginconf.d/",
|
|
|
15b4e2 |
+ "/etc/yum/vars/",
|
|
|
15b4e2 |
+ ])
|
|
|
15b4e2 |
self.add_copy_spec("/etc/yum.repos.d/",
|
|
|
15b4e2 |
tags=['yum_repos_d', 'dnf_repos_d', 'dnf_repo'])
|
|
|
15b4e2 |
|
|
|
15b4e2 |
--
|
|
|
15b4e2 |
2.37.3
|
|
|
15b4e2 |
|
|
|
15b4e2 |
|
|
|
15b4e2 |
From ff17d6486f349dcdc115e898cc50c3845578aef3 Mon Sep 17 00:00:00 2001
|
|
|
15b4e2 |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
15b4e2 |
Date: Tue, 20 Sep 2022 22:20:51 +0200
|
|
|
15b4e2 |
Subject: [PATCH 2/2] [dnf] Obfuscate all passwords from all vars
|
|
|
15b4e2 |
|
|
|
15b4e2 |
- obfuscate also "password=.." variable values
|
|
|
15b4e2 |
- apply the obfuscation also to global vars dir
|
|
|
15b4e2 |
|
|
|
15b4e2 |
Resolves: #3031
|
|
|
15b4e2 |
|
|
|
15b4e2 |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
15b4e2 |
---
|
|
|
15b4e2 |
sos/report/plugins/dnf.py | 5 +++--
|
|
|
15b4e2 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
15b4e2 |
|
|
|
15b4e2 |
diff --git a/sos/report/plugins/dnf.py b/sos/report/plugins/dnf.py
|
|
|
15b4e2 |
index 82078faf..6efc9cac 100644
|
|
|
15b4e2 |
--- a/sos/report/plugins/dnf.py
|
|
|
15b4e2 |
+++ b/sos/report/plugins/dnf.py
|
|
|
15b4e2 |
@@ -125,8 +125,9 @@ class DNFPlugin(Plugin, RedHatPlugin):
|
|
|
15b4e2 |
self.get_modules_info(modules['output'])
|
|
|
15b4e2 |
|
|
|
15b4e2 |
def postproc(self):
|
|
|
15b4e2 |
- regexp = r"(proxy_password(\s)*=(\s)*)(\S+)\n"
|
|
|
15b4e2 |
+ regexp = r"(password(\s)*=(\s)*)(\S+)\n"
|
|
|
15b4e2 |
repl = r"\1********\n"
|
|
|
15b4e2 |
- self.do_path_regex_sub("/etc/yum.repos.d/*", regexp, repl)
|
|
|
15b4e2 |
+ for f in ["/etc/yum.repos.d/*", "/etc/dnf/vars/*"]:
|
|
|
15b4e2 |
+ self.do_path_regex_sub(f, regexp, repl)
|
|
|
15b4e2 |
|
|
|
15b4e2 |
# vim: set et ts=4 sw=4 :
|
|
|
15b4e2 |
--
|
|
|
15b4e2 |
2.37.3
|
|
|
15b4e2 |
|