| Index: net/cookies/cookie_util_unittest.cc
|
| diff --git a/net/cookies/cookie_util_unittest.cc b/net/cookies/cookie_util_unittest.cc
|
| index f297afdd076672b33e28b1951dc1928048bdcf55..7615873ef27a3a73fcc0caa9ac40e706f9e3c068 100644
|
| --- a/net/cookies/cookie_util_unittest.cc
|
| +++ b/net/cookies/cookie_util_unittest.cc
|
| @@ -10,11 +10,7 @@ TEST(CookieUtilTest, TestDomainIsHostOnly) {
|
| const struct {
|
| const char* str;
|
| const bool is_host_only;
|
| - } tests[] = {
|
| - { "", true },
|
| - { "www.google.com", true },
|
| - { ".google.com", false }
|
| - };
|
| + } tests[] = {{"", true}, {"www.google.com", true}, {".google.com", false}};
|
|
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
|
| EXPECT_EQ(tests[i].is_host_only,
|
| @@ -28,75 +24,75 @@ TEST(CookieUtilTest, TestCookieDateParsing) {
|
| const bool valid;
|
| const time_t epoch;
|
| } tests[] = {
|
| - { "Sat, 15-Apr-17 21:01:22 GMT", true, 1492290082 },
|
| - { "Thu, 19-Apr-2007 16:00:00 GMT", true, 1176998400 },
|
| - { "Wed, 25 Apr 2007 21:02:13 GMT", true, 1177534933 },
|
| - { "Thu, 19/Apr\\2007 16:00:00 GMT", true, 1176998400 },
|
| - { "Fri, 1 Jan 2010 01:01:50 GMT", true, 1262307710 },
|
| - { "Wednesday, 1-Jan-2003 00:00:00 GMT", true, 1041379200 },
|
| - { ", 1-Jan-2003 00:00:00 GMT", true, 1041379200 },
|
| - { " 1-Jan-2003 00:00:00 GMT", true, 1041379200 },
|
| - { "1-Jan-2003 00:00:00 GMT", true, 1041379200 },
|
| - { "Wed,18-Apr-07 22:50:12 GMT", true, 1176936612 },
|
| - { "WillyWonka , 18-Apr-07 22:50:12 GMT", true, 1176936612 },
|
| - { "WillyWonka , 18-Apr-07 22:50:12", true, 1176936612 },
|
| - { "WillyWonka , 18-apr-07 22:50:12", true, 1176936612 },
|
| - { "Mon, 18-Apr-1977 22:50:13 GMT", true, 230251813 },
|
| - { "Mon, 18-Apr-77 22:50:13 GMT", true, 230251813 },
|
| - // If the cookie came in with the expiration quoted (which in terms of
|
| - // the RFC you shouldn't do), we will get string quoted. Bug 1261605.
|
| - { "\"Sat, 15-Apr-17\\\"21:01:22\\\"GMT\"", true, 1492290082 },
|
| - // Test with full month names and partial names.
|
| - { "Partyday, 18- April-07 22:50:12", true, 1176936612 },
|
| - { "Partyday, 18 - Apri-07 22:50:12", true, 1176936612 },
|
| - { "Wednes, 1-Januar-2003 00:00:00 GMT", true, 1041379200 },
|
| - // Test that we always take GMT even with other time zones or bogus
|
| - // values. The RFC says everything should be GMT, and in the worst case
|
| - // we are 24 hours off because of zone issues.
|
| - { "Sat, 15-Apr-17 21:01:22", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 21:01:22 GMT-2", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 21:01:22 GMT BLAH", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 21:01:22 GMT-0400", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT)",true, 1492290082 },
|
| - { "Sat, 15-Apr-17 21:01:22 DST", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 21:01:22 -0400", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 21:01:22 (hello there)", true, 1492290082 },
|
| - // Test that if we encounter multiple : fields, that we take the first
|
| - // that correctly parses.
|
| - { "Sat, 15-Apr-17 21:01:22 11:22:33", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 ::00 21:01:22", true, 1492290082 },
|
| - { "Sat, 15-Apr-17 boink:z 21:01:22", true, 1492290082 },
|
| - // We take the first, which in this case is invalid.
|
| - { "Sat, 15-Apr-17 91:22:33 21:01:22", false, 0 },
|
| - // amazon.com formats their cookie expiration like this.
|
| - { "Thu Apr 18 22:50:12 2007 GMT", true, 1176936612 },
|
| - // Test that hh:mm:ss can occur anywhere.
|
| - { "22:50:12 Thu Apr 18 2007 GMT", true, 1176936612 },
|
| - { "Thu 22:50:12 Apr 18 2007 GMT", true, 1176936612 },
|
| - { "Thu Apr 22:50:12 18 2007 GMT", true, 1176936612 },
|
| - { "Thu Apr 18 22:50:12 2007 GMT", true, 1176936612 },
|
| - { "Thu Apr 18 2007 22:50:12 GMT", true, 1176936612 },
|
| - { "Thu Apr 18 2007 GMT 22:50:12", true, 1176936612 },
|
| - // Test that the day and year can be anywhere if they are unambigious.
|
| - { "Sat, 15-Apr-17 21:01:22 GMT", true, 1492290082 },
|
| - { "15-Sat, Apr-17 21:01:22 GMT", true, 1492290082 },
|
| - { "15-Sat, Apr 21:01:22 GMT 17", true, 1492290082 },
|
| - { "15-Sat, Apr 21:01:22 GMT 2017", true, 1492290082 },
|
| - { "15 Apr 21:01:22 2017", true, 1492290082 },
|
| - { "15 17 Apr 21:01:22", true, 1492290082 },
|
| - { "Apr 15 17 21:01:22", true, 1492290082 },
|
| - { "Apr 15 21:01:22 17", true, 1492290082 },
|
| - { "2017 April 15 21:01:22", true, 1492290082 },
|
| - { "15 April 2017 21:01:22", true, 1492290082 },
|
| - // Some invalid dates
|
| - { "98 April 17 21:01:22", false, 0 },
|
| - { "Thu, 012-Aug-2008 20:49:07 GMT", false, 0 },
|
| - { "Thu, 12-Aug-31841 20:49:07 GMT", false, 0 },
|
| - { "Thu, 12-Aug-9999999999 20:49:07 GMT", false, 0 },
|
| - { "Thu, 999999999999-Aug-2007 20:49:07 GMT", false, 0 },
|
| - { "Thu, 12-Aug-2007 20:61:99999999999 GMT", false, 0 },
|
| - { "IAintNoDateFool", false, 0 },
|
| - };
|
| + {"Sat, 15-Apr-17 21:01:22 GMT", true, 1492290082},
|
| + {"Thu, 19-Apr-2007 16:00:00 GMT", true, 1176998400},
|
| + {"Wed, 25 Apr 2007 21:02:13 GMT", true, 1177534933},
|
| + {"Thu, 19/Apr\\2007 16:00:00 GMT", true, 1176998400},
|
| + {"Fri, 1 Jan 2010 01:01:50 GMT", true, 1262307710},
|
| + {"Wednesday, 1-Jan-2003 00:00:00 GMT", true, 1041379200},
|
| + {", 1-Jan-2003 00:00:00 GMT", true, 1041379200},
|
| + {" 1-Jan-2003 00:00:00 GMT", true, 1041379200},
|
| + {"1-Jan-2003 00:00:00 GMT", true, 1041379200},
|
| + {"Wed,18-Apr-07 22:50:12 GMT", true, 1176936612},
|
| + {"WillyWonka , 18-Apr-07 22:50:12 GMT", true, 1176936612},
|
| + {"WillyWonka , 18-Apr-07 22:50:12", true, 1176936612},
|
| + {"WillyWonka , 18-apr-07 22:50:12", true, 1176936612},
|
| + {"Mon, 18-Apr-1977 22:50:13 GMT", true, 230251813},
|
| + {"Mon, 18-Apr-77 22:50:13 GMT", true, 230251813},
|
| + // If the cookie came in with the expiration quoted (which in terms of
|
| + // the RFC you shouldn't do), we will get string quoted. Bug 1261605.
|
| + {"\"Sat, 15-Apr-17\\\"21:01:22\\\"GMT\"", true, 1492290082},
|
| + // Test with full month names and partial names.
|
| + {"Partyday, 18- April-07 22:50:12", true, 1176936612},
|
| + {"Partyday, 18 - Apri-07 22:50:12", true, 1176936612},
|
| + {"Wednes, 1-Januar-2003 00:00:00 GMT", true, 1041379200},
|
| + // Test that we always take GMT even with other time zones or bogus
|
| + // values. The RFC says everything should be GMT, and in the worst case
|
| + // we are 24 hours off because of zone issues.
|
| + {"Sat, 15-Apr-17 21:01:22", true, 1492290082},
|
| + {"Sat, 15-Apr-17 21:01:22 GMT-2", true, 1492290082},
|
| + {"Sat, 15-Apr-17 21:01:22 GMT BLAH", true, 1492290082},
|
| + {"Sat, 15-Apr-17 21:01:22 GMT-0400", true, 1492290082},
|
| + {"Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT)", true, 1492290082},
|
| + {"Sat, 15-Apr-17 21:01:22 DST", true, 1492290082},
|
| + {"Sat, 15-Apr-17 21:01:22 -0400", true, 1492290082},
|
| + {"Sat, 15-Apr-17 21:01:22 (hello there)", true, 1492290082},
|
| + // Test that if we encounter multiple : fields, that we take the first
|
| + // that correctly parses.
|
| + {"Sat, 15-Apr-17 21:01:22 11:22:33", true, 1492290082},
|
| + {"Sat, 15-Apr-17 ::00 21:01:22", true, 1492290082},
|
| + {"Sat, 15-Apr-17 boink:z 21:01:22", true, 1492290082},
|
| + // We take the first, which in this case is invalid.
|
| + {"Sat, 15-Apr-17 91:22:33 21:01:22", false, 0},
|
| + // amazon.com formats their cookie expiration like this.
|
| + {"Thu Apr 18 22:50:12 2007 GMT", true, 1176936612},
|
| + // Test that hh:mm:ss can occur anywhere.
|
| + {"22:50:12 Thu Apr 18 2007 GMT", true, 1176936612},
|
| + {"Thu 22:50:12 Apr 18 2007 GMT", true, 1176936612},
|
| + {"Thu Apr 22:50:12 18 2007 GMT", true, 1176936612},
|
| + {"Thu Apr 18 22:50:12 2007 GMT", true, 1176936612},
|
| + {"Thu Apr 18 2007 22:50:12 GMT", true, 1176936612},
|
| + {"Thu Apr 18 2007 GMT 22:50:12", true, 1176936612},
|
| + // Test that the day and year can be anywhere if they are unambigious.
|
| + {"Sat, 15-Apr-17 21:01:22 GMT", true, 1492290082},
|
| + {"15-Sat, Apr-17 21:01:22 GMT", true, 1492290082},
|
| + {"15-Sat, Apr 21:01:22 GMT 17", true, 1492290082},
|
| + {"15-Sat, Apr 21:01:22 GMT 2017", true, 1492290082},
|
| + {"15 Apr 21:01:22 2017", true, 1492290082},
|
| + {"15 17 Apr 21:01:22", true, 1492290082},
|
| + {"Apr 15 17 21:01:22", true, 1492290082},
|
| + {"Apr 15 21:01:22 17", true, 1492290082},
|
| + {"2017 April 15 21:01:22", true, 1492290082},
|
| + {"15 April 2017 21:01:22", true, 1492290082},
|
| + // Some invalid dates
|
| + {"98 April 17 21:01:22", false, 0},
|
| + {"Thu, 012-Aug-2008 20:49:07 GMT", false, 0},
|
| + {"Thu, 12-Aug-31841 20:49:07 GMT", false, 0},
|
| + {"Thu, 12-Aug-9999999999 20:49:07 GMT", false, 0},
|
| + {"Thu, 999999999999-Aug-2007 20:49:07 GMT", false, 0},
|
| + {"Thu, 12-Aug-2007 20:61:99999999999 GMT", false, 0},
|
| + {"IAintNoDateFool", false, 0},
|
| + };
|
|
|
| base::Time parsed_time;
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
|
|
|