improve regex to redact password, including unit tests

Author: mbussolotto

mgradm/shared/utils/cmd_utils.go

@@ -281,7 +281,7 @@ func AddPgsqlFlags(cmd *cobra.Command) {
 	AddContainerImageFlags(cmd, "pgsql", L("PostgreSQL Database"), "pgsql-container", "server-postgresql")
 }
 
-// AddServerFlags add flags common to install, upgrade and migrate.
+// AddServerFlags add flags common to install.
 func AddServerFlags(cmd *cobra.Command) {
 	AddImageFlag(cmd)
 	AddSCCFlag(cmd)

shared/utils/logUtils.go

@@ -19,7 +19,7 @@ import (
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
-var redactRegex = regexp.MustCompile(`([pP]assword[\t :"\\]+)[^\t "\\]+`)
+var redactRegex = regexp.MustCompile(`([pP]assword[\t :"\\]+)[^\\][^\t "\\]+`)
 
 // The default directory where log files are written.
 const logDir = "/var/log/"

shared/utils/logUtils_test.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SUSE LLC
+// SPDX-FileCopyrightText: 2025 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -28,6 +28,14 @@ func TestRedact(t *testing.T) {
 			`{"adminLogin":"admin","adminPassword":"secret","email":"[email protected]"}`,
 			`{"adminLogin":"admin","adminPassword":"<REDACTED>","email":"[email protected]"}`,
 		},
+		{
+			`password\n`,
+			`password\n`,
+		},
+		{
+			`\"password\": \"foo\"`,
+			`\"password\": \"<REDACTED>\"`,
+		},
 	}
 
 	for i, testCase := range data {

uyuni-tools.changes.mbussolotto.cert_escape_char

@@ -0,0 +1 @@
+- During migration, improve info about usage on ssl-password and logs(bsc#1243009)