Redact JWT token (#1431)

Author: testforstephen

src/daemon/index.ts

@@ -166,8 +166,8 @@ async function traceLSPPerformance(javaExt: vscode.Extension<any>) {
             kind: escapeLspRequestName(traceEvent.type),
             duration,
             code,
-            message: errorMessage,
-            exception,
+            lspmessage: errorMessage,
+            lspexception: exception,
             javaversion: javaExtVersion,
             remark: sampling,
             data: redactDataProperties(traceEvent.data),
@@ -213,6 +213,10 @@ function redactDataProperties(data: any): string {
 async function traceJavaExtension(javaExt: vscode.Extension<any>) {
    const javaExtVersion = javaExt.packageJSON?.version;
    const isPreReleaseVersion = /^\d+\.\d+\.\d{10}/.test(javaExtVersion);
+   const remappedKeys: any = {
+      "message": "lsmessage",
+      "exception": "lsexception"
+   };
    javaExt.exports?.trackEvent?.((event: any) => {
       const metrics: any = {
          name: "javaext-trace",
@@ -229,6 +233,15 @@ async function traceJavaExtension(javaExt: vscode.Extension<any>) {
             metrics[key] = val;
          }
       }
+
+      for (const key of Object.keys(remappedKeys)) {
+         if (metrics[key] !== undefined) {
+            const newKey = remappedKeys[key];
+            metrics[newKey] = metrics[key];
+            delete metrics[key];
+         }
+      }
+
       sendInfo("", metrics);
    });
 }

src/daemon/processWatcher.ts

@@ -99,7 +99,7 @@ export class ProcessWatcher {
    private onDidJdtlsCrash(lastHeartbeat?: string) {
       sendInfo("", {
          name: "jdtls-last-heartbeat",
-         message: lastHeartbeat!
+         message1: lastHeartbeat!
       });
       this.daemon.logWatcher.sendErrorAndStackOnCrash();
    }
@@ -116,7 +116,7 @@ export class ProcessWatcher {
          );
          sendInfo("", {
             name: "client-initialize-time",
-            message: interval.toString()
+            message1: interval.toString()
          });
       }
    }

src/extension.ts

@@ -96,7 +96,14 @@ function initializeTelemetry(_context: vscode.ExtensionContext) {
   const packageInfo = ext ? ext.packageJSON : undefined;
   if (packageInfo) {
     if (packageInfo.aiKey) {
-      initialize(packageInfo.id, packageInfo.version, packageInfo.aiKey);
+      initialize(packageInfo.id, packageInfo.version, packageInfo.aiKey, {
+        replacementOptions: [
+          {
+            lookup: /\s*Bearer\s+[\w-]*\.?[\w-]*\.?[A-Za-z0-9-_]*/,
+            replacementString: "<REDACTED: JWT token>"
+          }
+        ]
+      });
     }
   }
 }

src/project-settings/handlers/ClasspathRequestHandler.ts

@@ -304,7 +304,7 @@ export class ClasspathRequestHandler implements vscode.Disposable {
             javaHome[0].fsPath
         );
 
-        actionResult.message = result.message;
+        actionResult.message1 = result.message;
         actionResult.code = result.success ? "0" : "1";
         sendInfo(operationId, actionResult);
 
@@ -339,7 +339,7 @@ export class ClasspathRequestHandler implements vscode.Disposable {
             jdkPath
         );
 
-        actionResult.message = result.message;
+        actionResult.message1 = result.message;
         actionResult.code = result.success ? "0" : "1";
         sendInfo(operationId, actionResult);