Blame SOURCES/sos-bz1903144-pacemaker_fix_scrubbing_password.patch
|
 |
4b1b63 |
From ad79fd5d28feaf05adddb746ef892a32a56ccfa9 Mon Sep 17 00:00:00 2001
|
|
|
4b1b63 |
From: Jan Jansky <jjansky@redhat.com>
|
|
|
4b1b63 |
Date: Fri, 12 Mar 2021 16:23:51 +0100
|
|
|
4b1b63 |
Subject: [PATCH] [pacemaker] Fix scrubbing when password contains an equal
|
|
|
4b1b63 |
sign
|
|
|
4b1b63 |
|
|
|
4b1b63 |
Backport #2109 to legacy-3.9.
|
|
|
4b1b63 |
|
|
|
4b1b63 |
Related: #2109
|
|
|
4b1b63 |
Resolves: #2446
|
|
|
4b1b63 |
|
|
|
4b1b63 |
Signed-off-by: Jan Jansky <jjansky@redhat.com>
|
|
|
4b1b63 |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
4b1b63 |
---
|
|
|
4b1b63 |
sos/plugins/pacemaker.py | 4 ++--
|
|
|
4b1b63 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
4b1b63 |
|
|
|
4b1b63 |
diff --git a/sos/plugins/pacemaker.py b/sos/plugins/pacemaker.py
|
|
|
4b1b63 |
index 940389e..f47c66a 100644
|
|
|
4b1b63 |
--- a/sos/plugins/pacemaker.py
|
|
|
4b1b63 |
+++ b/sos/plugins/pacemaker.py
|
|
|
4b1b63 |
@@ -55,14 +55,14 @@ class Pacemaker(Plugin):
|
|
|
4b1b63 |
def postproc_crm_shell(self):
|
|
|
4b1b63 |
self.do_cmd_output_sub(
|
|
|
4b1b63 |
"crm configure show",
|
|
|
4b1b63 |
- r"passw(\S*)=\S+",
|
|
|
4b1b63 |
+ r"passw([^\s=]*)=\S+",
|
|
|
4b1b63 |
r"passw\1=********"
|
|
|
4b1b63 |
)
|
|
|
4b1b63 |
|
|
|
4b1b63 |
def postproc_pcs(self):
|
|
|
4b1b63 |
self.do_cmd_output_sub(
|
|
|
4b1b63 |
"pcs config",
|
|
|
4b1b63 |
- r"passw(\S*)=\S+",
|
|
|
4b1b63 |
+ r"passw([^\s=]*)=\S+",
|
|
|
4b1b63 |
r"passw\1=********"
|
|
|
4b1b63 |
)
|
|
|
4b1b63 |
|
|
|
4b1b63 |
--
|
|
|
4b1b63 |
1.8.3.1
|
|
|
4b1b63 |
|