From 7ab833d28c27b6ff1e173396eca250891c03076b Mon Sep 17 00:00:00 2001
From: "lean.dev" <34773040+leandro-deveikis@users.noreply.github.com>
Date: Thu, 1 Feb 2024 14:37:36 -0300
Subject: [PATCH] Licensing: Redact license when overriden by env variable
 (#81726)

---
 pkg/setting/setting.go      | 1 +
 pkg/setting/setting_test.go | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 58bbc3b6274..8fdda78a12b 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -587,6 +587,7 @@ func RedactedValue(key, value string) string {
 		"ENCRYPTION_KEY",
 		"VAULT_TOKEN",
 		"CLIENT_SECRET",
+		"ENTERPRISE_LICENSE",
 	} {
 		if match, err := regexp.MatchString(pattern, uppercased); match && err == nil {
 			return RedactedPassword
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index 08a20bd0125..a139160329c 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -830,6 +830,12 @@ func TestRedactedValue(t *testing.T) {
 			value:    "/path/to/key",
 			expected: RedactedPassword,
 		},
+		{
+			desc:     "license key with non-empty value",
+			key:      "GF_ENTERPRISE_LICENSE_TEXT",
+			value:    "some_license_key_test",
+			expected: RedactedPassword,
+		},
 		{
 			desc:     "sensitive key with empty value",
 			key:      "private_key_path",