Lower node target + better cleaning

microsoft · Aug 27, 2021 · d9b8bd8 · d9b8bd8
1 parent e55b109
commit d9b8bd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.esbuild.config.js b/.esbuild.config.js
@@ -19,6 +19,7 @@ esbuild.build({
 	external: ['vscode'],
 	sourcemap: true,
 	platform: 'node',
+	target: ['node12'],
 	outfile: 'lib/telemetryReporter.node.js',
 }).catch(() => process.exit(1))
 
@@ -30,6 +31,7 @@ esbuild.build({
 	external: ['vscode'],
 	minify: true,
 	platform: 'node',
+	target: ['node12'],
 	outfile: 'lib/telemetryReporter.node.min.js',
 }).catch(() => process.exit(1))
 

diff --git a/src/common/baseTelemetryReporter.ts b/src/common/baseTelemetryReporter.ts
@@ -241,12 +241,11 @@ export class BaseTelemtryReporter {
 
 			// Regex which matches @*.site
 			const emailRegex = /@[a-zA-Z0-9-.]+/;
+			const secretRegex = /\S*(key|token|sig|password|passwd|pwd)[="':\s]+\S*/;
 
 			// Check for common user data in the telemetry events
-			if (value.toLowerCase().indexOf("token=") !== -1) {
-				cleanedObject[key] = "<REDACTED: token>";
-			} else if (value.toLowerCase().indexOf("ssword=") !== -1 || value.toLowerCase().indexOf("sswd=") !== -1) {
-				cleanedObject[key] = "<REDACTED: password>";
+			if (secretRegex.test(value.toLowerCase())) {
+				cleanedObject[key] = "<REDACTED: secret>";
 			} else if (emailRegex.test(value)) {
 				cleanedObject[key] = "<REDACTED: email>";
 			} else {