Merge pull request #491 from anandrgitnirman/pvtkey

#490 :hide any sensitve info from logs / response sent
singnet · Apr 18, 2020 · 3fb726a · 3fb726a
2 parents 066df2a + c173f26
commit 3fb726a
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 3 deletions.
diff --git a/config/config.go b/config/config.go
@@ -274,13 +274,53 @@ func SubWithDefault(config *viper.Viper, key string) *viper.Viper {
 	return sub
 }
 
+var DisplayKeys = map[string]bool{
+	strings.ToUpper(AllowedUserFlag):                true,
+	strings.ToUpper(AllowedUserAddresses):           true,
+	strings.ToUpper(AuthenticationAddresses):        true,
+	strings.ToUpper(AutoSSLDomainKey):               true,
+	strings.ToUpper(AutoSSLCacheDirKey):             true,
+	strings.ToUpper(BlockchainEnabledKey):           true,
+	strings.ToUpper(BlockChainNetworkSelected):      true,
+	strings.ToUpper(BurstSize):                      true,
+	strings.ToUpper(ConfigPathKey):                  true,
+	strings.ToUpper(DaemonGroupName):                true,
+	strings.ToUpper(DaemonTypeKey):                  true,
+	strings.ToUpper(DaemonEndPoint):                 true,
+	strings.ToUpper(ExecutablePathKey):              true,
+	strings.ToUpper(IpfsEndPoint):                   true,
+	strings.ToUpper(IpfsTimeout):                    true,
+	strings.ToUpper(LogKey):                         true,
+	strings.ToUpper(MaxMessageSizeInMB):             true,
+	strings.ToUpper(MeteringEnabled):                true,
+	strings.ToUpper(OrganizationId):                 true,
+	strings.ToUpper(ServiceId):                      true,
+	strings.ToUpper(PassthroughEnabledKey):          true,
+	strings.ToUpper(PassthroughEndpointKey):         true,
+	strings.ToUpper(RateLimitPerMinute):             true,
+	strings.ToUpper(SSLCertPathKey):                 true,
+	strings.ToUpper(SSLKeyPathKey):                  true,
+	strings.ToUpper(PaymentChannelCertPath):         true,
+	strings.ToUpper(PaymentChannelCaPath):           true,
+	strings.ToUpper(PaymentChannelKeyPath):          true,
+	strings.ToUpper(PaymentChannelStorageTypeKey):   true,
+	strings.ToUpper(PaymentChannelStorageClientKey): true,
+	strings.ToUpper(PaymentChannelStorageServerKey): true,
+	strings.ToUpper(AlertsEMail):                    true,
+	strings.ToUpper(HeartbeatServiceEndpoint):       true,
+	strings.ToUpper(MeteringEndPoint):               true,
+	strings.ToUpper(NotificationServiceEndpoint):    true,
+	strings.ToUpper(ServiceHeartbeatType):           true,
+}
+
 func LogConfig() {
 	log.Info("Final configuration:")
 	keys := vip.AllKeys()
 	sort.Strings(keys)
 	for _, key := range keys {
-		log.Infof("%v: %v", key, vip.Get(key))
-
+		if DisplayKeys[strings.ToUpper(key)] {
+			log.Infof("%v: %v", key, vip.Get(key))
+		}
 	}
 }
 

diff --git a/configuration_service/configuration_service.go b/configuration_service/configuration_service.go
@@ -12,6 +12,7 @@ import (
 	"golang.org/x/net/context"
 	"math/big"
 	"sort"
+	"strings"
 )
 
 type ConfigurationService struct {
@@ -212,7 +213,10 @@ func getCurrentConfig() map[string]string {
 	keys := config.Vip().AllKeys()
 	sort.Strings(keys)
 	for _, key := range keys {
-		currentConfigMap[key] = config.GetString(key)
+		if config.DisplayKeys[strings.ToUpper(key)] {
+			currentConfigMap[key] = config.GetString(key)
+		}
+
 	}
 	return currentConfigMap
 }
diff --git a/configuration_service/configuration_service_test.go b/configuration_service/configuration_service_test.go
@@ -99,6 +99,9 @@ func Test_getCurrentConfig(t *testing.T) {
 
 	currentConfig := getCurrentConfig()
 	assert.NotEmpty(t, currentConfig[config.DaemonEndPoint])
+	config.Vip().Set(config.PvtKeyForMetering, "HIDDEN")
+	currentConfig = getCurrentConfig()
+	assert.Empty(t, currentConfig[config.PvtKeyForMetering])
 }
 
 func TestConfigurationService_buildSchemaDetails(t *testing.T) {