Update logging mechanism to not log sources (#355)

microsoft · Sep 19, 2018 · 8f8724f · 8f8724f
1 parent 31d032a
commit 8f8724f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/chrome/chromeConnection.ts b/src/chrome/chromeConnection.ts
@@ -62,7 +62,13 @@ class LoggingSocket extends WebSocket {
 
             if (msgObj && !(msgObj.method && msgObj.method.startsWith('Network.'))) {
                 // Not really the right place to examine the content of the message, but don't log annoying Network activity notifications.
-                logger.verbose('← From target: ' + msgStr);
+                if ((msgObj.result && msgObj.result.scriptSource)) {
+                    // If this message contains the source of a script, we log everything but the source
+                    msgObj.result.scriptSource = '<removed script source for logs>';
+                    logger.verbose('← From target: ' + JSON.stringify(msgObj));
+                } else {
+                    logger.verbose('← From target: ' + msgStr);
+                }
             }
         });
     }

diff --git a/src/chrome/chromeDebugSession.ts b/src/chrome/chromeDebugSession.ts
@@ -284,6 +284,26 @@ export class ChromeDebugSession extends LoggingDebugSession implements IObservab
         this.reportTimingsWhileStartingUpIfNeeded(/*requestedContentWasDetected*/false, /*reasonForNotDetected*/'shutdown');
         super.shutdown();
     }
+
+    public sendResponse(response: DebugProtocol.Response): void {
+        const originalLogVerbose = logger.verbose;
+        try {
+            logger.verbose = textToLog => {
+                if (response && response.command === 'source' && response.body && response.body.content) {
+                    const clonedResponse = Object.assign({}, response);
+                    clonedResponse.body = Object.assign({}, response.body);
+                    clonedResponse.body.content = '<removed script source for logs>';
+                    return originalLogVerbose.call(logger, `To client: ${JSON.stringify(clonedResponse)}`);
+                } else {
+                    return originalLogVerbose.call(logger, textToLog);
+                }
+            };
+            super.sendResponse(response);
+        } finally {
+            logger.verbose = originalLogVerbose;
+        }
+    }
+
 }
 
 function logVersionInfo(): void {