Don't force non-session only cookies to be session only cookies, instead delete on shutdown

chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/thread_test_helper.h"
 #include "base/time.h"
+#include "chrome/browser/net/clear_on_exit_policy.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "sql/connection.h"
 #include "sql/meta_table.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/quota/mock_special_storage_policy.h"
 
 using content::BrowserThread;
 
 class SQLitePersistentCookieStoreTest : public testing::Test {
  public:
   SQLitePersistentCookieStoreTest()
       : ui_thread_(BrowserThread::UI),
         db_thread_(BrowserThread::DB),
         io_thread_(BrowserThread::IO),
         loaded_event_(false, false),
@@ skipping 28 matching lines @@
         new base::ThreadTestHelper(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
     ASSERT_TRUE(helper->Run());
   }
 
   void CreateAndLoad(
       bool restore_old_session_cookies,
       std::vector<net::CookieMonster::CanonicalCookie*>* cookies) {
     store_ = new SQLitePersistentCookieStore(
         temp_dir_.path().Append(chrome::kCookieFilename),
-        restore_old_session_cookies);
+        restore_old_session_cookies,
+        NULL);
     Load(cookies);
   }
 
   void InitializeStore(bool restore_old_session_cookies) {
     std::vector<net::CookieMonster::CanonicalCookie*> cookies;
     CreateAndLoad(restore_old_session_cookies, &cookies);
     ASSERT_EQ(0u, cookies.size());
   }
 
   // We have to create this method to wrap WaitableEvent::Wait, since we cannot
@@ skipping 30 matching lines @@
   base::WaitableEvent key_loaded_event_;
   base::WaitableEvent db_thread_event_;
   std::vector<net::CookieMonster::CanonicalCookie*> cookies_;
   ScopedTempDir temp_dir_;
   scoped_refptr<SQLitePersistentCookieStore> store_;
 };
 
 TEST_F(SQLitePersistentCookieStoreTest, KeepOnDestruction) {
   InitializeStore(false);
   // Put some data - any data - on disk, to have something to keep.
-  AddCookie("A", "B", "http://foo.bar", "/", base::Time::Now());
+  AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
   store_->SetClearLocalStateOnExit(false);
   DestroyStore();
 
   ASSERT_TRUE(file_util::PathExists(
       temp_dir_.path().Append(chrome::kCookieFilename)));
   ASSERT_TRUE(file_util::Delete(
       temp_dir_.path().Append(chrome::kCookieFilename), false));
 }
 
 TEST_F(SQLitePersistentCookieStoreTest, RemoveOnDestruction) {
   InitializeStore(false);
   // Put some data - any data - on disk, to have something to remove.
-  AddCookie("A", "B", "http://foo.bar", "/", base::Time::Now());
+  AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
   store_->SetClearLocalStateOnExit(true);
   DestroyStore();
 
   ASSERT_FALSE(file_util::PathExists(
       temp_dir_.path().Append(chrome::kCookieFilename)));
 }
 
 TEST_F(SQLitePersistentCookieStoreTest, TestInvalidMetaTableRecovery) {
   InitializeStore(false);
-  AddCookie("A", "B", "http://foo.bar", "/", base::Time::Now());
+  AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
   DestroyStore();
 
   // Load up the store and verify that it has good data in it.
   std::vector<net::CookieMonster::CanonicalCookie*> cookies;
   CreateAndLoad(false, &cookies);
   ASSERT_EQ(1U, cookies.size());
-  ASSERT_STREQ("http://foo.bar", cookies[0]->Domain().c_str());
+  ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str());
   ASSERT_STREQ("A", cookies[0]->Name().c_str());
   ASSERT_STREQ("B", cookies[0]->Value().c_str());
   DestroyStore();
   STLDeleteContainerPointers(cookies.begin(), cookies.end());
   cookies.clear();
 
   // Now corrupt the meta table.
   {
     sql::Connection db;
     ASSERT_TRUE(db.Open(temp_dir_.path().Append(chrome::kCookieFilename)));
     sql::MetaTable meta_table_;
     meta_table_.Init(&db, 1, 1);
     ASSERT_TRUE(db.Execute("DELETE FROM meta"));
     db.Close();
   }
 
   // Upon loading, the database should be reset to a good, blank state.
   CreateAndLoad(false, &cookies);
   ASSERT_EQ(0U, cookies.size());
 
   // Verify that, after, recovery, the database persists properly.
-  AddCookie("X", "Y", "http://foo.bar", "/", base::Time::Now());
+  AddCookie("X", "Y", "foo.bar", "/", base::Time::Now());
   DestroyStore();
   CreateAndLoad(false, &cookies);
   ASSERT_EQ(1U, cookies.size());
-  ASSERT_STREQ("http://foo.bar", cookies[0]->Domain().c_str());
+  ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str());
   ASSERT_STREQ("X", cookies[0]->Name().c_str());
   ASSERT_STREQ("Y", cookies[0]->Value().c_str());
   STLDeleteContainerPointers(cookies.begin(), cookies.end());
   cookies.clear();
 }
 
 // Test if data is stored as expected in the SQLite database.
 TEST_F(SQLitePersistentCookieStoreTest, TestPersistance) {
   InitializeStore(false);
-  AddCookie("A", "B", "http://foo.bar", "/", base::Time::Now());
+  AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
   // Replace the store effectively destroying the current one and forcing it
   // to write its data to disk. Then we can see if after loading it again it
   // is still there.
   DestroyStore();
   // Reload and test for persistence
   std::vector<net::CookieMonster::CanonicalCookie*> cookies;
   CreateAndLoad(false, &cookies);
   ASSERT_EQ(1U, cookies.size());
-  ASSERT_STREQ("http://foo.bar", cookies[0]->Domain().c_str());
+  ASSERT_STREQ("foo.bar", cookies[0]->Domain().c_str());
   ASSERT_STREQ("A", cookies[0]->Name().c_str());
   ASSERT_STREQ("B", cookies[0]->Value().c_str());
 
   // Now delete the cookie and check persistence again.
   store_->DeleteCookie(*cookies[0]);
   DestroyStore();
   STLDeleteContainerPointers(cookies.begin(), cookies.end());
   cookies.clear();
 
   // Reload and check if the cookie has been removed.
   CreateAndLoad(false, &cookies);
   ASSERT_EQ(0U, cookies.size());
 }
 
 // Test that priority load of cookies for a specfic domain key could be
 // completed before the entire store is loaded
 TEST_F(SQLitePersistentCookieStoreTest, TestLoadCookiesForKey) {
   InitializeStore(false);
   base::Time t = base::Time::Now();
-  AddCookie("A", "B", "http://foo.bar", "/", t);
+  AddCookie("A", "B", "foo.bar", "/", t);
   t += base::TimeDelta::FromInternalValue(10);
   AddCookie("A", "B", "www.aaa.com", "/", t);
   t += base::TimeDelta::FromInternalValue(10);
   AddCookie("A", "B", "travel.aaa.com", "/", t);
   t += base::TimeDelta::FromInternalValue(10);
   AddCookie("A", "B", "www.bbb.com", "/", t);
   DestroyStore();
 
   store_ = new SQLitePersistentCookieStore(
-      temp_dir_.path().Append(chrome::kCookieFilename), false);
+      temp_dir_.path().Append(chrome::kCookieFilename), false, NULL);
   // Posting a blocking task to db_thread_ makes sure that the DB thread waits
   // until both Load and LoadCookiesForKey have been posted to its task queue.
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(&SQLitePersistentCookieStoreTest::WaitOnDBEvent,
                  base::Unretained(this)));
   store_->Load(base::Bind(&SQLitePersistentCookieStoreTest::OnLoaded,
                           base::Unretained(this)));
   store_->LoadCookiesForKey("aaa.com",
     base::Bind(&SQLitePersistentCookieStoreTest::OnKeyLoaded,
@@ skipping 21 matching lines @@
   ASSERT_EQ(cookies_loaded.find("www.aaa.com") != cookies_loaded.end(), true);
   ASSERT_EQ(cookies_loaded.find("travel.aaa.com") != cookies_loaded.end(),
             true);
 
   db_thread_event_.Signal();
   loaded_event_.Wait();
   for (std::vector<net::CookieMonster::CanonicalCookie*>::iterator
        it = cookies_.begin(); it != cookies_.end(); ++it)
     cookies_loaded.insert((*it)->Domain().c_str());
   ASSERT_EQ(4U, cookies_loaded.size());
-  ASSERT_EQ(cookies_loaded.find("http://foo.bar") != cookies_loaded.end(),
+  ASSERT_EQ(cookies_loaded.find("foo.bar") != cookies_loaded.end(),
             true);
   ASSERT_EQ(cookies_loaded.find("www.bbb.com") != cookies_loaded.end(), true);
 }
 
 // Test that we can force the database to be written by calling Flush().
 TEST_F(SQLitePersistentCookieStoreTest, TestFlush) {
   InitializeStore(false);
   // File timestamps don't work well on all platforms, so we'll determine
   // whether the DB file has been modified by checking its size.
   FilePath path = temp_dir_.path().Append(chrome::kCookieFilename);
   base::PlatformFileInfo info;
   ASSERT_TRUE(file_util::GetFileInfo(path, &info));
   int64 base_size = info.size;
 
   // Write some large cookies, so the DB will have to expand by several KB.
   for (char c = 'a'; c < 'z'; ++c) {
     // Each cookie needs a unique timestamp for creation_utc (see DB schema).
     base::Time t = base::Time::Now() + base::TimeDelta::FromMicroseconds(c);
     std::string name(1, c);
     std::string value(1000, c);
-    AddCookie(name, value, "http://foo.bar", "/", t);
+    AddCookie(name, value, "foo.bar", "/", t);
   }
 
   // Call Flush() and wait until the DB thread is idle.
   store_->Flush(base::Closure());
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
   ASSERT_TRUE(helper->Run());
 
   // We forced a write, so now the file will be bigger.
@@ skipping 18 matching lines @@
   friend class base::RefCountedThreadSafe<CallbackCounter>;
   ~CallbackCounter() {}
 
   volatile int callback_count_;
 };
 
 // Test that we can get a completion callback after a Flush().
 TEST_F(SQLitePersistentCookieStoreTest, TestFlushCompletionCallback) {
   InitializeStore(false);
   // Put some data - any data - on disk, so that Flush is not a no-op.
-  AddCookie("A", "B", "http://foo.bar", "/", base::Time::Now());
+  AddCookie("A", "B", "foo.bar", "/", base::Time::Now());
 
   scoped_refptr<CallbackCounter> counter(new CallbackCounter());
 
   // Callback shouldn't be invoked until we call Flush().
   ASSERT_EQ(0, counter->callback_count());
 
   store_->Flush(base::Bind(&CallbackCounter::Callback, counter.get()));
 
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
   ASSERT_TRUE(helper->Run());
 
   ASSERT_EQ(1, counter->callback_count());
 }
 
 // Test loading old session cookies from the disk.
 TEST_F(SQLitePersistentCookieStoreTest, TestLoadOldSessionCookies) {
   InitializeStore(true);
 
   // Add a session cookie.
   store_->AddCookie(
       net::CookieMonster::CanonicalCookie(
-          GURL(), "C", "D", "http://sessioncookie.com", "/", std::string(),
+          GURL(), "C", "D", "sessioncookie.com", "/", std::string(),
           std::string(), base::Time::Now(), base::Time::Now(),
           base::Time::Now(), false, false, true, false /*is_persistent*/));
 
   // Force the store to write its data to the disk.
   DestroyStore();
 
   // Create a store that loads session cookies and test that the session cookie
   // was loaded.
   std::vector<net::CookieMonster::CanonicalCookie*> cookies;
   CreateAndLoad(true, &cookies);
 
   ASSERT_EQ(1U, cookies.size());
-  ASSERT_STREQ("http://sessioncookie.com", cookies[0]->Domain().c_str());
+  ASSERT_STREQ("sessioncookie.com", cookies[0]->Domain().c_str());
   ASSERT_STREQ("C", cookies[0]->Name().c_str());
   ASSERT_STREQ("D", cookies[0]->Value().c_str());
 
   STLDeleteContainerPointers(cookies.begin(), cookies.end());
   cookies.clear();
 }
 
 // Test loading old session cookies from the disk.
 TEST_F(SQLitePersistentCookieStoreTest, TestDontLoadOldSessionCookies) {
   InitializeStore(true);
 
   // Add a session cookie.
   store_->AddCookie(
       net::CookieMonster::CanonicalCookie(
-          GURL(), "C", "D", "http://sessioncookie.com", "/", std::string(),
+          GURL(), "C", "D", "sessioncookie.com", "/", std::string(),
           std::string(), base::Time::Now(), base::Time::Now(),
           base::Time::Now(), false, false, true, false /*is_persistent*/));
 
   // Force the store to write its data to the disk.
   DestroyStore();
 
   // Create a store that doesn't load old session cookies and test that the
   // session cookie was not loaded.
   std::vector<net::CookieMonster::CanonicalCookie*> cookies;
   CreateAndLoad(false, &cookies);
   ASSERT_EQ(0U, cookies.size());
 
   // The store should also delete the session cookie. Wait until that has been
   // done.
   DestroyStore();
 
   // Create a store that loads old session cookies and test that the session
   // cookie is gone.
   CreateAndLoad(true, &cookies);
   ASSERT_EQ(0U, cookies.size());
 }
 
 TEST_F(SQLitePersistentCookieStoreTest, PersistHasExpiresAndIsPersistent) {
   InitializeStore(true);
 
   // Add a session cookie with has_expires = false, and another session cookie
   // with has_expires = true.
   store_->AddCookie(
       net::CookieMonster::CanonicalCookie(
-          GURL(), "session-hasexpires", "val", "http://sessioncookie.com", "/",
+          GURL(), "session-hasexpires", "val", "sessioncookie.com", "/",
           std::string(), std::string(),
           base::Time::Now() - base::TimeDelta::FromDays(3), base::Time::Now(),
           base::Time::Now(), false, false, true /* has_expires */,
           false /* is_persistent */));
   store_->AddCookie(
       net::CookieMonster::CanonicalCookie(
-          GURL(), "session-noexpires", "val", "http://sessioncookie.com", "/",
+          GURL(), "session-noexpires", "val", "sessioncookie.com", "/",
           std::string(), std::string(),
           base::Time::Now() - base::TimeDelta::FromDays(2), base::Time::Now(),
           base::Time::Now(), false, false, false /* has_expires */,
           false /* is_persistent */));
   // Add a persistent cookie.
   store_->AddCookie(
       net::CookieMonster::CanonicalCookie(
-          GURL(), "persistent", "val", "http://sessioncookie.com", "/",
+          GURL(), "persistent", "val", "sessioncookie.com", "/",
           std::string(), std::string(),
           base::Time::Now() - base::TimeDelta::FromDays(1), base::Time::Now(),
           base::Time::Now(), false, false, true /* has_expires */,
           true /* is_persistent */));
 
   // Force the store to write its data to the disk.
   DestroyStore();
 
   // Create a store that loads session cookies and test that the the DoesExpire
   // and IsPersistent attributes are restored.
@@ skipping 11 matching lines @@
 
   EXPECT_FALSE(cookie_map["session-noexpires"]->DoesExpire());
   EXPECT_FALSE(cookie_map["session-noexpires"]->IsPersistent());
 
   EXPECT_TRUE(cookie_map["persistent"]->DoesExpire());
   EXPECT_TRUE(cookie_map["persistent"]->IsPersistent());
 
   STLDeleteContainerPointers(cookies.begin(), cookies.end());
   cookies.clear();
 }
+
+namespace {
+
+// True if the given cookie is in the vector.
+bool IsCookiePresent(
+    std::vector<net::CookieMonster::CanonicalCookie*>* cookies,
+    const std::string& domain,
+    const std::string& name,
+    const std::string& value,
+    bool secure) {
+  for (unsigned i = 0; i < cookies->size(); ++i) {
+    if ((*cookies)[i]->Domain() == domain &&
+        (*cookies)[i]->Name() == name &&
+        (*cookies)[i]->Value() == value &&
+        (*cookies)[i]->IsSecure() == secure) {
+      return true;
+    }
+  }
+  return false;
+}
+
+}  // namespace
+
+// Test deleting cookies as mandated by the clear on exit policy on shutdown.
+TEST_F(SQLitePersistentCookieStoreTest, TestClearOnExitPolicy) {
+  std::string protected_origin("protected.com");
+  std::string session_origin("session.com");
+  std::string other_origin("other.com");
+  scoped_refptr<quota::MockSpecialStoragePolicy> storage_policy =
+      new quota::MockSpecialStoragePolicy;
+  scoped_refptr<ClearOnExitPolicy> clear_policy =
+      new ClearOnExitPolicy(storage_policy.get());
+  storage_policy->AddProtected(GURL(std::string("http://") + protected_origin));
+  storage_policy->AddSessionOnly(
+      GURL(std::string("http://") + protected_origin));
+  storage_policy->AddSessionOnly(
+      GURL(std::string("http://") + session_origin));
+  std::vector<net::CookieMonster::CanonicalCookie*> cookies;
+  store_ = new SQLitePersistentCookieStore(
+      temp_dir_.path().Append(chrome::kCookieFilename),
+      false,
+      clear_policy.get());
+  Load(&cookies);
+  ASSERT_EQ(0U, cookies.size());
+
+  // Add some cookies.
+  base::Time t = base::Time::Now();
+  AddCookie("A", "1", protected_origin, "/", t);
+  t += base::TimeDelta::FromInternalValue(10);
+  AddCookie("B", "2", session_origin, "/", t);
+  t += base::TimeDelta::FromInternalValue(10);
+  AddCookie("C", "3", other_origin, "/", t);
+  // A secure cookie on session_origin.
+  t += base::TimeDelta::FromInternalValue(10);
+  store_->AddCookie(
+      net::CookieMonster::CanonicalCookie(GURL(), "D", "4", session_origin, "/",
+                                          std::string(), std::string(),
+                                          t, t, t,
+                                          true, false, true, true));
+
+  // Force the store to write its data to the disk.
+  DestroyStore();
+
+  // Create a store test that the cookie on session_origin does not exist.
+  store_ = new SQLitePersistentCookieStore(
+      temp_dir_.path().Append(chrome::kCookieFilename),
+      false,
+      clear_policy.get());
+  Load(&cookies);
+
+  EXPECT_EQ(3U, cookies.size());
+  EXPECT_TRUE(IsCookiePresent(&cookies, protected_origin, "A", "1", false));
+  EXPECT_TRUE(IsCookiePresent(&cookies, other_origin, "C", "3", false));
+  EXPECT_TRUE(IsCookiePresent(&cookies, session_origin, "D", "4", true));
+
+  DestroyStore();
+}