NetLog: Removes private information from net-internals events tab

chrome/browser/resources/net_internals/logviewpainter.js

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * TODO(eroman): This needs better presentation, and cleaner code. This
  *               implementation is more of a transitionary step as
  *               the old net-internals is replaced.
  */
 
 // TODO(eroman): these functions should use lower-case names.
@@ skipping 24 matching lines @@
   addTextNode(nobr, sourceEntry.getDescription());
 
   var p2 = addNode(div, 'p');
   var nobr2 = addNode(p2, 'nobr');
 
   var logEntries = sourceEntry.getLogEntries();
   var startDate = g_browser.convertTimeTicksToDate(logEntries[0].time);
   addTextNode(nobr2, 'Start Time: ' + startDate.toLocaleString());
 
   var pre = addNode(div, 'pre');
-  addTextNode(pre, PrintSourceEntriesAsText(logEntries, false));
+  addTextNode(pre, PrintSourceEntriesAsText(logEntries));
 }
 
 function canCollapseBeginWithEnd(beginEntry) {
   return beginEntry &&
          beginEntry.isBegin() &&
          beginEntry.end &&
          beginEntry.end.index == beginEntry.index + 1 &&
          (!beginEntry.orig.params || !beginEntry.end.orig.params) &&
          beginEntry.orig.wasPassivelyCaptured ==
              beginEntry.end.orig.wasPassivelyCaptured;
 }
 
-PrintSourceEntriesAsText = function(sourceEntries, doSecurityStripping) {
+PrintSourceEntriesAsText = function(sourceEntries) {
   var entries = LogGroupEntry.createArrayFrom(sourceEntries);
   if (entries.length == 0)
     return '';
 
   var startDate = g_browser.convertTimeTicksToDate(entries[0].orig.time);
   var startTime = startDate.getTime();
 
   var tablePrinter = new TablePrinter();
 
   for (var i = 0; i < entries.length; ++i) {
@@ skipping 34 matching lines @@
 
         tablePrinter.addCell(']');
       } else {
         mainCell.allowOverflow = true;
       }
     }
 
     // Output the extra parameters.
     if (entry.orig.params != undefined) {
       // Add a continuation row for each line of text from the extra parameters.
-      var extraParamsText = getTextForExtraParams(entry.orig,
-                                                  doSecurityStripping);
+      var extraParamsText = getTextForExtraParams(
+          entry.orig,
+          g_browser.getSecurityStripping());
       var extraParamsTextLines = extraParamsText.split('\n');
 
       for (var j = 0; j < extraParamsTextLines.length; ++j) {
         tablePrinter.addRow();
         tablePrinter.addCell('');  // Empty passive annotation.
         tablePrinter.addCell('');  // No t=.
         tablePrinter.addCell('');
         tablePrinter.addCell('');  // No st=.
         tablePrinter.addCell('');
         tablePrinter.addCell('  ');
@@ skipping 43 matching lines @@
     }
 
     // Max sure the ASCII text on last line of output lines up with previous
     // lines.
     hexLine += makeRepeatedString(' ', 3 * asciiCharsPerLine - hexLine.length);
     out.push('   ' + hexLine + '  ' + asciiLine);
   }
   return out.join('\n');
 }
 
-function getTextForExtraParams(entry, doSecurityStripping) {
+function getTextForExtraParams(entry, enableSecurityStripping) {
   // Format the extra parameters (use a custom formatter for certain types,
   // but default to displaying as JSON).
   switch (entry.type) {
     case LogEventType.HTTP_TRANSACTION_SEND_REQUEST_HEADERS:
     case LogEventType.HTTP_TRANSACTION_SEND_TUNNEL_HEADERS:
-      return getTextForRequestHeadersExtraParam(entry, doSecurityStripping);
+      return getTextForRequestHeadersExtraParam(entry, enableSecurityStripping);
 
     case LogEventType.HTTP_TRANSACTION_READ_RESPONSE_HEADERS:
     case LogEventType.HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS:
-      return getTextForResponseHeadersExtraParam(entry, doSecurityStripping);
+      return getTextForResponseHeadersExtraParam(entry,
+                                                 enableSecurityStripping);
 
     case LogEventType.PROXY_CONFIG_CHANGED:
       return getTextForProxyConfigChangedExtraParam(entry);
 
     default:
       var out = [];
       for (var k in entry.params) {
         if (k == 'headers' && entry.params[k] instanceof Array) {
-          out.push(getTextForResponseHeadersExtraParam(entry,
-                                                       doSecurityStripping));
+          out.push(
+              getTextForResponseHeadersExtraParam(entry,
+                                                  enableSecurityStripping));
           continue;
         }
         var value = entry.params[k];
         // For transferred bytes, display the bytes in hex and ASCII.
         if (k == 'hex_encoded_bytes') {
           out.push(' --> ' + k + ' =');
           out.push(formatHexString(value, 20));
           continue;
         }
 
@@ skipping 84 matching lines @@
 }
 
 /**
  * Removes all cookie and unencrypted login text from a list of HTTP
  * header lines.
  */
 function stripCookiesAndLoginInfo(headers) {
   return headers.map(stripCookieOrLoginInfo);
 }
 
-function getTextForRequestHeadersExtraParam(entry, doSecurityStripping) {
+function getTextForRequestHeadersExtraParam(entry, enableSecurityStripping) {
   var params = entry.params;
 
   // Strip the trailing CRLF that params.line contains.
   var lineWithoutCRLF = params.line.replace(/\r\n$/g, '');
 
   var headers = params.headers;
-  if (doSecurityStripping)
+  if (enableSecurityStripping)
     headers = stripCookiesAndLoginInfo(headers);
 
   return indentLines(' --> ', [lineWithoutCRLF].concat(headers));
 }
 
-function getTextForResponseHeadersExtraParam(entry, doSecurityStripping) {
+function getTextForResponseHeadersExtraParam(entry, enableSecurityStripping) {
   var headers = entry.params.headers;
-  if (doSecurityStripping)
+  if (enableSecurityStripping)
     headers = stripCookiesAndLoginInfo(headers);
   return indentLines(' --> ', headers);
 }
 
 function getTextForProxyConfigChangedExtraParam(entry) {
   var params = entry.params;
   var out = '';
   var indentation = '        ';
 
   if (params.old_config) {
@@ skipping 92 matching lines @@
   var result = [];
   for (var i = 0; i < modes.length; ++i)
     result.push(indentLines('(' + (i + 1) + ') ', modes[i]));
 
   return result.join('\n');
 };
 
 // End of anonymous namespace.
 })();