Better header value parsing for Server-Timing.

third_party/WebKit/Source/platform/network/HTTPParsersTest.cpp

 // 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 "platform/network/HTTPParsers.h"
 
 #include "platform/heap/Handle.h"
 #include "platform/loader/fetch/ResourceResponse.h"
 #include "platform/weborigin/Suborigin.h"
 #include "platform/wtf/MathExtras.h"
@@ skipping 482 matching lines @@
   bool result =
       ParseMultipartHeadersFromBody(kData, strlen(kData), &response, &end);
 
   EXPECT_TRUE(result);
   EXPECT_EQ(strlen(kData), end);
   EXPECT_EQ("text/html; charset=utf-8",
             response.HttpHeaderField("content-type"));
   EXPECT_EQ("utf-8", response.TextEncodingName());
 }
 
-TEST(HTTPParsersTest, CheckDoubleQuotedString) {
-  EXPECT_EQ(CheckDoubleQuotedString(""), "");
-  EXPECT_EQ(CheckDoubleQuotedString("\""), "\"");
-  EXPECT_EQ(CheckDoubleQuotedString("\"\""), "");
-  EXPECT_EQ(CheckDoubleQuotedString("foo"), "foo");
-  EXPECT_EQ(CheckDoubleQuotedString("\"foo"), "\"foo");
-  EXPECT_EQ(CheckDoubleQuotedString("foo\""), "foo\"");
-  EXPECT_EQ(CheckDoubleQuotedString("\"foo\""), "foo");
-  EXPECT_EQ(CheckDoubleQuotedString("\"foo\"bar\""), "foo\"bar");
-  EXPECT_EQ(CheckDoubleQuotedString("\"foo\\bar\""), "foobar");
-}
-
 void testServerTimingHeader(const char* headerValue,
                             Vector<Vector<String>> expectedResults) {
   std::unique_ptr<ServerTimingHeaderVector> results =
       ParseServerTimingHeader(headerValue);
   EXPECT_EQ((*results).size(), expectedResults.size());
   unsigned i = 0;
   for (const auto& header : *results) {
     Vector<String> expectedResult = expectedResults[i++];
     EXPECT_EQ(header->metric, expectedResult[0]);
     EXPECT_EQ(header->duration, expectedResult[1].ToDouble());
@@ skipping 465 matching lines @@
                          {{"metric", "123.4", "description"}});
   testServerTimingHeader(" metric = 123.4 ; description ,",
                          {{"metric", "123.4", "description"}});
 
   testServerTimingHeader(
       "metric1=12.3;description1,metric2=45.6;description2,metric3=78.9;"
       "description3",
       {{"metric1", "12.3", "description1"},
        {"metric2", "45.6", "description2"},
        {"metric3", "78.9", "description3"}});
+
+  // header value: metric;"description"
+  // expected description: description
+  testServerTimingHeader("metric;\"description\"",
+                         {{"metric", "0", "description"}});
+
+  // header value: metric;"1\"2"
+  // expected description: 1"2
+  std::string headerValue = "metric;";
+  headerValue.push_back('"');
+  headerValue.push_back('1');
+  headerValue.push_back('\\');
+  headerValue.push_back('"');
+  headerValue.push_back('2');
+  headerValue.push_back('"');

[Yoav Weiss, 2017/05/18 21:45:05]

Why are you pushing back the chars here? Did string initialization fail
otherwise for some reason?

+  std::string expectedDescription = "";
+  expectedDescription.push_back('1');
+  expectedDescription.push_back('"');
+  expectedDescription.push_back('2');
+  testServerTimingHeader(
+      headerValue.c_str(),
+      {{"metric", "0", String(expectedDescription.c_str())}});
+
+  // header value: metric;"1\=\;\,2"
+  // expected description: 1=;,2
+  testServerTimingHeader("metric;\"1\\=\\;\\,2\"", {{"metric", "0", "1=;,2"}});
+
+  // header value: metric;"1=;,2"
+  // expected description: 1=;,2
+  testServerTimingHeader("metric;\"1=;,2\"", {{"metric", "0", "1=;,2"}});
 }
 
 }  // namespace blink