content/browser/net/sqlite_persistent_cookie_store.cc - Issue 876973003: Implement the "first-party-only" cookie flag.

Unified Diff: content/browser/net/sqlite_persistent_cookie_store.cc

Issue 876973003: Implement the "first-party-only" cookie flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: FirstPartyOnly. Created 5 years, 10 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

« no previous file with comments | « chrome/browser/extensions/api/cookies/cookies_unittest.cc ('k') | content/browser/net/sqlite_persistent_cookie_store_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/net/sqlite_persistent_cookie_store.cc

diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc

index c1eb1cc425f8e896abd25446083f4c618a9a159e..78345ced535039a2d5305258371eb3629de1f56e 100644

--- a/content/browser/net/sqlite_persistent_cookie_store.cc

+++ b/content/browser/net/sqlite_persistent_cookie_store.cc

@@ -311,6 +311,8 @@ namespace {

// Version number of the database.

+// Version 8 adds "first-party only" cookies.

+//

// Version 7 adds encrypted values. Old values will continue to be used but

// all new values written will be encrypted on selected operating systems. New

// records read by old clients will simply get an empty cookie value while old

@@ -334,7 +336,7 @@ namespace {

// Version 3 updated the database to include the last access time, so we can

// expire them in decreasing order of use when we've reached the maximum

// number of cookies.

-const int kCurrentVersionNumber = 7;

+const int kCurrentVersionNumber = 8;

const int kCompatibleVersionNumber = 5;

// Possible values for the 'priority' column.

@@ -400,19 +402,20 @@ bool InitTable(sql::Connection* db) {

if (!db->DoesTableExist("cookies")) {

std::string stmt(base::StringPrintf(

"CREATE TABLE cookies ("

- "creation_utc INTEGER NOT NULL UNIQUE PRIMARY KEY,"

- "host_key TEXT NOT NULL,"

- "name TEXT NOT NULL,"

- "value TEXT NOT NULL,"

- "path TEXT NOT NULL,"

- "expires_utc INTEGER NOT NULL,"

- "secure INTEGER NOT NULL,"

- "httponly INTEGER NOT NULL,"

- "last_access_utc INTEGER NOT NULL, "

- "has_expires INTEGER NOT NULL DEFAULT 1, "

- "persistent INTEGER NOT NULL DEFAULT 1,"

- "priority INTEGER NOT NULL DEFAULT %d,"

- "encrypted_value BLOB DEFAULT '')",

+ "creation_utc INTEGER NOT NULL UNIQUE PRIMARY KEY,"

+ "host_key TEXT NOT NULL,"

+ "name TEXT NOT NULL,"

+ "value TEXT NOT NULL,"

+ "path TEXT NOT NULL,"

+ "expires_utc INTEGER NOT NULL,"

+ "secure INTEGER NOT NULL,"

+ "httponly INTEGER NOT NULL,"

+ "last_access_utc INTEGER NOT NULL, "

+ "has_expires INTEGER NOT NULL DEFAULT 1, "

+ "persistent INTEGER NOT NULL DEFAULT 1,"

+ "priority INTEGER NOT NULL DEFAULT %d,"

+ "encrypted_value BLOB DEFAULT '',"

+ "firstpartyonly INTEGER NOT NULL DEFAULT 0)",

CookiePriorityToDBCookiePriority(net::COOKIE_PRIORITY_DEFAULT)));

if (!db->Execute(stmt.c_str()))

return false;

@@ -733,14 +736,14 @@ bool SQLitePersistentCookieStore::Backend::LoadCookiesForDomains(

smt.Assign(db_->GetCachedStatement(

SQL_FROM_HERE,

"SELECT creation_utc, host_key, name, value, encrypted_value, path, "

- "expires_utc, secure, httponly, last_access_utc, has_expires, "

- "persistent, priority FROM cookies WHERE host_key = ?"));

+ "expires_utc, secure, httponly, firstpartyonly, last_access_utc, "

+ "has_expires, persistent, priority FROM cookies WHERE host_key = ?"));

} else {

smt.Assign(db_->GetCachedStatement(

SQL_FROM_HERE,

"SELECT creation_utc, host_key, name, value, encrypted_value, path, "

- "expires_utc, secure, httponly, last_access_utc, has_expires, "

- "persistent, priority FROM cookies WHERE host_key = ? "

+ "expires_utc, secure, httponly, firstpartyonly, last_access_utc, "

+ "has_expires, persistent, priority FROM cookies WHERE host_key = ? "

"AND persistent = 1"));

}

if (!smt.is_valid()) {

@@ -779,18 +782,19 @@ void SQLitePersistentCookieStore::Backend::MakeCookiesFromSQLStatement(

}

scoped_ptr<net::CanonicalCookie> cc(new net::CanonicalCookie(

// The "source" URL is not used with persisted cookies.

- GURL(), // Source

- smt.ColumnString(2), // name

- value, // value

- smt.ColumnString(1), // domain

- smt.ColumnString(5), // path

- Time::FromInternalValue(smt.ColumnInt64(0)), // creation_utc

- Time::FromInternalValue(smt.ColumnInt64(6)), // expires_utc

- Time::FromInternalValue(smt.ColumnInt64(9)), // last_access_utc

- smt.ColumnInt(7) != 0, // secure

- smt.ColumnInt(8) != 0, // httponly

+ GURL(), // Source

+ smt.ColumnString(2), // name

+ value, // value

+ smt.ColumnString(1), // domain

+ smt.ColumnString(5), // path

+ Time::FromInternalValue(smt.ColumnInt64(0)), // creation_utc

+ Time::FromInternalValue(smt.ColumnInt64(6)), // expires_utc

+ Time::FromInternalValue(smt.ColumnInt64(10)), // last_access_utc

+ smt.ColumnInt(7) != 0, // secure

+ smt.ColumnInt(8) != 0, // httponly

+ smt.ColumnInt(9) != 0, // firstpartyonly

DBCookiePriorityToCookiePriority(

- static_cast<DBCookiePriority>(smt.ColumnInt(12))))); // priority

+ static_cast<DBCookiePriority>(smt.ColumnInt(13))))); // priority

DLOG_IF(WARNING, cc->CreationDate() > Time::Now())

<< L"CreationDate too recent";

cookies_per_origin_[CookieOrigin(cc->Domain(), cc->IsSecure())]++;

@@ -926,6 +930,27 @@ bool SQLitePersistentCookieStore::Backend::EnsureDatabaseVersion() {

base::TimeTicks::Now() - start_time);

}

+ if (cur_version == 7) {

+ const base::TimeTicks start_time = base::TimeTicks::Now();

+ sql::Transaction transaction(db_.get());

+ if (!transaction.Begin())

+ return false;

+ // Alter the table to add a 'firstpartyonly' column.

+ if (!db_->Execute(

+ "ALTER TABLE cookies "

+ "ADD COLUMN firstpartyonly INTEGER DEFAULT 0")) {

+ LOG(WARNING) << "Unable to update cookie database to version 8.";

+ return false;

+ }

+ ++cur_version;

+ meta_table_.SetVersionNumber(cur_version);

+ meta_table_.SetCompatibleVersionNumber(

+ std::min(cur_version, kCompatibleVersionNumber));

+ transaction.Commit();

+ UMA_HISTOGRAM_TIMES("Cookie.TimeDatabaseMigrationToV8",

+ base::TimeTicks::Now() - start_time);

+ }

// Put future migration cases here.

if (cur_version < kCurrentVersionNumber) {

@@ -1009,11 +1034,12 @@ void SQLitePersistentCookieStore::Backend::Commit() {

if (!db_.get() || ops.empty())

return;

- sql::Statement add_smt(db_->GetCachedStatement(SQL_FROM_HERE,

+ sql::Statement add_smt(db_->GetCachedStatement(

+ SQL_FROM_HERE,

"INSERT INTO cookies (creation_utc, host_key, name, value, "

- "encrypted_value, path, expires_utc, secure, httponly, last_access_utc, "

- "has_expires, persistent, priority) "

- "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)"));

+ "encrypted_value, path, expires_utc, secure, httponly, firstpartyonly, "

+ "last_access_utc, has_expires, persistent, priority) "

+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)"));

if (!add_smt.is_valid())

return;

@@ -1058,11 +1084,12 @@ void SQLitePersistentCookieStore::Backend::Commit() {

add_smt.BindInt64(6, po->cc().ExpiryDate().ToInternalValue());

add_smt.BindInt(7, po->cc().IsSecure());

add_smt.BindInt(8, po->cc().IsHttpOnly());

- add_smt.BindInt64(9, po->cc().LastAccessDate().ToInternalValue());

- add_smt.BindInt(10, po->cc().IsPersistent());

+ add_smt.BindInt(9, po->cc().IsFirstPartyOnly());

+ add_smt.BindInt64(10, po->cc().LastAccessDate().ToInternalValue());

add_smt.BindInt(11, po->cc().IsPersistent());

- add_smt.BindInt(

- 12, CookiePriorityToDBCookiePriority(po->cc().Priority()));

+ add_smt.BindInt(12, po->cc().IsPersistent());

+ add_smt.BindInt(13,

+ CookiePriorityToDBCookiePriority(po->cc().Priority()));

if (!add_smt.Run())

NOTREACHED() << "Could not add a cookie to the DB.";

break;