Elide data reduction proxy credentials from NetLog

net/http/http_log_util_unittest.cc

 // Copyright 2014 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.
 
 #include "net/http/http_log_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 TEST(HttpLogUtilTest, ElideHeaderValueForNetLog) {
   // Only elide for appropriate log level.
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "Cookie", "name=value"));

[mmenke, 2014/07/02 18:34:25]

Hrm...while you're here, mind removing all the net::'s?

[bengr, 2014/07/02 19:31:58]

Done.

   EXPECT_EQ("name=value", ElideHeaderValueForNetLog(
       net::NetLog::LOG_ALL_BUT_BYTES, "Cookie", "name=value"));
 
   // Headers are compared case insensitively.
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "cOoKiE", "name=value"));
 
   // These headers should be completely elided.
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie", "name=value"));
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "Set-Cookie2", "name=value"));
   EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "Authorization", "Basic 1234"));
-#if !defined(SPDY_PROXY_AUTH_ORIGIN)
-  EXPECT_EQ("[10 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
-      "Proxy-Authorization", "Basic 1234"));
-#endif
 
   // Unknown headers should pass through.
   EXPECT_EQ("value", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "Boring", "value"));
 
   // Basic and Digest auth challenges are public.
   EXPECT_EQ("Basic realm=test", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA,
       "WWW-Authenticate", "Basic realm=test"));
   EXPECT_EQ("Digest realm=test", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA,
       "WWW-Authenticate", "Digest realm=test"));
-#if !defined(SPDY_PROXY_AUTH_ORIGIN)
-  EXPECT_EQ("Basic realm=test", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
-      "Proxy-Authenticate", "Basic realm=test"));
-  EXPECT_EQ("Digest realm=test", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA,
-      "Proxy-Authenticate", "Digest realm=test"));
-#endif
 
   // Multi-round mechanisms partially elided.
   EXPECT_EQ("NTLM [4 bytes were stripped]", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM 1234"));
-#if !defined(SPDY_PROXY_AUTH_ORIGIN)

[mmenke, 2014/07/02 18:34:25]

These !defined cases shouldn't be deleted, but just always enabled, no?

[bengr, 2014/07/02 19:31:58]

Done.

-  EXPECT_EQ("NTLM [4 bytes were stripped]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_STRIP_PRIVATE_DATA, "Proxy-Authenticate", "NTLM 1234"));
-#endif
 
   // Leave whitespace intact.
   EXPECT_EQ("NTLM  [4 bytes were stripped] ", ElideHeaderValueForNetLog(
       net::NetLog::LOG_STRIP_PRIVATE_DATA, "WWW-Authenticate", "NTLM  1234 "));
 
   // Extra elisions for SPDY_PROXY_AUTH_ORIGIN.
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
-  EXPECT_EQ("[elided]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_ALL_BUT_BYTES,
-      "Proxy-Authenticate", "Basic realm=test"));
-  EXPECT_EQ("[elided]", ElideHeaderValueForNetLog(
-      net::NetLog::LOG_ALL_BUT_BYTES, "Proxy-Authorization", "Basic 1234"));
+  EXPECT_EQ("ps=123, [7 bytes were stripped], c=foo, v=bar",
+            ElideHeaderValueForNetLog(
+      net::NetLog::LOG_STRIP_PRIVATE_DATA,
+      "Chrome-Proxy", "ps=123, sid=456, c=foo, v=bar"));

[mmenke, 2014/07/02 18:34:25]

The indentation here is weird.  Suggest indenting 4 more than
ElideHeaderValueForNetLog.

[mmenke, 2014/07/02 18:34:25]

Just for the sake of completeness, suggest tests where the sid param is first,
and where it's last.

[bengr, 2014/07/02 19:31:58]

Done.

[bengr, 2014/07/02 19:31:58]

Done.

 #endif
 }
 
 }  // namspace net