Apply third party cookie blocking to all kinds of cookies

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2011 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 "chrome/browser/chrome_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
@@ skipping 26 matching lines @@
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/resource_context.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/common/bindings_policy.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_options.h"
-#include "net/base/static_cookie_policy.h"
 
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
 #include "chrome/browser/crash_handler_host_linux.h"
 #endif  // OS_LINUX
 
 namespace {
 
 void InitRenderViewHostForExtensions(RenderViewHost* render_view_host) {
   // Note that due to GetEffectiveURL(), even hosted apps will have a
@@ skipping 169 matching lines @@
     if (!g_browser_process->safe_browsing_detection_service())
       command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection);
   }
 }
 
 std::string ChromeContentBrowserClient::GetApplicationLocale() {
   return g_browser_process->GetApplicationLocale();
 }
 
 bool ChromeContentBrowserClient::AllowAppCache(
-    const GURL& manifest_url, const content::ResourceContext& context) {
+    const GURL& manifest_url,
+    const content::ResourceContext& context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ProfileIOData* io_data =
       reinterpret_cast<ProfileIOData*>(context.GetUserData(NULL));
+  // FIXME(jochen): get the correct top-level origin.
   ContentSetting setting = io_data->GetHostContentSettingsMap()->
-      GetContentSetting(manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
+      GetCookieContentSetting(manifest_url, manifest_url, true);
   DCHECK(setting != CONTENT_SETTING_DEFAULT);
   return setting != CONTENT_SETTING_BLOCK;
 }
 
 bool ChromeContentBrowserClient::AllowGetCookie(
     const GURL& url,
     const GURL& first_party,
     const net::CookieList& cookie_list,
     const content::ResourceContext& context,
     int render_process_id,
     int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  bool allow = true;
   ProfileIOData* io_data =
       reinterpret_cast<ProfileIOData*>(context.GetUserData(NULL));
-  if (io_data->GetHostContentSettingsMap()->BlockThirdPartyCookies()) {
-    bool strict = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kBlockReadingThirdPartyCookies);
-    net::StaticCookiePolicy policy(strict ?
-        net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES :
-        net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
-    int rv = policy.CanGetCookies(url, first_party);
-    DCHECK_NE(net::ERR_IO_PENDING, rv);
-    if (rv != net::OK)
-      allow = false;
-  }
-
-  if (allow) {
-    ContentSetting setting = io_data->GetHostContentSettingsMap()->
-        GetContentSetting(url, CONTENT_SETTINGS_TYPE_COOKIES, "");
-    allow = setting == CONTENT_SETTING_ALLOW ||
-        setting == CONTENT_SETTING_SESSION_ONLY;
-  }
+  ContentSetting setting = io_data->GetHostContentSettingsMap()->
+      GetCookieContentSetting(url, first_party, false);
+  bool allow = setting == CONTENT_SETTING_ALLOW ||
+      setting == CONTENT_SETTING_SESSION_ONLY;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(
           &TabSpecificContentSettings::CookiesRead,
           render_process_id, render_view_id, url, cookie_list, !allow));
   return allow;
 }
 
 bool ChromeContentBrowserClient::AllowSetCookie(
     const GURL& url,
     const GURL& first_party,
     const std::string& cookie_line,
     const content::ResourceContext& context,
     int render_process_id,
     int render_view_id,
     net::CookieOptions* options) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  bool allow = true;
   ProfileIOData* io_data =
       reinterpret_cast<ProfileIOData*>(context.GetUserData(NULL));
-  if (io_data->GetHostContentSettingsMap()->BlockThirdPartyCookies()) {
-    bool strict = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kBlockReadingThirdPartyCookies);
-    net::StaticCookiePolicy policy(strict ?
-        net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES :
-        net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
-    int rv = policy.CanSetCookie(url, first_party, cookie_line);
-    if (rv != net::OK)
-      allow = false;
-  }
+  ContentSetting setting = io_data->GetHostContentSettingsMap()->
+      GetCookieContentSetting(url, first_party, true);
 
-  if (allow) {
-    ContentSetting setting = io_data->GetHostContentSettingsMap()->
-        GetContentSetting(url, CONTENT_SETTINGS_TYPE_COOKIES, "");
+  if (setting == CONTENT_SETTING_SESSION_ONLY)
+    options->set_force_session();
 
-    if (setting == CONTENT_SETTING_SESSION_ONLY)
-      options->set_force_session();
-
-    allow = setting == CONTENT_SETTING_ALLOW ||
-        setting == CONTENT_SETTING_SESSION_ONLY;
-  }
+  bool allow = setting == CONTENT_SETTING_ALLOW ||
+      setting == CONTENT_SETTING_SESSION_ONLY;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(
           &TabSpecificContentSettings::CookieChanged,
           render_process_id, render_view_id, url, cookie_line, *options,
           !allow));
   return allow;
 }
 
@@ skipping 10 matching lines @@
     return PpapiCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kGpuProcess)
     return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
 
   return -1;
 }
 #endif
 
 }  // namespace chrome