Revert of Modify data_reduction_proxy_header to support tamper detection logic.

components/data_reduction_proxy/common/data_reduction_proxy_headers_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 "components/data_reduction_proxy/common/data_reduction_proxy_headers.h"
 
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Transform "normal"-looking headers (\n-separated) to the appropriate
 // input format for ParseRawHeaders (\0-separated).
 void HeadersToRaw(std::string* headers) {
   std::replace(headers->begin(), headers->end(), '\n', '\0');
   if (!headers->empty())
     *headers += '\0';
 }
 
 }  // namespace
 
 namespace data_reduction_proxy {
 
 class DataReductionProxyHeadersTest : public testing::Test {};
 
-TEST_F(DataReductionProxyHeadersTest, GetDataReductionProxyActionValue) {
-  const struct {
-     const char* headers;
-     std::string action_key;
-     bool expected_result;
-     std::string expected_action_value;
-  } tests[] = {
-    { "HTTP/1.1 200 OK\n"
-      "Content-Length: 999\n",
-      "a",
-      false,
-      "",
-    },
-    { "HTTP/1.1 200 OK\n"
-      "connection: keep-alive\n"
-      "Content-Length: 999\n",
-      "a",
-      false,
-      "",
-    },
-    { "HTTP/1.1 200 OK\n"
-      "connection: keep-alive\n"
-      "Chrome-Proxy: bypass=86400\n"
-      "Content-Length: 999\n",
-      "bypass",
-      true,
-      "86400",
-    },
-    { "HTTP/1.1 200 OK\n"
-      "connection: keep-alive\n"
-      "Chrome-Proxy: bypass86400\n"
-      "Content-Length: 999\n",
-      "bypass",
-      false,
-      "",
-    },
-    { "HTTP/1.1 200 OK\n"
-      "connection: keep-alive\n"
-      "Chrome-Proxy: bypass=0\n"
-      "Content-Length: 999\n",
-      "bypass",
-      true,
-      "0",
-    },
-    { "HTTP/1.1 200 OK\n"
-      "connection: keep-alive\n"
-      "Chrome-Proxy: bypass=1500\n"
-      "Chrome-Proxy: bypass=86400\n"
-      "Content-Length: 999\n",
-      "bypass",
-      true,
-      "1500",
-    },
-    { "HTTP/1.1 200 OK\n"
-      "connection: keep-alive\n"
-      "Chrome-Proxy: block=1500, block=3600\n"
-      "Content-Length: 999\n",
-      "block",
-      true,
-      "1500",
-    },
-    { "HTTP/1.1 200 OK\n"
-      "connection: proxy-bypass\n"
-      "Chrome-Proxy:    key=123   \n"
-      "Content-Length: 999\n",
-      "key",
-      true,
-      "123",
-    },
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    std::string headers(tests[i].headers);
-    HeadersToRaw(&headers);
-    scoped_refptr<net::HttpResponseHeaders> parsed(
-        new net::HttpResponseHeaders(headers));
-
-    std::string action_value;
-    bool has_action_key = GetDataReductionProxyActionValue(
-        parsed, tests[i].action_key, &action_value);
-    EXPECT_EQ(tests[i].expected_result, has_action_key);
-    if (has_action_key) {
-      EXPECT_EQ(tests[i].expected_action_value, action_value);
-    }
-  }
-}
-
 TEST_F(DataReductionProxyHeadersTest, GetProxyBypassInfo) {
   const struct {
      const char* headers;
      bool expected_result;
      int64 expected_retry_delay;
      bool expected_bypass_all;
   } tests[] = {
     { "HTTP/1.1 200 OK\n"
       "Content-Length: 999\n",
       false,
@@ skipping 158 matching lines @@
 
   DataReductionProxyInfo data_reduction_proxy_info;
   EXPECT_TRUE(ParseHeadersAndSetProxyInfo(parsed, &data_reduction_proxy_info));
   EXPECT_LE(60, data_reduction_proxy_info.bypass_duration.InSeconds());
   EXPECT_GE(5 * 60, data_reduction_proxy_info.bypass_duration.InSeconds());
   EXPECT_FALSE(data_reduction_proxy_info.bypass_all);
 }
 
 TEST_F(DataReductionProxyHeadersTest, HasDataReductionProxyViaHeader) {
   const struct {
-    const char* headers;
-    bool expected_result;
-    bool expected_has_intermediary;
-    bool ignore_intermediary;
+     const char* headers;
+     bool expected_result;
   } tests[] = {
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Chrome-Proxy\n",
       false,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1\n",
       false,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Chrome-Compression-Proxy\n",
       true,
-      true,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.0 Chrome-Compression-Proxy\n",
       true,
-      true,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Foo-Bar, 1.1 Chrome-Compression-Proxy\n",
       true,
-      true,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Chrome-Compression-Proxy, 1.1 Bar-Foo\n",
       true,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 chrome-compression-proxy\n",
       false,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Foo-Bar\n"
       "Via: 1.1 Chrome-Compression-Proxy\n",
       true,
-      true,
-      false,
-    },
-    { "HTTP/1.1 200 OK\n"
-      "Via: 1.1 Chrome-Compression-Proxy\n"
-      "Via: 1.1 Foo-Bar\n",
-      true,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Chrome-Proxy\n",
       false,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Chrome Compression Proxy\n",
       true,
-      true,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Foo-Bar, 1.1 Chrome Compression Proxy\n",
       true,
-      true,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Chrome Compression Proxy, 1.1 Bar-Foo\n",
       true,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 chrome compression proxy\n",
       false,
-      false,
-      false,
     },
     { "HTTP/1.1 200 OK\n"
       "Via: 1.1 Foo-Bar\n"
       "Via: 1.1 Chrome Compression Proxy\n",
       true,
-      true,
-      false,
-    },
-    { "HTTP/1.1 200 OK\n"
-      "Via: 1.1 Chrome Compression Proxy\n"
-      "Via: 1.1 Foo-Bar\n",
-      true,
-      false,
-      false,
-    },
-    { "HTTP/1.1 200 OK\n"
-      "Via: 1.1 Chrome Compression Proxy\n"
-      "Via: 1.1 Foo-Bar\n",
-      true,
-      false,
-      true,
     },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     std::string headers(tests[i].headers);
     HeadersToRaw(&headers);
     scoped_refptr<net::HttpResponseHeaders> parsed(
         new net::HttpResponseHeaders(headers));
 
-    bool has_chrome_proxy_via_header, has_intermediary;
-    if (tests[i].ignore_intermediary) {
-      has_chrome_proxy_via_header =
-          HasDataReductionProxyViaHeader(parsed, NULL);
-    }
-    else {
-      has_chrome_proxy_via_header =
-          HasDataReductionProxyViaHeader(parsed, &has_intermediary);
-    }
-    EXPECT_EQ(tests[i].expected_result, has_chrome_proxy_via_header);
-    if (has_chrome_proxy_via_header && !tests[i].ignore_intermediary) {
-      EXPECT_EQ(tests[i].expected_has_intermediary, has_intermediary);
-    }
+    EXPECT_EQ(tests[i].expected_result,
+              HasDataReductionProxyViaHeader(parsed));
   }
 }
 
 TEST_F(DataReductionProxyHeadersTest, GetDataReductionProxyBypassEventType) {
   const struct {
      const char* headers;
      net::ProxyService::DataReductionProxyBypassType expected_result;
   } tests[] = {
     { "HTTP/1.1 200 OK\n"
       "Chrome-Proxy: bypass=0\n"
@@ skipping 89 matching lines @@
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     std::string headers(tests[i].headers);
     HeadersToRaw(&headers);
     scoped_refptr<net::HttpResponseHeaders> parsed(
         new net::HttpResponseHeaders(headers));
     DataReductionProxyInfo chrome_proxy_info;
     EXPECT_EQ(tests[i].expected_result,
               GetDataReductionProxyBypassType(parsed, &chrome_proxy_info));
   }
 }
-
-TEST_F(DataReductionProxyHeadersTest,
-       GetDataReductionProxyActionFingerprintChromeProxy) {
-  const struct {
-     std::string label;
-     const char* headers;
-     bool expected_fingerprint_exist;
-     std::string expected_fingerprint;
-  } tests[] = {
-    { "fingerprint doesn't exist",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=0\n",
-      false,
-      "",
-    },
-    { "fingerprint occurs once",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=1, fcp=fp\n",
-      true,
-      "fp",
-    },
-    { "fingerprint occurs twice",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=2, fcp=fp1, fcp=fp2\n",
-      true,
-      "fp1",
-    },
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    std::string headers(tests[i].headers);
-    HeadersToRaw(&headers);
-    scoped_refptr<net::HttpResponseHeaders> parsed(
-        new net::HttpResponseHeaders(headers));
-
-    std::string fingerprint;
-    bool fingerprint_exist = GetDataReductionProxyActionFingerprintChromeProxy(
-        parsed, &fingerprint);
-    EXPECT_EQ(tests[i].expected_fingerprint_exist, fingerprint_exist)
-        << tests[i].label;
-
-    if (fingerprint_exist)
-      EXPECT_EQ(tests[i].expected_fingerprint, fingerprint) << tests[i].label;
-  }
-}
-
-TEST_F(DataReductionProxyHeadersTest,
-       GetDataReductionProxyActionFingerprintVia) {
-  const struct {
-     std::string label;
-     const char* headers;
-     bool expected_fingerprint_exist;
-     std::string expected_fingerprint;
-  } tests[] = {
-    { "fingerprint doesn't exist",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=0\n",
-      false,
-      "",
-    },
-    { "fingerprint occurs once",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=1, fvia=fvia\n",
-      true,
-      "fvia",
-    },
-    { "fingerprint occurs twice",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=2, fvia=fvia1, fvia=fvia2\n",
-      true,
-      "fvia1",
-    },
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    std::string headers(tests[i].headers);
-    HeadersToRaw(&headers);
-    scoped_refptr<net::HttpResponseHeaders> parsed(
-        new net::HttpResponseHeaders(headers));
-
-    std::string fingerprint;
-    bool fingerprint_exist =
-        GetDataReductionProxyActionFingerprintVia(parsed, &fingerprint);
-    EXPECT_EQ(tests[i].expected_fingerprint_exist, fingerprint_exist)
-        << tests[i].label;
-
-    if (fingerprint_exist)
-      EXPECT_EQ(tests[i].expected_fingerprint, fingerprint) << tests[i].label;
-  }
-}
-
-TEST_F(DataReductionProxyHeadersTest,
-       GetDataReductionProxyActionFingerprintOtherHeaders) {
-  const struct {
-     std::string label;
-     const char* headers;
-     bool expected_fingerprint_exist;
-     std::string expected_fingerprint;
-  } tests[] = {
-    { "fingerprint doesn't exist",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=0\n",
-      false,
-      "",
-    },
-    { "fingerprint occurs once",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=1, foh=foh\n",
-      true,
-      "foh",
-    },
-    { "fingerprint occurs twice",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=2, foh=foh1, foh=foh2\n",
-      true,
-      "foh1",
-    },
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    std::string headers(tests[i].headers);
-    HeadersToRaw(&headers);
-    scoped_refptr<net::HttpResponseHeaders> parsed(
-        new net::HttpResponseHeaders(headers));
-
-    std::string fingerprint;
-    bool fingerprint_exist =
-        GetDataReductionProxyActionFingerprintOtherHeaders(
-        parsed, &fingerprint);
-    EXPECT_EQ(tests[i].expected_fingerprint_exist, fingerprint_exist)
-        << tests[i].label;
-
-    if (fingerprint_exist)
-      EXPECT_EQ(tests[i].expected_fingerprint, fingerprint) << tests[i].label;
-  }
-}
-
-TEST_F(DataReductionProxyHeadersTest,
-       GetDataReductionProxyActionFingerprintContentLength) {
-  const struct {
-     std::string label;
-     const char* headers;
-     bool expected_fingerprint_exist;
-     std::string expected_fingerprint;
-  } tests[] = {
-    { "fingerprint doesn't exist",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=0\n",
-      false,
-      "",
-    },
-    { "fingerprint occurs once",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=1, fcl=fcl\n",
-      true,
-      "fcl",
-    },
-    { "fingerprint occurs twice",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: bypass=2, fcl=fcl1, fcl=fcl2\n",
-      true,
-      "fcl1",
-    },
-  };
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    std::string headers(tests[i].headers);
-    HeadersToRaw(&headers);
-    scoped_refptr<net::HttpResponseHeaders> parsed(
-        new net::HttpResponseHeaders(headers));
-
-    std::string fingerprint;
-    bool fingerprint_exist =
-        GetDataReductionProxyActionFingerprintContentLength(
-        parsed, &fingerprint);
-    EXPECT_EQ(tests[i].expected_fingerprint_exist, fingerprint_exist)
-        << tests[i].label;
-
-    if (fingerprint_exist)
-      EXPECT_EQ(tests[i].expected_fingerprint, fingerprint) << tests[i].label;
-  }
-}
-
-TEST_F(DataReductionProxyHeadersTest,
-       GetDataReductionProxyHeaderWithFingerprintRemoved) {
-  struct {
-    std::string label;
-    const char* headers;
-    std::string expected_output_values_string;
-  } test[] = {
-    {
-      "Checks the case that there is no Chrome-Proxy header's fingerprint.",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: 1,2,3,5\n",
-      "1,2,3,5,",
-    },
-    {
-      "Checks the case that there is Chrome-Proxy header's fingerprint.",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: 1,2,3,fcp=4,5\n",
-      "1,2,3,5,",
-    },
-    {
-      "Checks the case that there is Chrome-Proxy header's fingerprint, and it"
-      "occurs at the end.",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: 1,2,3,fcp=4,",
-      "1,2,3,",
-    },
-    {
-      "Checks the case that there is Chrome-Proxy header's fingerprint, and it"
-      "occurs at the beginning.",
-      "HTTP/1.1 200 OK\n"
-      "Chrome-Proxy: fcp=1,2,3,",
-      "2,3,",
-    },
-  };
-
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test); ++i) {
-    std::string headers(test[i].headers);
-    HeadersToRaw(&headers);
-    scoped_refptr<net::HttpResponseHeaders> parsed(
-        new net::HttpResponseHeaders(headers));
-
-    std::vector<std::string> output_values;
-    GetDataReductionProxyHeaderWithFingerprintRemoved(parsed, &output_values);
-
-    std::string output_values_string;
-    for (size_t j = 0; j < output_values.size(); ++j)
-      output_values_string += output_values[j] + ",";
-
-    EXPECT_EQ(test[i].expected_output_values_string, output_values_string)
-        << test[i].label;
-  }
-}
-
 }  // namespace data_reduction_proxy