Reject some previuosly-escaped chars in hostnames.

content/common/database_identifier_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 "storage/common/database/database_identifier.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 40 matching lines @@
 
 // This tests the encoding of a hostname including every character in the range
 // [\x1f, \x80].
 TEST(DatabaseIdentifierTest, CreateIdentifierAllHostChars) {
   struct Case {
     std::string hostname;
     std::string expected;
     bool shouldRoundTrip;
   } cases[] = {
     {"x\x1Fx", "__0", false},
-    {"x\x20x", "http_x%20x_0", false},
-    {"x\x21x", "http_x%21x_0", false},
-    {"x\x22x", "http_x%22x_0", false},
+    {"x\x20x", "__0", false},
+    {"x\x21x", "__0", false},
+    {"x\x22x", "__0", false},
     {"x\x23x", "http_x_0", false},  // 'x#x', the # and following are ignored.
-    {"x\x24x", "http_x%24x_0", false},
+    {"x\x24x", "__0", false},
     {"x\x25x", "__0", false},
-    {"x\x26x", "http_x%26x_0", false},
-    {"x\x27x", "http_x%27x_0", false},
-    {"x\x28x", "http_x%28x_0", false},
-    {"x\x29x", "http_x%29x_0", false},
-    {"x\x2ax", "http_x%2ax_0", false},
-    {"x\x2bx", "http_x+x_0", false},
-    {"x\x2cx", "http_x%2cx_0", false},
+    {"x\x26x", "__0", false},
+    {"x\x27x", "__0", false},
+    {"x\x28x", "__0", false},
+    {"x\x29x", "__0", false},
+    {"x\x2ax", "__0", false},
+    {"x\x2bx", "__0", false},
+    {"x\x2cx", "__0", false},
     {"x\x2dx", "http_x-x_0", true},
     {"x\x2ex", "http_x.x_0", true},
     {"x\x2fx", "http_x_0", false},  // 'x/x', the / and following are ignored.
     {"x\x30x", "http_x0x_0", true},
     {"x\x31x", "http_x1x_0", true},
     {"x\x32x", "http_x2x_0", true},
     {"x\x33x", "http_x3x_0", true},
     {"x\x34x", "http_x4x_0", true},
     {"x\x35x", "http_x5x_0", true},
     {"x\x36x", "http_x6x_0", true},
     {"x\x37x", "http_x7x_0", true},
     {"x\x38x", "http_x8x_0", true},
     {"x\x39x", "http_x9x_0", true},
     {"x\x3ax", "__0", false},
     {"x\x3bx", "__0", false},
-    {"x\x3cx", "http_x%3cx_0", false},
-    {"x\x3dx", "http_x%3dx_0", false},
-    {"x\x3ex", "http_x%3ex_0", false},
+    {"x\x3cx", "__0", false},
+    {"x\x3dx", "__0", false},
+    {"x\x3ex", "__0", false},
     {"x\x3fx", "http_x_0", false},  // 'x?x', the ? and following are ignored.
     {"x\x40x", "http_x_0", false},  // 'x@x', the @ and following are ignored.
     {"x\x41x", "http_xax_0", true},
     {"x\x42x", "http_xbx_0", true},
     {"x\x43x", "http_xcx_0", true},
     {"x\x44x", "http_xdx_0", true},
     {"x\x45x", "http_xex_0", true},
     {"x\x46x", "http_xfx_0", true},
     {"x\x47x", "http_xgx_0", true},
     {"x\x48x", "http_xhx_0", true},
@@ skipping 13 matching lines @@
     {"x\x56x", "http_xvx_0", true},
     {"x\x57x", "http_xwx_0", true},
     {"x\x58x", "http_xxx_0", true},
     {"x\x59x", "http_xyx_0", true},
     {"x\x5ax", "http_xzx_0", true},
     {"x\x5bx", "__0", false},
     {"x\x5cx", "http_x_0", false},  // "x\x", the \ and following are ignored.
     {"x\x5dx", "__0", false},
     {"x\x5ex", "__0", false},
     {"x\x5fx", "http_x_x_0", true},
-    {"x\x60x", "http_x%60x_0", false},
+    {"x\x60x", "__0", false},
     {"x\x61x", "http_xax_0", true},
     {"x\x62x", "http_xbx_0", true},
     {"x\x63x", "http_xcx_0", true},
     {"x\x64x", "http_xdx_0", true},
     {"x\x65x", "http_xex_0", true},
     {"x\x66x", "http_xfx_0", true},
     {"x\x67x", "http_xgx_0", true},
     {"x\x68x", "http_xhx_0", true},
     {"x\x69x", "http_xix_0", true},
     {"x\x6ax", "http_xjx_0", true},
     {"x\x6bx", "http_xkx_0", true},
     {"x\x6cx", "http_xlx_0", true},
     {"x\x6dx", "http_xmx_0", true},
     {"x\x6ex", "http_xnx_0", true},
     {"x\x6fx", "http_xox_0", true},
     {"x\x70x", "http_xpx_0", true},
     {"x\x71x", "http_xqx_0", true},
     {"x\x72x", "http_xrx_0", true},
     {"x\x73x", "http_xsx_0", true},
     {"x\x74x", "http_xtx_0", true},
     {"x\x75x", "http_xux_0", true},
     {"x\x76x", "http_xvx_0", true},
     {"x\x77x", "http_xwx_0", true},
     {"x\x78x", "http_xxx_0", true},
     {"x\x79x", "http_xyx_0", true},
     {"x\x7ax", "http_xzx_0", true},
-    {"x\x7bx", "http_x%7bx_0", false},
-    {"x\x7cx", "http_x%7cx_0", false},
-    {"x\x7dx", "http_x%7dx_0", false},
+    {"x\x7bx", "__0", false},
+    {"x\x7cx", "__0", false},
+    {"x\x7dx", "__0", false},
     {"x\x7ex", "__0", false},
     {"x\x7fx", "__0", false},
     {"x\x80x", "__0", false},
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     GURL origin("http://" + cases[i].hostname);
     DatabaseIdentifier identifier =
         DatabaseIdentifier::CreateFromOrigin(origin);
     EXPECT_EQ(cases[i].expected, identifier.ToString())
@@ skipping 32 matching lines @@
     {"file__0",
      "", "", 0, GURL("file:///"), true},
     {"__0",
      "", "", 0, GURL(), true},
     {"http_foo_bar_baz.org_0",
      "http", "foo_bar_baz.org", 0, GURL("http://foo_bar_baz.org"), false},
     {"http_xn--n3h.unicode.com_0",
      "http", "xn--n3h.unicode.com", 0,
       GURL("http://xn--n3h.unicode.com"), false},
     {"http_dot.com_0", "http", "dot.com", 0, GURL("http://dot.com"), false},
-    {"http_escaped%3Dfun.com_0", "http", "escaped%3dfun.com", 0,
-      GURL("http://escaped%3dfun.com"), false},
     {"http_[__1]_8080",
      "http", "[::1]", 8080, GURL("http://[::1]:8080"), false},
     {"http_[3ffe_2a00_100_7031__1]_0",
      "http", "[3ffe:2a00:100:7031::1]", 0,
       GURL("http://[3ffe:2a00:100:7031::1]"), false},
     {"http_[__ffff_8190_3426]_0",
      "http", "[::ffff:8190:3426]", 0, GURL("http://[::ffff:8190:3426]"), false},
   };
 
   for (size_t i = 0; i < arraysize(valid_cases); ++i) {
@@ skipping 59 matching lines @@
   TestValidOriginIdentifier(false,  "");
   TestValidOriginIdentifier(false, "bad..id");
   TestValidOriginIdentifier(false, "bad/id");
   TestValidOriginIdentifier(false, "bad\\id");
   TestValidOriginIdentifier(false, "http_bad:0_2");
   TestValidOriginIdentifier(false, std::string("bad\0id", 6));
 }
 
 }  // namespace
 }  // namespace content