Added support for 'Chrome-Proxy: block-once' header

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 <vector>
 
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
@@ skipping 77 matching lines @@
       "1500",
     },
     { "HTTP/1.1 200 OK\n"
       "connection: proxy-bypass\n"
       "Chrome-Proxy:    key=123   \n"
       "Content-Length: 999\n",
       "key",
       true,
       "123",
     },
+    { "HTTP/1.1 200 OK\n"
+      "connection: proxy-bypass\n"
+      "Chrome-Proxy: block-once\n"
+      "Content-Length: 999\n",
+      "block-once",
+      false,
+      "",
+    },
   };
   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;
+     bool expected_mark_proxies_as_bad;
   } tests[] = {
     { "HTTP/1.1 200 OK\n"
       "Content-Length: 999\n",
       false,
       0,
       false,
+      false,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Content-Length: 999\n",
       false,
       0,
       false,
+      false,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=86400\n"
       "Content-Length: 999\n",
       true,
       86400,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=-1\n"
       "Content-Length: 999\n",
       false,
       0,
       false,
+      false,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=xyz\n"
       "Content-Length: 999\n",
       false,
       0,
       false,
+      false,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass\n"
       "Content-Length: 999\n",
       false,
       0,
       false,
+      false,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: foo=abc, bypass=86400\n"
       "Content-Length: 999\n",
       true,
       86400,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=86400, bar=abc\n"
       "Content-Length: 999\n",
       true,
       86400,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=3600\n"
       "Chrome-Proxy: bypass=86400\n"
       "Content-Length: 999\n",
       true,
       3600,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=3600, bypass=86400\n"
       "Content-Length: 999\n",
       true,
       3600,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=, bypass=86400\n"
       "Content-Length: 999\n",
       true,
       86400,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass\n"
       "Chrome-Proxy: bypass=86400\n"
       "Content-Length: 999\n",
       true,
       86400,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: block=, block=3600\n"
       "Content-Length: 999\n",
       true,
       3600,
       true,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=86400, block=3600\n"
       "Content-Length: 999\n",
       true,
       3600,
       true,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: proxy-bypass\n"
       "Chrome-Proxy: block=, bypass=86400\n"
       "Content-Length: 999\n",
       true,
       86400,
       false,
+      true,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: proxy-bypass\n"
       "Chrome-Proxy: block=-1\n"
       "Content-Length: 999\n",
       false,
       0,
       false,
+      false,
     },
     { "HTTP/1.1 200 OK\n"
       "connection: proxy-bypass\n"
       "Chrome-Proxy: block=99999999999999999999\n"
       "Content-Length: 999\n",
       false,
       0,
       false,
+      false,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: block-once\n"
+      "Content-Length: 999\n",
+      true,
+      0,
+      true,
+      false,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: block-once=\n"

[bengr, 2014/08/12 20:57:11]

So block-once= and block-once=foo are both ignored? I guess that's ok. I wonder
what would happen if a later version supported block-once=foo. I can think of
reasons why this version should ignore such an instruction, and I can think of
reasons why this version should interpret block-once=foo as block-once. 

[sclittle, 2014/08/12 21:24:43]

Acknowledged.

+      "Content-Length: 999\n",
+      false,
+      0,
+      false,
+      false,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: block-once=10\n"
+      "Content-Length: 999\n",
+      false,
+      0,
+      false,
+      false,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: block-once, bypass=86400, block=3600\n"
+      "Content-Length: 999\n",
+      true,
+      3600,
+      true,
+      true,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: block-once\n"
+      "Chrome-Proxy: bypass=86400, block=3600\n"
+      "Content-Length: 999\n",
+      true,
+      3600,
+      true,
+      true,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: block-once, bypass=86400\n"
+      "Content-Length: 999\n",
+      true,
+      86400,
+      false,
+      true,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: block-once, block=3600\n"
+      "Content-Length: 999\n",
+      true,
+      3600,
+      true,
+      true,
+    },
+    { "HTTP/1.1 200 OK\n"
+      "connection: keep-alive\n"
+      "Chrome-Proxy: bypass=, block=, block-once\n"
+      "Content-Length: 999\n",
+      true,
+      0,
+      true,
+      false,
     },
   };
   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 data_reduction_proxy_info;
     EXPECT_EQ(tests[i].expected_result,
               ParseHeadersAndSetProxyInfo(parsed, &data_reduction_proxy_info));
     EXPECT_EQ(tests[i].expected_retry_delay,
               data_reduction_proxy_info.bypass_duration.InSeconds());
     EXPECT_EQ(tests[i].expected_bypass_all,
               data_reduction_proxy_info.bypass_all);
+    EXPECT_EQ(tests[i].expected_mark_proxies_as_bad,
+              data_reduction_proxy_info.mark_proxies_as_bad);
   }
 }
 
 TEST_F(DataReductionProxyHeadersTest, ParseHeadersAndSetProxyInfo) {
   std::string headers =
       "HTTP/1.1 200 OK\n"
       "connection: keep-alive\n"
       "Chrome-Proxy: bypass=0\n"
       "Content-Length: 999\n";
   HeadersToRaw(&headers);
@@ skipping 172 matching lines @@
     { "HTTP/1.1 200 OK\n"
       "Chrome-Proxy: bypass=300\n"
       "Via: 1.1 Chrome-Compression-Proxy\n",
       BYPASS_EVENT_TYPE_MEDIUM,
     },
     { "HTTP/1.1 200 OK\n"
       "Chrome-Proxy: bypass=301\n"
       "Via: 1.1 Chrome-Compression-Proxy\n",
       BYPASS_EVENT_TYPE_LONG,
     },
+    { "HTTP/1.1 200 OK\n"
+      "Chrome-Proxy: block-once\n"
+      "Via: 1.1 Chrome-Compression-Proxy\n",
+      BYPASS_EVENT_TYPE_CURRENT,
+    },
     { "HTTP/1.1 500 Internal Server Error\n"
       "Via: 1.1 Chrome-Compression-Proxy\n",
       BYPASS_EVENT_TYPE_STATUS_500_HTTP_INTERNAL_SERVER_ERROR,
     },
     { "HTTP/1.1 501 Not Implemented\n"
       "Via: 1.1 Chrome-Compression-Proxy\n",
       BYPASS_EVENT_TYPE_MAX,
     },
     { "HTTP/1.1 502 Bad Gateway\n"
       "Via: 1.1 Chrome-Compression-Proxy\n",
@@ skipping 296 matching lines @@
     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