From 466219f1090b857e69d061f9f28eaded68f16315 Mon Sep 17 00:00:00 2001 From: Louis Ruch Date: Wed, 16 Jun 2021 11:44:08 -0700 Subject: [PATCH] Add gostringer to client_secret (#1315) --- internal/auth/oidc/client_secret.go | 5 +++++ internal/auth/oidc/client_secret_test.go | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/internal/auth/oidc/client_secret.go b/internal/auth/oidc/client_secret.go index 0879b96ff..f61b71407 100644 --- a/internal/auth/oidc/client_secret.go +++ b/internal/auth/oidc/client_secret.go @@ -16,6 +16,11 @@ func (s ClientSecret) String() string { return redactedClientSecret } +// GoString will redact the client_secret. +func (s ClientSecret) GoString() string { + return redactedClientSecret +} + // MarshalJSON will redact the client_secret. func (s ClientSecret) MarshalJSON() ([]byte, error) { return json.Marshal(redactedClientSecret) diff --git a/internal/auth/oidc/client_secret_test.go b/internal/auth/oidc/client_secret_test.go index acb018a47..a49c27ee9 100644 --- a/internal/auth/oidc/client_secret_test.go +++ b/internal/auth/oidc/client_secret_test.go @@ -14,7 +14,25 @@ func TestClientSecret_String(t *testing.T) { assert := assert.New(t) const want = redactedClientSecret tk := ClientSecret("super secret token") - assert.Equalf(want, tk.String(), "AccessToken.String() = %v, want %v", tk.String(), want) + assert.Equalf(want, tk.String(), "ClientSecret.String() = %v, want %v", tk.String(), want) + + // Verify stringer is called + s := fmt.Sprintf("%#v", tk) + assert.Equalf(want, s, "ClientSecret.String() = %v, want %v", s, want) + }) +} + +func TestClientSecret_GoString(t *testing.T) { + t.Parallel() + t.Run("redacted", func(t *testing.T) { + assert := assert.New(t) + const want = redactedClientSecret + tk := ClientSecret("super secret token") + assert.Equalf(want, tk.GoString(), "ClientSecret.GoString() = %v, want %v", tk.GoString(), want) + + // Verify gostringer is called + s := fmt.Sprintf("%#v", tk) + assert.Equalf(want, s, "ClientSecret.GoString() = %v, want %v", s, want) }) } @@ -26,6 +44,6 @@ func TestClientSecret_MarshalJSON(t *testing.T) { tk := ClientSecret("super secret token") got, err := tk.MarshalJSON() require.NoError(err) - assert.Equalf([]byte(want), got, "AccessToken.MarshalJSON() = %s, want %s", got, want) + assert.Equalf([]byte(want), got, "ClientSecret.MarshalJSON() = %s, want %s", got, want) }) }