Add filter sensitive switch feature and corresponding configuration

Author: chenzhiguo

deploy/all-cr.yaml

@@ -841,6 +841,8 @@ spec:
               value: x-live, x-service
             - name: JOYLIVE_CONTROL_PLANE_URL
               value: 
+            - name: JOYLIVE_FILTER_SENSITIVE
+              value: 
             - name: JOYLIVE_CLUSTER_ID
               value: 
             - name: JOYLIVE_MATCH_KEY

deploy/joylive-injector/templates/deployment.yaml

@@ -41,6 +41,8 @@ spec:
               value: {{ .Values.matchEnvLabels }}
             - name: JOYLIVE_CONTROL_PLANE_URL
               value: {{ .Values.controlPlaneUrl }}
+            - name: JOYLIVE_FILTER_SENSITIVE
+              value: {{ .Values.filterSensitive }}
             - name: JOYLIVE_CLUSTER_ID
               value: {{ .Values.clusterId }}
             - name: JOYLIVE_MATCH_KEY

deploy/joylive-injector/values.yaml

@@ -32,6 +32,7 @@ containerArgs:
 
 matchEnvLabels: x-live, x-service
 controlPlaneUrl: ""
+filterSensitive: ""
 
 imagePullSecrets: [ ]
 nameOverride: ""

deploy/packages/joylive-injector-1.3.8.tgz

@@ -113,6 +113,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&config.Key, "key", "", "Admission Controller TLS cert key")
 	rootCmd.PersistentFlags().StringVar(&config.MatchLabels, "match-label", config.MatchLabels, "Match label")
 	rootCmd.PersistentFlags().StringVar(&config.ControlPlaneUrl, "control-plane-url", config.ControlPlaneUrl, "Control Plane URL")
+	rootCmd.PersistentFlags().StringVar(&config.FilterSensitive, "filter-sensitive", config.FilterSensitive, "Filter Sensitive Switch")
 	rootCmd.PersistentFlags().StringVar(&config.ClusterId, "cluster-id", config.ClusterId, "Cluster ID")
 	//rootCmd.PersistentFlags().StringVar(&config.KubeConfig, "kubeconfig", config.KubeConfig, "Path to the kubeconfig file")
 

main.go

@@ -22,6 +22,7 @@ const (
 	NamespaceEnvName        = "JOYLIVE_NAMESPACE"
 	MatchLabelsEnvName      = "JOYLIVE_MATCH_ENV_LABELS"
 	ControlPlaneUrlEnvName  = "JOYLIVE_CONTROL_PLANE_URL"
+	FilterSensitiveEnvName  = "JOYLIVE_FILTER_SENSITIVE"
 	ClusterIdEnvName        = "JOYLIVE_CLUSTER_ID"
 	DefaultNamespace        = "joylive"
 	AgentVersionLabel       = "x-live-version"
@@ -49,6 +50,7 @@ var (
 	Addr              string
 	MatchLabels       string
 	ControlPlaneUrl   string
+	FilterSensitive   string
 	ClusterId         string
 	WebHookMatchKey   string
 	WebHookMatchValue string
@@ -75,6 +77,8 @@ func init() {
 	MatchLabels = os.Getenv(MatchLabelsEnvName)
 	// Initialize the default control plane url from environment variables
 	ControlPlaneUrl = os.Getenv(ControlPlaneUrlEnvName)
+	// Initialize the switch for filter sensitive from environment variables
+	FilterSensitive = os.Getenv(FilterSensitiveEnvName)
 	// Initialize the default cluster id from environment variables
 	ClusterId = os.Getenv(ClusterIdEnvName)
 	WebHookMatchKey = os.Getenv(WebHookMatchKeyEnv)

pkg/config/config.go

@@ -58,9 +58,11 @@ func GetApplicationEnvironments(labels map[string]string) (map[string]string, er
 			return nil, response.Error
 		}
 		for key, value := range response.Data {
-			// Filter out keys ending with "USERNAME" and "PASSWORD" to enhance security.
-			if strings.HasSuffix(key, "USERNAME") || strings.HasSuffix(key, "PASSWORD") {
-				continue
+			if len(config.FilterSensitive) != 0 && config.FilterSensitive == "true" {
+				// Filter out keys ending with "USERNAME" and "PASSWORD" to enhance security.
+				if strings.HasSuffix(key, "USERNAME") || strings.HasSuffix(key, "PASSWORD") {
+					continue
+				}
 			}
 			envMaps[key] = value
 		}