Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(879)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/cookies/canonical_cookie_unittest.cc

Issue 1773133002: SameSite: Implement 'Strict'/'Lax' attribute parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ios? Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/cookies/canonical_cookie.cc ('K') | « net/cookies/canonical_cookie.cc ('k') | net/cookies/cookie_constants.h » ('j') | net/cookies/cookie_constants.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cookies/canonical_cookie_unittest.cc
diff --git a/net/cookies/canonical_cookie_unittest.cc b/net/cookies/canonical_cookie_unittest.cc
index e5ad68ca7ceecf108069a707293830281235c04c..0c14a22e5a3e09c3df1bb5446fe3782b307451e1 100644
--- a/net/cookies/canonical_cookie_unittest.cc
+++ b/net/cookies/canonical_cookie_unittest.cc
@@ -19,7 +19,7 @@ TEST(CanonicalCookieTest, Constructor) {
CanonicalCookie cookie(url, "A", "2", "www.example.com", "/test",
current_time, base::Time(), current_time, false, false,
- false, COOKIE_PRIORITY_DEFAULT);
+ COOKIE_SAME_SITE_DEFAULT, COOKIE_PRIORITY_DEFAULT);
EXPECT_EQ(url.GetOrigin(), cookie.Source());
EXPECT_EQ("A", cookie.Name());
EXPECT_EQ("2", cookie.Value());
@@ -27,11 +27,12 @@ TEST(CanonicalCookieTest, Constructor) {
EXPECT_EQ("/test", cookie.Path());
EXPECT_FALSE(cookie.IsSecure());
EXPECT_FALSE(cookie.IsHttpOnly());
- EXPECT_FALSE(cookie.IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_NONE, cookie.SameSite());
CanonicalCookie cookie2(url, "A", "2", std::string(), std::string(),
current_time, base::Time(), current_time, false,
- false, false, COOKIE_PRIORITY_DEFAULT);
+ false, COOKIE_SAME_SITE_DEFAULT,
+ COOKIE_PRIORITY_DEFAULT);
EXPECT_EQ(url.GetOrigin(), cookie.Source());
EXPECT_EQ("A", cookie2.Name());
EXPECT_EQ("2", cookie2.Value());
@@ -39,7 +40,7 @@ TEST(CanonicalCookieTest, Constructor) {
EXPECT_EQ("", cookie2.Path());
EXPECT_FALSE(cookie2.IsSecure());
EXPECT_FALSE(cookie2.IsHttpOnly());
- EXPECT_FALSE(cookie2.IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_NONE, cookie2.SameSite());
}
TEST(CanonicalCookieTest, Create) {
@@ -85,16 +86,16 @@ TEST(CanonicalCookieTest, Create) {
// Test creating http only cookies.
CookieOptions same_site_options;
same_site_options.set_include_same_site();
- cookie = CanonicalCookie::Create(url, "A=2; SameSite", creation_time,
+ cookie = CanonicalCookie::Create(url, "A=2; SameSite=Strict", creation_time,
same_site_options);
EXPECT_TRUE(cookie.get());
- EXPECT_TRUE(cookie->IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_STRICT, cookie->SameSite());
// Test the creating cookies using specific parameter instead of a cookie
// string.
- cookie = CanonicalCookie::Create(url, "A", "2", "www.example.com", "/test",
- creation_time, base::Time(), false, false,
- false, false, COOKIE_PRIORITY_DEFAULT);
+ cookie = CanonicalCookie::Create(
+ url, "A", "2", "www.example.com", "/test", creation_time, base::Time(),
+ false, false, COOKIE_SAME_SITE_DEFAULT, false, COOKIE_PRIORITY_DEFAULT);
EXPECT_EQ(url.GetOrigin(), cookie->Source());
EXPECT_EQ("A", cookie->Name());
EXPECT_EQ("2", cookie->Value());
@@ -102,11 +103,11 @@ TEST(CanonicalCookieTest, Create) {
EXPECT_EQ("/test", cookie->Path());
EXPECT_FALSE(cookie->IsSecure());
EXPECT_FALSE(cookie->IsHttpOnly());
- EXPECT_FALSE(cookie->IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_NONE, cookie->SameSite());
- cookie = CanonicalCookie::Create(url, "A", "2", ".www.example.com", "/test",
- creation_time, base::Time(), false, false,
- false, false, COOKIE_PRIORITY_DEFAULT);
+ cookie = CanonicalCookie::Create(
+ url, "A", "2", ".www.example.com", "/test", creation_time, base::Time(),
+ false, false, COOKIE_SAME_SITE_DEFAULT, false, COOKIE_PRIORITY_DEFAULT);
EXPECT_EQ(url.GetOrigin(), cookie->Source());
EXPECT_EQ("A", cookie->Name());
EXPECT_EQ("2", cookie->Value());
@@ -114,7 +115,7 @@ TEST(CanonicalCookieTest, Create) {
EXPECT_EQ("/test", cookie->Path());
EXPECT_FALSE(cookie->IsSecure());
EXPECT_FALSE(cookie->IsHttpOnly());
- EXPECT_FALSE(cookie->IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_NONE, cookie->SameSite());
}
TEST(CanonicalCookieTest, EmptyExpiry) {
@@ -159,7 +160,7 @@ TEST(CanonicalCookieTest, IsEquivalent) {
base::Time expiration_time = creation_time + base::TimeDelta::FromDays(2);
bool secure(false);
bool httponly(false);
- bool same_site(false);
+ CookieSameSite same_site(COOKIE_SAME_SITE_NONE);
// Test that a cookie is equivalent to itself.
scoped_ptr<CanonicalCookie> cookie(new CanonicalCookie(
@@ -205,8 +206,8 @@ TEST(CanonicalCookieTest, IsEquivalent) {
other_cookie.reset(new CanonicalCookie(
url, cookie_name, cookie_name, cookie_domain, cookie_path, creation_time,
- expiration_time, last_access_time, secure, httponly, true,
- COOKIE_PRIORITY_LOW));
+ expiration_time, last_access_time, secure, httponly,
+ COOKIE_SAME_SITE_STRICT, COOKIE_PRIORITY_LOW));
EXPECT_TRUE(cookie->IsEquivalent(*other_cookie));
// Tests that use different variations of attribute values that
@@ -249,7 +250,7 @@ TEST(CanonicalCookieTest, IsEquivalentForSecureCookieMatching) {
base::Time expiration_time = creation_time + base::TimeDelta::FromDays(2);
bool secure(false);
bool httponly(false);
- bool same_site(false);
+ CookieSameSite same_site(COOKIE_SAME_SITE_NONE);
// Test that a cookie is equivalent to itself.
scoped_ptr<CanonicalCookie> cookie(new CanonicalCookie(
@@ -299,8 +300,8 @@ TEST(CanonicalCookieTest, IsEquivalentForSecureCookieMatching) {
other_cookie.reset(new CanonicalCookie(
url, cookie_name, cookie_name, cookie_domain, cookie_path, creation_time,
- expiration_time, last_access_time, secure, httponly, true,
- COOKIE_PRIORITY_LOW));
+ expiration_time, last_access_time, secure, httponly,
+ COOKIE_SAME_SITE_STRICT, COOKIE_PRIORITY_LOW));
EXPECT_TRUE(cookie->IsEquivalentForSecureCookieMatching(*other_cookie));
// The following 3 tests' expected results differ from their IsEquivalent
@@ -444,34 +445,34 @@ TEST(CanonicalCookieTest, IncludeSameSiteForSameSiteURL) {
// Same-site cookies are not included for cross-site requests,
// even if other properties match:
- cookie = CanonicalCookie::Create(secure_url, "A=2; SameSite", creation_time,
- options);
- EXPECT_TRUE(cookie->IsSameSite());
+ cookie = CanonicalCookie::Create(secure_url, "A=2; SameSite=Strict",
+ creation_time, options);
+ EXPECT_EQ(COOKIE_SAME_SITE_STRICT, cookie->SameSite());
EXPECT_FALSE(cookie->IncludeForRequestURL(secure_url, options));
- cookie = CanonicalCookie::Create(secure_url, "A=2; Secure; SameSite",
+ cookie = CanonicalCookie::Create(secure_url, "A=2; Secure; SameSite=Strict",
creation_time, options);
- EXPECT_TRUE(cookie->IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_STRICT, cookie->SameSite());
EXPECT_FALSE(cookie->IncludeForRequestURL(secure_url, options));
cookie = CanonicalCookie::Create(secure_url_with_path,
- "A=2; SameSite; path=/foo/bar",
+ "A=2; SameSite=Strict; path=/foo/bar",
creation_time, options);
- EXPECT_TRUE(cookie->IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_STRICT, cookie->SameSite());
EXPECT_FALSE(cookie->IncludeForRequestURL(secure_url, options));
// Same-site cookies are included for same-site requests:
options.set_include_same_site();
- cookie = CanonicalCookie::Create(secure_url, "A=2; SameSite", creation_time,
- options);
- EXPECT_TRUE(cookie->IsSameSite());
+ cookie = CanonicalCookie::Create(secure_url, "A=2; SameSite=Strict",
+ creation_time, options);
+ EXPECT_EQ(COOKIE_SAME_SITE_STRICT, cookie->SameSite());
EXPECT_TRUE(cookie->IncludeForRequestURL(secure_url, options));
- cookie = CanonicalCookie::Create(secure_url, "A=2; Secure; SameSite",
+ cookie = CanonicalCookie::Create(secure_url, "A=2; Secure; SameSite=Strict",
creation_time, options);
- EXPECT_TRUE(cookie->IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_STRICT, cookie->SameSite());
EXPECT_TRUE(cookie->IncludeForRequestURL(secure_url, options));
cookie = CanonicalCookie::Create(secure_url_with_path,
- "A=2; SameSite; path=/foo/bar",
+ "A=2; SameSite=Strict; path=/foo/bar",
creation_time, options);
- EXPECT_TRUE(cookie->IsSameSite());
+ EXPECT_EQ(COOKIE_SAME_SITE_STRICT, cookie->SameSite());
EXPECT_TRUE(cookie->IncludeForRequestURL(secure_url_with_path, options));
}
@@ -635,21 +636,21 @@ TEST(CanonicalCookieTest, EnforceSecureCookiesRequireSecureScheme) {
EXPECT_TRUE(https_cookie_secure.get());
scoped_ptr<CanonicalCookie> http_cookie_no_secure_extended(
- CanonicalCookie::Create(http_url, "a", "b", "", "", creation_time,
- creation_time, false, false, false, true,
- COOKIE_PRIORITY_DEFAULT));
+ CanonicalCookie::Create(
+ http_url, "a", "b", "", "", creation_time, creation_time, false,
+ false, COOKIE_SAME_SITE_STRICT, true, COOKIE_PRIORITY_DEFAULT));
scoped_ptr<CanonicalCookie> http_cookie_secure_extended(
- CanonicalCookie::Create(http_url, "a", "b", "", "", creation_time,
- creation_time, true, false, false, true,
- COOKIE_PRIORITY_DEFAULT));
+ CanonicalCookie::Create(
+ http_url, "a", "b", "", "", creation_time, creation_time, true, false,
+ COOKIE_SAME_SITE_STRICT, true, COOKIE_PRIORITY_DEFAULT));
scoped_ptr<CanonicalCookie> https_cookie_no_secure_extended(
- CanonicalCookie::Create(https_url, "a", "b", "", "", creation_time,
- creation_time, false, false, false, true,
- COOKIE_PRIORITY_DEFAULT));
+ CanonicalCookie::Create(
+ https_url, "a", "b", "", "", creation_time, creation_time, false,
+ false, COOKIE_SAME_SITE_STRICT, true, COOKIE_PRIORITY_DEFAULT));
scoped_ptr<CanonicalCookie> https_cookie_secure_extended(
- CanonicalCookie::Create(https_url, "a", "b", "", "", creation_time,
- creation_time, true, false, false, true,
- COOKIE_PRIORITY_DEFAULT));
+ CanonicalCookie::Create(
+ https_url, "a", "b", "", "", creation_time, creation_time, true,
+ false, COOKIE_SAME_SITE_STRICT, true, COOKIE_PRIORITY_DEFAULT));
EXPECT_TRUE(http_cookie_no_secure_extended.get());
EXPECT_FALSE(http_cookie_secure_extended.get());
« net/cookies/canonical_cookie.cc ('K') | « net/cookies/canonical_cookie.cc ('k') | net/cookies/cookie_constants.h » ('j') | net/cookies/cookie_constants.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698