masking

Author: jeanbisutti

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java

@@ -33,6 +33,8 @@
 import java.lang.management.RuntimeMXBean;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
@@ -143,15 +145,26 @@ public void init(EarlyInitAgentConfig earlyConfig) {
   private static Map<String, String> findEnvVariables() {
     Map<String, String> env = System.getenv();
     return env.entrySet().stream()
-        .filter(entry -> !isSensitiveProperty(entry.getKey()))
+        .map(
+            entry -> {
+              String key = entry.getKey();
+              String value = entry.getValue().toString();
+              String valueToDisplay = maskValueOfSensitiveKey(key, value);
+              return new SimpleEntry<>(key, valueToDisplay);
+            })
         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
   }
 
-  private static boolean isSensitiveProperty(String key) {
-    return key.contains("user")
-        || key.contains("password")
-        || key.contains("pwd")
-        || key.contains("secret");
+  private static String maskValueOfSensitiveKey(String key, String value) {
+    return isSensitive(key) ? "***" : value;
+  }
+
+  private static boolean isSensitive(String key) {
+    String keyInLowerCase = key.toLowerCase(Locale.ROOT);
+    return keyInLowerCase.contains("user")
+        || keyInLowerCase.contains("password")
+        || keyInLowerCase.contains("pwd")
+        || keyInLowerCase.contains("secret");
   }
 
   private static void checkTlsConnectionsToVirtualServersEnabled() {
@@ -168,14 +181,12 @@ private static String findSystemProperties() {
     StringBuilder propsBuilder = new StringBuilder();
     properties.forEach(
         (key, value) -> {
-          String keyAsString = key.toString();
-          if (!isSensitiveProperty(keyAsString)) {
-            boolean firstProperty = propsBuilder.length() == 0;
-            if (!firstProperty) {
-              propsBuilder.append(", ");
-            }
-            propsBuilder.append("(" + key + "=" + value + ")");
+          boolean firstProperty = propsBuilder.length() == 0;
+          if (!firstProperty) {
+            propsBuilder.append(", ");
           }
+          String valueToDisplay = maskValueOfSensitiveKey(key.toString(), value.toString());
+          propsBuilder.append("(" + key + "=" + valueToDisplay + ")");
         });
     return propsBuilder.toString();
   }