Remove user sensitive data from self-diagnostics

Author: jeanbisutti

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

@@ -33,7 +33,9 @@
 import java.lang.management.RuntimeMXBean;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -122,7 +124,7 @@ public void init(EarlyInitAgentConfig earlyConfig) {
         startupLogger.trace("OS: " + System.getProperty("os.name"));
         startupLogger.trace("Classpath: " + System.getProperty("java.class.path"));
         startupLogger.trace("Netty versions: " + NettyVersions.extract());
-        startupLogger.trace("Env: " + System.getenv());
+        startupLogger.trace("Env: " + findEnvVariables());
         startupLogger.trace("System properties: " + findSystemProperties());
       }
 
@@ -138,6 +140,20 @@ 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()))
+        .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 void checkTlsConnectionsToVirtualServersEnabled() {
     String tlsConnectionsToVirtualServersProp = "jsse.enableSNIExtension";
     String propValue = System.getProperty(tlsConnectionsToVirtualServersProp);
@@ -152,11 +168,14 @@ private static String findSystemProperties() {
     StringBuilder propsBuilder = new StringBuilder();
     properties.forEach(
         (key, value) -> {
-          boolean firstProperty = propsBuilder.length() == 0;
-          if (!firstProperty) {
-            propsBuilder.append(", ");
+          String keyAsString = key.toString();
+          if (!isSensitiveProperty(keyAsString)) {
+            boolean firstProperty = propsBuilder.length() == 0;
+            if (!firstProperty) {
+              propsBuilder.append(", ");
+            }
+            propsBuilder.append("(" + key + "=" + value + ")");
           }
-          propsBuilder.append("(" + key + "=" + value + ")");
         });
     return propsBuilder.toString();
   }