OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/cookies/canonical_cookie.h" | 5 #include "net/cookies/canonical_cookie.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/test/histogram_tester.h" | 8 #include "base/test/histogram_tester.h" |
9 #include "net/cookies/cookie_constants.h" | 9 #include "net/cookies/cookie_constants.h" |
10 #include "net/cookies/cookie_options.h" | 10 #include "net/cookies/cookie_options.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 CanonicalCookie::Create(url, "A=2; HttpOnly", creation_time, options); | 78 CanonicalCookie::Create(url, "A=2; HttpOnly", creation_time, options); |
79 EXPECT_FALSE(cookie.get()); | 79 EXPECT_FALSE(cookie.get()); |
80 CookieOptions httponly_options; | 80 CookieOptions httponly_options; |
81 httponly_options.set_include_httponly(); | 81 httponly_options.set_include_httponly(); |
82 cookie = CanonicalCookie::Create(url, "A=2; HttpOnly", creation_time, | 82 cookie = CanonicalCookie::Create(url, "A=2; HttpOnly", creation_time, |
83 httponly_options); | 83 httponly_options); |
84 EXPECT_TRUE(cookie->IsHttpOnly()); | 84 EXPECT_TRUE(cookie->IsHttpOnly()); |
85 | 85 |
86 // Test creating SameSite cookies. | 86 // Test creating SameSite cookies. |
87 CookieOptions same_site_options; | 87 CookieOptions same_site_options; |
88 same_site_options.set_include_same_site(); | 88 same_site_options.set_same_site_mode( |
| 89 CookieOptions::SameSiteMode::INCLUDE_STRICT_AND_LAX); |
89 cookie = CanonicalCookie::Create(url, "A=2; SameSite=Strict", creation_time, | 90 cookie = CanonicalCookie::Create(url, "A=2; SameSite=Strict", creation_time, |
90 same_site_options); | 91 same_site_options); |
91 EXPECT_TRUE(cookie.get()); | 92 EXPECT_TRUE(cookie.get()); |
92 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); | 93 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); |
93 cookie = CanonicalCookie::Create(url, "A=2; SameSite=Lax", creation_time, | 94 cookie = CanonicalCookie::Create(url, "A=2; SameSite=Lax", creation_time, |
94 same_site_options); | 95 same_site_options); |
95 EXPECT_TRUE(cookie.get()); | 96 EXPECT_TRUE(cookie.get()); |
96 EXPECT_EQ(CookieSameSite::LAX_MODE, cookie->SameSite()); | 97 EXPECT_EQ(CookieSameSite::LAX_MODE, cookie->SameSite()); |
97 cookie = CanonicalCookie::Create(url, "A=2; SameSite", creation_time, | 98 cookie = CanonicalCookie::Create(url, "A=2; SameSite", creation_time, |
98 same_site_options); | 99 same_site_options); |
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 creation_time, options); | 464 creation_time, options); |
464 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); | 465 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); |
465 EXPECT_FALSE(cookie->IncludeForRequestURL(secure_url, options)); | 466 EXPECT_FALSE(cookie->IncludeForRequestURL(secure_url, options)); |
466 cookie = CanonicalCookie::Create(secure_url_with_path, | 467 cookie = CanonicalCookie::Create(secure_url_with_path, |
467 "A=2; SameSite=Strict; path=/foo/bar", | 468 "A=2; SameSite=Strict; path=/foo/bar", |
468 creation_time, options); | 469 creation_time, options); |
469 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); | 470 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); |
470 EXPECT_FALSE(cookie->IncludeForRequestURL(secure_url, options)); | 471 EXPECT_FALSE(cookie->IncludeForRequestURL(secure_url, options)); |
471 | 472 |
472 // Same-site cookies are included for same-site requests: | 473 // Same-site cookies are included for same-site requests: |
473 options.set_include_same_site(); | 474 options.set_same_site_mode( |
| 475 CookieOptions::SameSiteMode::INCLUDE_STRICT_AND_LAX); |
474 cookie = CanonicalCookie::Create(secure_url, "A=2; SameSite=Strict", | 476 cookie = CanonicalCookie::Create(secure_url, "A=2; SameSite=Strict", |
475 creation_time, options); | 477 creation_time, options); |
476 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); | 478 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); |
477 EXPECT_TRUE(cookie->IncludeForRequestURL(secure_url, options)); | 479 EXPECT_TRUE(cookie->IncludeForRequestURL(secure_url, options)); |
478 cookie = CanonicalCookie::Create(secure_url, "A=2; Secure; SameSite=Strict", | 480 cookie = CanonicalCookie::Create(secure_url, "A=2; Secure; SameSite=Strict", |
479 creation_time, options); | 481 creation_time, options); |
480 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); | 482 EXPECT_EQ(CookieSameSite::STRICT_MODE, cookie->SameSite()); |
481 EXPECT_TRUE(cookie->IncludeForRequestURL(secure_url, options)); | 483 EXPECT_TRUE(cookie->IncludeForRequestURL(secure_url, options)); |
482 cookie = CanonicalCookie::Create(secure_url_with_path, | 484 cookie = CanonicalCookie::Create(secure_url_with_path, |
483 "A=2; SameSite=Strict; path=/foo/bar", | 485 "A=2; SameSite=Strict; path=/foo/bar", |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
712 CanonicalCookie::COOKIE_PREFIX_SECURE, 1); | 714 CanonicalCookie::COOKIE_PREFIX_SECURE, 1); |
713 EXPECT_TRUE(CanonicalCookie::Create(https_url, "__SecureA=B; Path=/; Secure", | 715 EXPECT_TRUE(CanonicalCookie::Create(https_url, "__SecureA=B; Path=/; Secure", |
714 creation_time, options)); | 716 creation_time, options)); |
715 histograms.ExpectBucketCount(kCookiePrefixHistogram, | 717 histograms.ExpectBucketCount(kCookiePrefixHistogram, |
716 CanonicalCookie::COOKIE_PREFIX_SECURE, 2); | 718 CanonicalCookie::COOKIE_PREFIX_SECURE, 2); |
717 histograms.ExpectBucketCount(kCookiePrefixBlockedHistogram, | 719 histograms.ExpectBucketCount(kCookiePrefixBlockedHistogram, |
718 CanonicalCookie::COOKIE_PREFIX_SECURE, 1); | 720 CanonicalCookie::COOKIE_PREFIX_SECURE, 1); |
719 } | 721 } |
720 | 722 |
721 } // namespace net | 723 } // namespace net |
OLD | NEW |