aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2014-06-05 12:33:31 -0400
committerBryn M. Reeves <bmr@redhat.com>2014-06-05 12:33:31 -0400
commit08bb3d2f36dd63726a5f291d62c9b6f2c4cb7d2d (patch)
tree4743c4ba438a5528e33528d13efd0f3735a59171
parent3da569797c33da3b32f601f7f292448b1bc0d3b3 (diff)
downloadsos-08bb3d2f36dd63726a5f291d62c9b6f2c4cb7d2d.tar.gz
[ovirt] elide passwords in logcollector.conf
This configuration file may contain passwords of the form: And: Add these to the existing 'passwd_files' processing added in commit 3da5697. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/ovirt.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
index 969440b9..acd6ad3e 100644
--- a/sos/plugins/ovirt.py
+++ b/sos/plugins/ovirt.py
@@ -121,6 +121,7 @@ class Ovirt(Plugin, RedHatPlugin):
)
passwd_files = [
+ "logcollector.conf",
"imageuploader.conf",
"isouploader.conf"
]
@@ -131,6 +132,11 @@ class Ovirt(Plugin, RedHatPlugin):
r"passwd=(.*)",
r"passwd=********"
)
+ self.do_file_sub(
+ conf_path,
+ r"pg-pass=(.*)",
+ r"pg-pass=********"
+ )
sensitive_keys = self.DEFAULT_SENSITIVE_KEYS
#Handle --alloptions case which set this to True.