Merge pull request #29912 from Shilpa-Gokul/censor_bearertoken

OCPBUGS-57334: Redact bearertoken in TestContext

Author: openshift-merge-bot[bot]

pkg/cmd/openshift-tests/run-upgrade/options.go

@@ -72,7 +72,10 @@ func (o *RunUpgradeSuiteOptions) UpgradeTestPreSuite() error {
 	if err := clusterdiscovery.InitializeTestFramework(exutil.TestContext, config, o.GinkgoRunSuiteOptions.DryRun); err != nil {
 		return err
 	}
-	klog.V(4).Infof("Loaded test configuration: %#v", exutil.TestContext)
+	// Redact the bearer token exposure
+	testContextString := fmt.Sprintf("%#v", exutil.TestContext)
+	redactedTestContext := exutil.RedactBearerToken(testContextString)
+	klog.V(4).Infof("Loaded test configuration: %s", redactedTestContext)
 
 	return nil
 }

pkg/test/extensions/binary.go

@@ -108,7 +108,10 @@ func InitializeOpenShiftTestsExtensionFramework() (*extension.Registry, *extensi
 		if err := clusterdiscovery.InitializeTestFramework(exutil.TestContext, config, false); err != nil {
 			panic(err)
 		}
-		klog.V(4).Infof("Loaded test configuration: %#v", exutil.TestContext)
+		// Redact the bearer token exposure
+		testContextString := fmt.Sprintf("%#v", exutil.TestContext)
+		redactedTestContext := exutil.RedactBearerToken(testContextString)
+		klog.V(4).Infof("Loaded test configuration: %s", redactedTestContext)
 
 		exutil.TestContext.ReportDir = os.Getenv("TEST_JUNIT_DIR")
 

test/extended/util/client.go

@@ -1040,13 +1040,10 @@ func (c *CLI) start(stdOutBuff, stdErrBuff *bytes.Buffer) (*exec.Cmd, error) {
 	return cmd, err
 }
 
+var reToken = regexp.MustCompile(`(?i)(Authorization:\s*Bearer\s+)[^\s"]+|((BearerToken:\s*")[^"]+)`)
+
 func RedactBearerToken(args string) string {
-	if strings.Contains(args, "Authorization: Bearer") {
-		// redact bearer token
-		re := regexp.MustCompile(`Authorization:\s+Bearer.*\s+`)
-		args = re.ReplaceAllString(args, "Authorization: Bearer <redacted> ")
-	}
-	return args
+	return reToken.ReplaceAllString(args, `${1}${3}<redacted>`)
 }
 
 // getStartingIndexForLastN calculates a byte offset in a byte slice such that when using