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 "content/browser/net/sqlite_persistent_cookie_store.h" | 5 #include "content/browser/net/sqlite_persistent_cookie_store.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
13 #include "base/files/scoped_temp_dir.h" | 13 #include "base/files/scoped_temp_dir.h" |
14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/sequenced_task_runner.h" | 16 #include "base/sequenced_task_runner.h" |
17 #include "base/stl_util.h" | 17 #include "base/stl_util.h" |
18 #include "base/synchronization/waitable_event.h" | 18 #include "base/synchronization/waitable_event.h" |
19 #include "base/test/sequenced_worker_pool_owner.h" | 19 #include "base/test/sequenced_worker_pool_owner.h" |
20 #include "base/threading/sequenced_worker_pool.h" | 20 #include "base/threading/sequenced_worker_pool.h" |
21 #include "base/time/time.h" | 21 #include "base/time/time.h" |
22 #include "content/public/browser/cookie_crypto_delegate.h" | |
23 #include "content/public/browser/cookie_store_factory.h" | |
24 #include "crypto/encryptor.h" | |
25 #include "crypto/symmetric_key.h" | |
22 #include "net/cookies/canonical_cookie.h" | 26 #include "net/cookies/canonical_cookie.h" |
23 #include "net/cookies/cookie_constants.h" | 27 #include "net/cookies/cookie_constants.h" |
24 #include "sql/connection.h" | 28 #include "sql/connection.h" |
25 #include "sql/meta_table.h" | 29 #include "sql/meta_table.h" |
26 #include "testing/gtest/include/gtest/gtest.h" | 30 #include "testing/gtest/include/gtest/gtest.h" |
27 #include "url/gurl.h" | 31 #include "url/gurl.h" |
28 | 32 |
29 namespace content { | 33 namespace content { |
30 | 34 |
31 namespace { | 35 namespace { |
32 | 36 |
33 const base::FilePath::CharType kCookieFilename[] = FILE_PATH_LITERAL("Cookies"); | 37 const base::FilePath::CharType kCookieFilename[] = FILE_PATH_LITERAL("Cookies"); |
34 | 38 |
39 class CookieCryptor : public content::CookieCryptoDelegate { | |
40 public: | |
41 CookieCryptor(); | |
42 virtual bool EncryptString(const std::string& plaintext, | |
43 std::string* ciphertext) OVERRIDE; | |
44 virtual bool DecryptString(const std::string& ciphertext, | |
45 std::string* plaintext) OVERRIDE; | |
46 | |
47 private: | |
48 scoped_ptr<crypto::SymmetricKey> key_; | |
49 crypto::Encryptor encryptor_; | |
50 }; | |
51 | |
52 CookieCryptor::CookieCryptor() : key_( | |
53 crypto::SymmetricKey::DeriveKeyFromPassword( | |
54 crypto::SymmetricKey::AES, "password", "saltiest", 1000, 256)) { | |
55 std::string iv("the iv: 16 bytes"); | |
56 encryptor_.Init(key_.get(), crypto::Encryptor::CBC, iv); | |
57 } | |
58 | |
59 bool CookieCryptor::EncryptString(const std::string& plaintext, | |
60 std::string* ciphertext) { | |
61 return encryptor_.Encrypt(plaintext, ciphertext); | |
62 } | |
63 | |
64 bool CookieCryptor::DecryptString(const std::string& ciphertext, | |
65 std::string* plaintext) { | |
66 return encryptor_.Decrypt(ciphertext, plaintext); | |
67 } | |
68 | |
35 } // namespace | 69 } // namespace |
36 | 70 |
37 typedef std::vector<net::CanonicalCookie*> CanonicalCookieVector; | 71 typedef std::vector<net::CanonicalCookie*> CanonicalCookieVector; |
38 | 72 |
39 class SQLitePersistentCookieStoreTest : public testing::Test { | 73 class SQLitePersistentCookieStoreTest : public testing::Test { |
40 public: | 74 public: |
41 SQLitePersistentCookieStoreTest() | 75 SQLitePersistentCookieStoreTest() |
42 : pool_owner_(new base::SequencedWorkerPoolOwner(3, "Background Pool")), | 76 : pool_owner_(new base::SequencedWorkerPoolOwner(3, "Background Pool")), |
43 loaded_event_(false, false), | 77 loaded_event_(false, false), |
44 key_loaded_event_(false, false), | 78 key_loaded_event_(false, false), |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 void DestroyStore() { | 117 void DestroyStore() { |
84 store_ = NULL; | 118 store_ = NULL; |
85 // Make sure we wait until the destructor has run by shutting down the pool | 119 // Make sure we wait until the destructor has run by shutting down the pool |
86 // resetting the owner (whose destructor blocks on the pool completion). | 120 // resetting the owner (whose destructor blocks on the pool completion). |
87 pool_owner_->pool()->Shutdown(); | 121 pool_owner_->pool()->Shutdown(); |
88 // Create a new pool for the few tests that create multiple stores. In other | 122 // Create a new pool for the few tests that create multiple stores. In other |
89 // cases this is wasted but harmless. | 123 // cases this is wasted but harmless. |
90 pool_owner_.reset(new base::SequencedWorkerPoolOwner(3, "Background Pool")); | 124 pool_owner_.reset(new base::SequencedWorkerPoolOwner(3, "Background Pool")); |
91 } | 125 } |
92 | 126 |
93 void CreateAndLoad(bool restore_old_session_cookies, | 127 void CreateAndLoad(bool crypt_cookies, |
128 bool restore_old_session_cookies, | |
94 CanonicalCookieVector* cookies) { | 129 CanonicalCookieVector* cookies) { |
95 store_ = new SQLitePersistentCookieStore( | 130 store_ = new SQLitePersistentCookieStore( |
96 temp_dir_.path().Append(kCookieFilename), | 131 temp_dir_.path().Append(kCookieFilename), |
97 client_task_runner(), | 132 client_task_runner(), |
98 background_task_runner(), | 133 background_task_runner(), |
99 restore_old_session_cookies, | 134 restore_old_session_cookies, |
100 NULL); | 135 NULL, |
136 crypt_cookies ? new CookieCryptor : NULL); | |
101 Load(cookies); | 137 Load(cookies); |
102 } | 138 } |
103 | 139 |
104 void InitializeStore(bool restore_old_session_cookies) { | 140 void InitializeStore(bool crypt, bool restore_old_session_cookies) { |
Scott Hess - ex-Googler
2013/10/08 17:35:55
VERY easy to get your bools in the wrong order for
| |
105 CanonicalCookieVector cookies; | 141 CanonicalCookieVector cookies; |
106 CreateAndLoad(restore_old_session_cookies, &cookies); | 142 CreateAndLoad(crypt, restore_old_session_cookies, &cookies); |
107 EXPECT_EQ(0U, cookies.size()); | 143 EXPECT_EQ(0U, cookies.size()); |
108 } | 144 } |
109 | 145 |
110 // We have to create this method to wrap WaitableEvent::Wait, since we cannot | 146 // We have to create this method to wrap WaitableEvent::Wait, since we cannot |
111 // bind a non-void returning method as a Closure. | 147 // bind a non-void returning method as a Closure. |
112 void WaitOnDBEvent() { | 148 void WaitOnDBEvent() { |
113 db_thread_event_.Wait(); | 149 db_thread_event_.Wait(); |
114 } | 150 } |
115 | 151 |
116 // Adds a persistent cookie to store_. | 152 // Adds a persistent cookie to store_. |
(...skipping 22 matching lines...) Expand all Loading... | |
139 scoped_ptr<base::SequencedWorkerPoolOwner> pool_owner_; | 175 scoped_ptr<base::SequencedWorkerPoolOwner> pool_owner_; |
140 base::WaitableEvent loaded_event_; | 176 base::WaitableEvent loaded_event_; |
141 base::WaitableEvent key_loaded_event_; | 177 base::WaitableEvent key_loaded_event_; |
142 base::WaitableEvent db_thread_event_; | 178 base::WaitableEvent db_thread_event_; |
143 CanonicalCookieVector cookies_; | 179 CanonicalCookieVector cookies_; |
144 base::ScopedTempDir temp_dir_; | 180 base::ScopedTempDir temp_dir_; |
145 scoped_refptr<SQLitePersistentCookieStore> store_; | 181 scoped_refptr<SQLitePersistentCookieStore> store_; |
146 }; | 182 }; |
147 | 183 |
148 TEST_F(SQLitePersistentCookieStoreTest, TestInvalidMetaTableRecovery) { | 184 TEST_F(SQLitePersistentCookieStoreTest, TestInvalidMetaTableRecovery) { |
149 InitializeStore(false); | 185 InitializeStore(false, false); |
150 AddCookie("A", "B", "foo.bar", "/", base::Time::Now()); | 186 AddCookie("A", "B", "foo.bar", "/", base::Time::Now()); |
151 DestroyStore(); | 187 DestroyStore(); |
152 | 188 |
153 // Load up the store and verify that it has good data in it. | 189 // Load up the store and verify that it has good data in it. |
154 CanonicalCookieVector cookies; | 190 CanonicalCookieVector cookies; |
155 CreateAndLoad(false, &cookies); | 191 CreateAndLoad(false, false, &cookies); |
156 ASSERT_EQ(1U, cookies.size()); | 192 ASSERT_EQ(1U, cookies.size()); |
157 ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str()); | 193 ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str()); |
158 ASSERT_STREQ("A", cookies[0]->Name().c_str()); | 194 ASSERT_STREQ("A", cookies[0]->Name().c_str()); |
159 ASSERT_STREQ("B", cookies[0]->Value().c_str()); | 195 ASSERT_STREQ("B", cookies[0]->Value().c_str()); |
160 DestroyStore(); | 196 DestroyStore(); |
161 STLDeleteElements(&cookies); | 197 STLDeleteElements(&cookies); |
162 | 198 |
163 // Now corrupt the meta table. | 199 // Now corrupt the meta table. |
164 { | 200 { |
165 sql::Connection db; | 201 sql::Connection db; |
166 ASSERT_TRUE(db.Open(temp_dir_.path().Append(kCookieFilename))); | 202 ASSERT_TRUE(db.Open(temp_dir_.path().Append(kCookieFilename))); |
167 sql::MetaTable meta_table_; | 203 sql::MetaTable meta_table_; |
168 meta_table_.Init(&db, 1, 1); | 204 meta_table_.Init(&db, 1, 1); |
169 ASSERT_TRUE(db.Execute("DELETE FROM meta")); | 205 ASSERT_TRUE(db.Execute("DELETE FROM meta")); |
170 db.Close(); | 206 db.Close(); |
171 } | 207 } |
172 | 208 |
173 // Upon loading, the database should be reset to a good, blank state. | 209 // Upon loading, the database should be reset to a good, blank state. |
174 CreateAndLoad(false, &cookies); | 210 CreateAndLoad(false, false, &cookies); |
175 ASSERT_EQ(0U, cookies.size()); | 211 ASSERT_EQ(0U, cookies.size()); |
176 | 212 |
177 // Verify that, after, recovery, the database persists properly. | 213 // Verify that, after, recovery, the database persists properly. |
178 AddCookie("X", "Y", "foo.bar", "/", base::Time::Now()); | 214 AddCookie("X", "Y", "foo.bar", "/", base::Time::Now()); |
179 DestroyStore(); | 215 DestroyStore(); |
180 CreateAndLoad(false, &cookies); | 216 CreateAndLoad(false, false, &cookies); |
181 ASSERT_EQ(1U, cookies.size()); | 217 ASSERT_EQ(1U, cookies.size()); |
182 ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str()); | 218 ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str()); |
183 ASSERT_STREQ("X", cookies[0]->Name().c_str()); | 219 ASSERT_STREQ("X", cookies[0]->Name().c_str()); |
184 ASSERT_STREQ("Y", cookies[0]->Value().c_str()); | 220 ASSERT_STREQ("Y", cookies[0]->Value().c_str()); |
185 STLDeleteElements(&cookies); | 221 STLDeleteElements(&cookies); |
186 } | 222 } |
187 | 223 |
188 // Test if data is stored as expected in the SQLite database. | 224 // Test if data is stored as expected in the SQLite database. |
189 TEST_F(SQLitePersistentCookieStoreTest, TestPersistance) { | 225 TEST_F(SQLitePersistentCookieStoreTest, TestPersistance) { |
190 InitializeStore(false); | 226 InitializeStore(false, false); |
191 AddCookie("A", "B", "foo.bar", "/", base::Time::Now()); | 227 AddCookie("A", "B", "foo.bar", "/", base::Time::Now()); |
192 // Replace the store effectively destroying the current one and forcing it | 228 // Replace the store effectively destroying the current one and forcing it |
193 // to write its data to disk. Then we can see if after loading it again it | 229 // to write its data to disk. Then we can see if after loading it again it |
194 // is still there. | 230 // is still there. |
195 DestroyStore(); | 231 DestroyStore(); |
196 // Reload and test for persistence | 232 // Reload and test for persistence |
197 CanonicalCookieVector cookies; | 233 CanonicalCookieVector cookies; |
198 CreateAndLoad(false, &cookies); | 234 CreateAndLoad(false, false, &cookies); |
199 ASSERT_EQ(1U, cookies.size()); | 235 ASSERT_EQ(1U, cookies.size()); |
200 ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str()); | 236 ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str()); |
201 ASSERT_STREQ("A", cookies[0]->Name().c_str()); | 237 ASSERT_STREQ("A", cookies[0]->Name().c_str()); |
202 ASSERT_STREQ("B", cookies[0]->Value().c_str()); | 238 ASSERT_STREQ("B", cookies[0]->Value().c_str()); |
203 | 239 |
204 // Now delete the cookie and check persistence again. | 240 // Now delete the cookie and check persistence again. |
205 store_->DeleteCookie(*cookies[0]); | 241 store_->DeleteCookie(*cookies[0]); |
206 DestroyStore(); | 242 DestroyStore(); |
207 STLDeleteElements(&cookies); | 243 STLDeleteElements(&cookies); |
208 | 244 |
209 // Reload and check if the cookie has been removed. | 245 // Reload and check if the cookie has been removed. |
210 CreateAndLoad(false, &cookies); | 246 CreateAndLoad(false, false, &cookies); |
211 ASSERT_EQ(0U, cookies.size()); | 247 ASSERT_EQ(0U, cookies.size()); |
212 } | 248 } |
213 | 249 |
214 // Test that priority load of cookies for a specfic domain key could be | 250 // Test that priority load of cookies for a specfic domain key could be |
215 // completed before the entire store is loaded | 251 // completed before the entire store is loaded |
216 TEST_F(SQLitePersistentCookieStoreTest, TestLoadCookiesForKey) { | 252 TEST_F(SQLitePersistentCookieStoreTest, TestLoadCookiesForKey) { |
217 InitializeStore(false); | 253 InitializeStore(false, false); |
218 base::Time t = base::Time::Now(); | 254 base::Time t = base::Time::Now(); |
219 AddCookie("A", "B", "foo.bar", "/", t); | 255 AddCookie("A", "B", "foo.bar", "/", t); |
220 t += base::TimeDelta::FromInternalValue(10); | 256 t += base::TimeDelta::FromInternalValue(10); |
221 AddCookie("A", "B", "www.aaa.com", "/", t); | 257 AddCookie("A", "B", "www.aaa.com", "/", t); |
222 t += base::TimeDelta::FromInternalValue(10); | 258 t += base::TimeDelta::FromInternalValue(10); |
223 AddCookie("A", "B", "travel.aaa.com", "/", t); | 259 AddCookie("A", "B", "travel.aaa.com", "/", t); |
224 t += base::TimeDelta::FromInternalValue(10); | 260 t += base::TimeDelta::FromInternalValue(10); |
225 AddCookie("A", "B", "www.bbb.com", "/", t); | 261 AddCookie("A", "B", "www.bbb.com", "/", t); |
226 DestroyStore(); | 262 DestroyStore(); |
227 | 263 |
228 store_ = new SQLitePersistentCookieStore( | 264 store_ = new SQLitePersistentCookieStore( |
229 temp_dir_.path().Append(kCookieFilename), | 265 temp_dir_.path().Append(kCookieFilename), |
230 client_task_runner(), | 266 client_task_runner(), |
231 background_task_runner(), | 267 background_task_runner(), |
232 false, NULL); | 268 false, NULL, NULL); |
233 // Posting a blocking task to db_thread_ makes sure that the DB thread waits | 269 // Posting a blocking task to db_thread_ makes sure that the DB thread waits |
234 // until both Load and LoadCookiesForKey have been posted to its task queue. | 270 // until both Load and LoadCookiesForKey have been posted to its task queue. |
235 background_task_runner()->PostTask( | 271 background_task_runner()->PostTask( |
236 FROM_HERE, | 272 FROM_HERE, |
237 base::Bind(&SQLitePersistentCookieStoreTest::WaitOnDBEvent, | 273 base::Bind(&SQLitePersistentCookieStoreTest::WaitOnDBEvent, |
238 base::Unretained(this))); | 274 base::Unretained(this))); |
239 store_->Load(base::Bind(&SQLitePersistentCookieStoreTest::OnLoaded, | 275 store_->Load(base::Bind(&SQLitePersistentCookieStoreTest::OnLoaded, |
240 base::Unretained(this))); | 276 base::Unretained(this))); |
241 store_->LoadCookiesForKey("aaa.com", | 277 store_->LoadCookiesForKey("aaa.com", |
242 base::Bind(&SQLitePersistentCookieStoreTest::OnKeyLoaded, | 278 base::Bind(&SQLitePersistentCookieStoreTest::OnKeyLoaded, |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
277 } | 313 } |
278 ASSERT_EQ(4U, cookies_loaded.size()); | 314 ASSERT_EQ(4U, cookies_loaded.size()); |
279 ASSERT_EQ(cookies_loaded.find("foo.bar") != cookies_loaded.end(), | 315 ASSERT_EQ(cookies_loaded.find("foo.bar") != cookies_loaded.end(), |
280 true); | 316 true); |
281 ASSERT_EQ(cookies_loaded.find("www.bbb.com") != cookies_loaded.end(), true); | 317 ASSERT_EQ(cookies_loaded.find("www.bbb.com") != cookies_loaded.end(), true); |
282 STLDeleteElements(&cookies_); | 318 STLDeleteElements(&cookies_); |
283 } | 319 } |
284 | 320 |
285 // Test that we can force the database to be written by calling Flush(). | 321 // Test that we can force the database to be written by calling Flush(). |
286 TEST_F(SQLitePersistentCookieStoreTest, TestFlush) { | 322 TEST_F(SQLitePersistentCookieStoreTest, TestFlush) { |
287 InitializeStore(false); | 323 InitializeStore(false, false); |
288 // File timestamps don't work well on all platforms, so we'll determine | 324 // File timestamps don't work well on all platforms, so we'll determine |
289 // whether the DB file has been modified by checking its size. | 325 // whether the DB file has been modified by checking its size. |
290 base::FilePath path = temp_dir_.path().Append(kCookieFilename); | 326 base::FilePath path = temp_dir_.path().Append(kCookieFilename); |
291 base::PlatformFileInfo info; | 327 base::PlatformFileInfo info; |
292 ASSERT_TRUE(file_util::GetFileInfo(path, &info)); | 328 ASSERT_TRUE(file_util::GetFileInfo(path, &info)); |
293 int64 base_size = info.size; | 329 int64 base_size = info.size; |
294 | 330 |
295 // Write some large cookies, so the DB will have to expand by several KB. | 331 // Write some large cookies, so the DB will have to expand by several KB. |
296 for (char c = 'a'; c < 'z'; ++c) { | 332 for (char c = 'a'; c < 'z'; ++c) { |
297 // Each cookie needs a unique timestamp for creation_utc (see DB schema). | 333 // Each cookie needs a unique timestamp for creation_utc (see DB schema). |
298 base::Time t = base::Time::Now() + base::TimeDelta::FromMicroseconds(c); | 334 base::Time t = base::Time::Now() + base::TimeDelta::FromMicroseconds(c); |
299 std::string name(1, c); | 335 std::string name(1, c); |
300 std::string value(1000, c); | 336 std::string value(1000, c); |
301 AddCookie(name, value, "foo.bar", "/", t); | 337 AddCookie(name, value, "foo.bar", "/", t); |
302 } | 338 } |
303 | 339 |
304 Flush(); | 340 Flush(); |
305 | 341 |
306 // We forced a write, so now the file will be bigger. | 342 // We forced a write, so now the file will be bigger. |
307 ASSERT_TRUE(file_util::GetFileInfo(path, &info)); | 343 ASSERT_TRUE(file_util::GetFileInfo(path, &info)); |
308 ASSERT_GT(info.size, base_size); | 344 ASSERT_GT(info.size, base_size); |
309 } | 345 } |
310 | 346 |
311 // Test loading old session cookies from the disk. | 347 // Test loading old session cookies from the disk. |
312 TEST_F(SQLitePersistentCookieStoreTest, TestLoadOldSessionCookies) { | 348 TEST_F(SQLitePersistentCookieStoreTest, TestLoadOldSessionCookies) { |
313 InitializeStore(true); | 349 InitializeStore(false, true); |
314 | 350 |
315 // Add a session cookie. | 351 // Add a session cookie. |
316 store_->AddCookie( | 352 store_->AddCookie( |
317 net::CanonicalCookie( | 353 net::CanonicalCookie( |
318 GURL(), "C", "D", "sessioncookie.com", "/", base::Time::Now(), | 354 GURL(), "C", "D", "sessioncookie.com", "/", base::Time::Now(), |
319 base::Time(), base::Time::Now(), false, false, | 355 base::Time(), base::Time::Now(), false, false, |
320 net::COOKIE_PRIORITY_DEFAULT)); | 356 net::COOKIE_PRIORITY_DEFAULT)); |
321 | 357 |
322 // Force the store to write its data to the disk. | 358 // Force the store to write its data to the disk. |
323 DestroyStore(); | 359 DestroyStore(); |
324 | 360 |
325 // Create a store that loads session cookies and test that the session cookie | 361 // Create a store that loads session cookies and test that the session cookie |
326 // was loaded. | 362 // was loaded. |
327 CanonicalCookieVector cookies; | 363 CanonicalCookieVector cookies; |
328 CreateAndLoad(true, &cookies); | 364 CreateAndLoad(false, true, &cookies); |
329 | 365 |
330 ASSERT_EQ(1U, cookies.size()); | 366 ASSERT_EQ(1U, cookies.size()); |
331 ASSERT_STREQ("sessioncookie.com", cookies[0]->Domain().c_str()); | 367 ASSERT_STREQ("sessioncookie.com", cookies[0]->Domain().c_str()); |
332 ASSERT_STREQ("C", cookies[0]->Name().c_str()); | 368 ASSERT_STREQ("C", cookies[0]->Name().c_str()); |
333 ASSERT_STREQ("D", cookies[0]->Value().c_str()); | 369 ASSERT_STREQ("D", cookies[0]->Value().c_str()); |
334 ASSERT_EQ(net::COOKIE_PRIORITY_DEFAULT, cookies[0]->Priority()); | 370 ASSERT_EQ(net::COOKIE_PRIORITY_DEFAULT, cookies[0]->Priority()); |
335 | 371 |
336 STLDeleteElements(&cookies); | 372 STLDeleteElements(&cookies); |
337 } | 373 } |
338 | 374 |
339 // Test loading old session cookies from the disk. | 375 // Test loading old session cookies from the disk. |
340 TEST_F(SQLitePersistentCookieStoreTest, TestDontLoadOldSessionCookies) { | 376 TEST_F(SQLitePersistentCookieStoreTest, TestDontLoadOldSessionCookies) { |
341 InitializeStore(true); | 377 InitializeStore(false, true); |
342 | 378 |
343 // Add a session cookie. | 379 // Add a session cookie. |
344 store_->AddCookie( | 380 store_->AddCookie( |
345 net::CanonicalCookie( | 381 net::CanonicalCookie( |
346 GURL(), "C", "D", "sessioncookie.com", "/", base::Time::Now(), | 382 GURL(), "C", "D", "sessioncookie.com", "/", base::Time::Now(), |
347 base::Time(), base::Time::Now(), false, false, | 383 base::Time(), base::Time::Now(), false, false, |
348 net::COOKIE_PRIORITY_DEFAULT)); | 384 net::COOKIE_PRIORITY_DEFAULT)); |
349 | 385 |
350 // Force the store to write its data to the disk. | 386 // Force the store to write its data to the disk. |
351 DestroyStore(); | 387 DestroyStore(); |
352 | 388 |
353 // Create a store that doesn't load old session cookies and test that the | 389 // Create a store that doesn't load old session cookies and test that the |
354 // session cookie was not loaded. | 390 // session cookie was not loaded. |
355 CanonicalCookieVector cookies; | 391 CanonicalCookieVector cookies; |
356 CreateAndLoad(false, &cookies); | 392 CreateAndLoad(false, false, &cookies); |
357 ASSERT_EQ(0U, cookies.size()); | 393 ASSERT_EQ(0U, cookies.size()); |
358 | 394 |
359 // The store should also delete the session cookie. Wait until that has been | 395 // The store should also delete the session cookie. Wait until that has been |
360 // done. | 396 // done. |
361 DestroyStore(); | 397 DestroyStore(); |
362 | 398 |
363 // Create a store that loads old session cookies and test that the session | 399 // Create a store that loads old session cookies and test that the session |
364 // cookie is gone. | 400 // cookie is gone. |
365 CreateAndLoad(true, &cookies); | 401 CreateAndLoad(false, true, &cookies); |
366 ASSERT_EQ(0U, cookies.size()); | 402 ASSERT_EQ(0U, cookies.size()); |
367 } | 403 } |
368 | 404 |
369 TEST_F(SQLitePersistentCookieStoreTest, PersistIsPersistent) { | 405 TEST_F(SQLitePersistentCookieStoreTest, PersistIsPersistent) { |
370 InitializeStore(true); | 406 InitializeStore(false, true); |
371 static const char kSessionName[] = "session"; | 407 static const char kSessionName[] = "session"; |
372 static const char kPersistentName[] = "persistent"; | 408 static const char kPersistentName[] = "persistent"; |
373 | 409 |
374 // Add a session cookie. | 410 // Add a session cookie. |
375 store_->AddCookie( | 411 store_->AddCookie( |
376 net::CanonicalCookie( | 412 net::CanonicalCookie( |
377 GURL(), kSessionName, "val", "sessioncookie.com", "/", | 413 GURL(), kSessionName, "val", "sessioncookie.com", "/", |
378 base::Time::Now(), base::Time(), base::Time::Now(), false, false, | 414 base::Time::Now(), base::Time(), base::Time::Now(), false, false, |
379 net::COOKIE_PRIORITY_DEFAULT)); | 415 net::COOKIE_PRIORITY_DEFAULT)); |
380 // Add a persistent cookie. | 416 // Add a persistent cookie. |
381 store_->AddCookie( | 417 store_->AddCookie( |
382 net::CanonicalCookie( | 418 net::CanonicalCookie( |
383 GURL(), kPersistentName, "val", "sessioncookie.com", "/", | 419 GURL(), kPersistentName, "val", "sessioncookie.com", "/", |
384 base::Time::Now() - base::TimeDelta::FromDays(1), | 420 base::Time::Now() - base::TimeDelta::FromDays(1), |
385 base::Time::Now() + base::TimeDelta::FromDays(1), | 421 base::Time::Now() + base::TimeDelta::FromDays(1), |
386 base::Time::Now(), false, false, | 422 base::Time::Now(), false, false, |
387 net::COOKIE_PRIORITY_DEFAULT)); | 423 net::COOKIE_PRIORITY_DEFAULT)); |
388 | 424 |
389 // Force the store to write its data to the disk. | 425 // Force the store to write its data to the disk. |
390 DestroyStore(); | 426 DestroyStore(); |
391 | 427 |
392 // Create a store that loads session cookie and test that the IsPersistent | 428 // Create a store that loads session cookie and test that the IsPersistent |
393 // attribute is restored. | 429 // attribute is restored. |
394 CanonicalCookieVector cookies; | 430 CanonicalCookieVector cookies; |
395 CreateAndLoad(true, &cookies); | 431 CreateAndLoad(false, true, &cookies); |
396 ASSERT_EQ(2U, cookies.size()); | 432 ASSERT_EQ(2U, cookies.size()); |
397 | 433 |
398 std::map<std::string, net::CanonicalCookie*> cookie_map; | 434 std::map<std::string, net::CanonicalCookie*> cookie_map; |
399 for (CanonicalCookieVector::const_iterator it = cookies.begin(); | 435 for (CanonicalCookieVector::const_iterator it = cookies.begin(); |
400 it != cookies.end(); | 436 it != cookies.end(); |
401 ++it) { | 437 ++it) { |
402 cookie_map[(*it)->Name()] = *it; | 438 cookie_map[(*it)->Name()] = *it; |
403 } | 439 } |
404 | 440 |
405 std::map<std::string, net::CanonicalCookie*>::const_iterator it = | 441 std::map<std::string, net::CanonicalCookie*>::const_iterator it = |
406 cookie_map.find(kSessionName); | 442 cookie_map.find(kSessionName); |
407 ASSERT_TRUE(it != cookie_map.end()); | 443 ASSERT_TRUE(it != cookie_map.end()); |
408 EXPECT_FALSE(cookie_map[kSessionName]->IsPersistent()); | 444 EXPECT_FALSE(cookie_map[kSessionName]->IsPersistent()); |
409 | 445 |
410 it = cookie_map.find(kPersistentName); | 446 it = cookie_map.find(kPersistentName); |
411 ASSERT_TRUE(it != cookie_map.end()); | 447 ASSERT_TRUE(it != cookie_map.end()); |
412 EXPECT_TRUE(cookie_map[kPersistentName]->IsPersistent()); | 448 EXPECT_TRUE(cookie_map[kPersistentName]->IsPersistent()); |
413 | 449 |
414 STLDeleteElements(&cookies); | 450 STLDeleteElements(&cookies); |
415 } | 451 } |
416 | 452 |
417 TEST_F(SQLitePersistentCookieStoreTest, PriorityIsPersistent) { | 453 TEST_F(SQLitePersistentCookieStoreTest, PriorityIsPersistent) { |
418 static const char kLowName[] = "low"; | 454 static const char kLowName[] = "low"; |
419 static const char kMediumName[] = "medium"; | 455 static const char kMediumName[] = "medium"; |
420 static const char kHighName[] = "high"; | 456 static const char kHighName[] = "high"; |
421 static const char kCookieDomain[] = "sessioncookie.com"; | 457 static const char kCookieDomain[] = "sessioncookie.com"; |
422 static const char kCookieValue[] = "value"; | 458 static const char kCookieValue[] = "value"; |
423 static const char kCookiePath[] = "/"; | 459 static const char kCookiePath[] = "/"; |
424 | 460 |
425 InitializeStore(true); | 461 InitializeStore(false, true); |
426 | 462 |
427 // Add a low-priority persistent cookie. | 463 // Add a low-priority persistent cookie. |
428 store_->AddCookie( | 464 store_->AddCookie( |
429 net::CanonicalCookie( | 465 net::CanonicalCookie( |
430 GURL(), kLowName, kCookieValue, kCookieDomain, kCookiePath, | 466 GURL(), kLowName, kCookieValue, kCookieDomain, kCookiePath, |
431 base::Time::Now() - base::TimeDelta::FromMinutes(1), | 467 base::Time::Now() - base::TimeDelta::FromMinutes(1), |
432 base::Time::Now() + base::TimeDelta::FromDays(1), | 468 base::Time::Now() + base::TimeDelta::FromDays(1), |
433 base::Time::Now(), false, false, | 469 base::Time::Now(), false, false, |
434 net::COOKIE_PRIORITY_LOW)); | 470 net::COOKIE_PRIORITY_LOW)); |
435 | 471 |
(...skipping 14 matching lines...) Expand all Loading... | |
450 base::Time::Now() + base::TimeDelta::FromDays(1), | 486 base::Time::Now() + base::TimeDelta::FromDays(1), |
451 base::Time::Now(), false, false, | 487 base::Time::Now(), false, false, |
452 net::COOKIE_PRIORITY_HIGH)); | 488 net::COOKIE_PRIORITY_HIGH)); |
453 | 489 |
454 // Force the store to write its data to the disk. | 490 // Force the store to write its data to the disk. |
455 DestroyStore(); | 491 DestroyStore(); |
456 | 492 |
457 // Create a store that loads session cookie and test that the priority | 493 // Create a store that loads session cookie and test that the priority |
458 // attribute values are restored. | 494 // attribute values are restored. |
459 CanonicalCookieVector cookies; | 495 CanonicalCookieVector cookies; |
460 CreateAndLoad(true, &cookies); | 496 CreateAndLoad(false, true, &cookies); |
461 ASSERT_EQ(3U, cookies.size()); | 497 ASSERT_EQ(3U, cookies.size()); |
462 | 498 |
463 // Put the cookies into a map, by name, so we can easily find them. | 499 // Put the cookies into a map, by name, so we can easily find them. |
464 std::map<std::string, net::CanonicalCookie*> cookie_map; | 500 std::map<std::string, net::CanonicalCookie*> cookie_map; |
465 for (CanonicalCookieVector::const_iterator it = cookies.begin(); | 501 for (CanonicalCookieVector::const_iterator it = cookies.begin(); |
466 it != cookies.end(); | 502 it != cookies.end(); |
467 ++it) { | 503 ++it) { |
468 cookie_map[(*it)->Name()] = *it; | 504 cookie_map[(*it)->Name()] = *it; |
469 } | 505 } |
470 | 506 |
471 // Validate that each cookie has the correct priority. | 507 // Validate that each cookie has the correct priority. |
472 std::map<std::string, net::CanonicalCookie*>::const_iterator it = | 508 std::map<std::string, net::CanonicalCookie*>::const_iterator it = |
473 cookie_map.find(kLowName); | 509 cookie_map.find(kLowName); |
474 ASSERT_TRUE(it != cookie_map.end()); | 510 ASSERT_TRUE(it != cookie_map.end()); |
475 EXPECT_EQ(net::COOKIE_PRIORITY_LOW, cookie_map[kLowName]->Priority()); | 511 EXPECT_EQ(net::COOKIE_PRIORITY_LOW, cookie_map[kLowName]->Priority()); |
476 | 512 |
477 it = cookie_map.find(kMediumName); | 513 it = cookie_map.find(kMediumName); |
478 ASSERT_TRUE(it != cookie_map.end()); | 514 ASSERT_TRUE(it != cookie_map.end()); |
479 EXPECT_EQ(net::COOKIE_PRIORITY_MEDIUM, cookie_map[kMediumName]->Priority()); | 515 EXPECT_EQ(net::COOKIE_PRIORITY_MEDIUM, cookie_map[kMediumName]->Priority()); |
480 | 516 |
481 it = cookie_map.find(kHighName); | 517 it = cookie_map.find(kHighName); |
482 ASSERT_TRUE(it != cookie_map.end()); | 518 ASSERT_TRUE(it != cookie_map.end()); |
483 EXPECT_EQ(net::COOKIE_PRIORITY_HIGH, cookie_map[kHighName]->Priority()); | 519 EXPECT_EQ(net::COOKIE_PRIORITY_HIGH, cookie_map[kHighName]->Priority()); |
484 | 520 |
485 STLDeleteElements(&cookies); | 521 STLDeleteElements(&cookies); |
486 } | 522 } |
487 | 523 |
524 TEST_F(SQLitePersistentCookieStoreTest, UpdateToEncryption) { | |
525 CanonicalCookieVector cookies; | |
526 | |
527 // Create unencrypted cookie store and write something to it. | |
528 InitializeStore(false, false); | |
529 AddCookie("name", "value", "foo.bar", "/", base::Time::Now()); | |
530 DestroyStore(); | |
531 | |
532 // Create encrypted cookie store and ensure old cookie still reads. | |
533 STLDeleteElements(&cookies_); | |
534 EXPECT_EQ(0U, cookies_.size()); | |
535 CreateAndLoad(true, false, &cookies); | |
536 EXPECT_EQ(1U, cookies_.size()); | |
537 EXPECT_EQ("name", cookies_[0]->Name()); | |
538 EXPECT_EQ("value", cookies_[0]->Value()); | |
539 | |
540 // Make sure we can update existing cookie and add new cookie as encrypted. | |
541 store_->DeleteCookie(*(cookies_[0])); | |
542 AddCookie("name", "encrypted_value", "foo.bar", "/", base::Time::Now()); | |
543 AddCookie("other", "something", "foo.bar", "/", base::Time::Now()); | |
544 DestroyStore(); | |
545 STLDeleteElements(&cookies_); | |
546 CreateAndLoad(true, false, &cookies); | |
547 EXPECT_EQ(2U, cookies_.size()); | |
548 net::CanonicalCookie* cookie_name = NULL; | |
549 net::CanonicalCookie* cookie_other = NULL; | |
550 if (cookies_[0]->Name() == "name") { | |
551 cookie_name = cookies_[0]; | |
552 cookie_other = cookies_[1]; | |
553 } else { | |
554 cookie_name = cookies_[1]; | |
555 cookie_other = cookies_[0]; | |
556 } | |
557 EXPECT_EQ("encrypted_value", cookie_name->Value()); | |
558 EXPECT_EQ("something", cookie_other->Value()); | |
559 } | |
560 | |
488 } // namespace content | 561 } // namespace content |
OLD | NEW |