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