Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2025683003: First experimental implementation of the Clear-Site-Data header (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. Created 4 years, 4 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 unified diff | Download patch
OLDNEW
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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 17 matching lines...) Expand all
28 #include "base/threading/thread_task_runner_handle.h" 28 #include "base/threading/thread_task_runner_handle.h"
29 #include "build/build_config.h" 29 #include "build/build_config.h"
30 #include "chrome/browser/after_startup_task_utils.h" 30 #include "chrome/browser/after_startup_task_utils.h"
31 #include "chrome/browser/apps/app_url_redirector.h" 31 #include "chrome/browser/apps/app_url_redirector.h"
32 #include "chrome/browser/browser_about_handler.h" 32 #include "chrome/browser/browser_about_handler.h"
33 #include "chrome/browser/browser_process.h" 33 #include "chrome/browser/browser_process.h"
34 #include "chrome/browser/browser_shutdown.h" 34 #include "chrome/browser/browser_shutdown.h"
35 #include "chrome/browser/browsing_data/browsing_data_helper.h" 35 #include "chrome/browser/browsing_data/browsing_data_helper.h"
36 #include "chrome/browser/browsing_data/browsing_data_remover.h" 36 #include "chrome/browser/browsing_data/browsing_data_remover.h"
37 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" 37 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
38 #include "chrome/browser/browsing_data/origin_filter_builder.h"
39 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h"
38 #include "chrome/browser/character_encoding.h" 40 #include "chrome/browser/character_encoding.h"
39 #include "chrome/browser/chrome_content_browser_client_parts.h" 41 #include "chrome/browser/chrome_content_browser_client_parts.h"
40 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 42 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
41 #include "chrome/browser/chrome_quota_permission_context.h" 43 #include "chrome/browser/chrome_quota_permission_context.h"
42 #include "chrome/browser/content_settings/cookie_settings_factory.h" 44 #include "chrome/browser/content_settings/cookie_settings_factory.h"
43 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 45 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
44 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 46 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
45 #include "chrome/browser/defaults.h" 47 #include "chrome/browser/defaults.h"
46 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" 48 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
47 #include "chrome/browser/download/download_prefs.h" 49 #include "chrome/browser/download/download_prefs.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 #include "content/public/common/content_features.h" 163 #include "content/public/common/content_features.h"
162 #include "content/public/common/content_switches.h" 164 #include "content/public/common/content_switches.h"
163 #include "content/public/common/mojo_shell_connection.h" 165 #include "content/public/common/mojo_shell_connection.h"
164 #include "content/public/common/sandbox_type.h" 166 #include "content/public/common/sandbox_type.h"
165 #include "content/public/common/url_utils.h" 167 #include "content/public/common/url_utils.h"
166 #include "content/public/common/web_preferences.h" 168 #include "content/public/common/web_preferences.h"
167 #include "device/usb/public/interfaces/chooser_service.mojom.h" 169 #include "device/usb/public/interfaces/chooser_service.mojom.h"
168 #include "device/usb/public/interfaces/device_manager.mojom.h" 170 #include "device/usb/public/interfaces/device_manager.mojom.h"
169 #include "gin/v8_initializer.h" 171 #include "gin/v8_initializer.h"
170 #include "net/base/mime_util.h" 172 #include "net/base/mime_util.h"
173 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
171 #include "net/cookies/canonical_cookie.h" 174 #include "net/cookies/canonical_cookie.h"
172 #include "net/cookies/cookie_options.h" 175 #include "net/cookies/cookie_options.h"
173 #include "net/ssl/ssl_cert_request_info.h" 176 #include "net/ssl/ssl_cert_request_info.h"
174 #include "ppapi/host/ppapi_host.h" 177 #include "ppapi/host/ppapi_host.h"
175 #include "services/shell/public/cpp/service.h" 178 #include "services/shell/public/cpp/service.h"
176 #include "storage/browser/fileapi/external_mount_points.h" 179 #include "storage/browser/fileapi/external_mount_points.h"
177 #include "ui/base/l10n/l10n_util.h" 180 #include "ui/base/l10n/l10n_util.h"
178 #include "ui/base/resource/resource_bundle.h" 181 #include "ui/base/resource/resource_bundle.h"
179 #include "ui/resources/grit/ui_resources.h" 182 #include "ui/resources/grit/ui_resources.h"
180 #include "url/gurl.h" 183 #include "url/gurl.h"
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 .compare("Disabled"); 736 .compare("Disabled");
734 } 737 }
735 738
736 #if defined(OS_CHROMEOS) 739 #if defined(OS_CHROMEOS)
737 bool IsIntentPickerEnabled() { 740 bool IsIntentPickerEnabled() {
738 return base::CommandLine::ForCurrentProcess()->HasSwitch( 741 return base::CommandLine::ForCurrentProcess()->HasSwitch(
739 switches::kEnableIntentPicker); 742 switches::kEnableIntentPicker);
740 } 743 }
741 #endif 744 #endif
742 745
746 // A BrowsingDataRemover::Observer that waits for |count|
747 // OnBrowsingDataRemoverDone() callbacks, translates them into
748 // one base::Closure, and then destroys itself.
749 class ClearSiteDataObserver : public BrowsingDataRemover::Observer {
750 public:
751 explicit ClearSiteDataObserver(BrowsingDataRemover* remover,
752 const base::Closure& callback,
753 int count)
754 : remover_(remover), callback_(callback), count_(count) {
755 remover_->AddObserver(this);
756 }
757
758 ~ClearSiteDataObserver() override { remover_->RemoveObserver(this); }
759
760 // BrowsingDataRemover::Observer.
761 void OnBrowsingDataRemoverDone() override {
762 DCHECK(count_);
763 if (--count_)
764 return;
765
766 callback_.Run();
767 delete this;
768 }
769
770 private:
771 BrowsingDataRemover* remover_;
772 base::Closure callback_;
773 int count_;
774 };
775
743 } // namespace 776 } // namespace
744 777
745 ChromeContentBrowserClient::ChromeContentBrowserClient() 778 ChromeContentBrowserClient::ChromeContentBrowserClient()
746 : 779 :
747 weak_factory_(this) { 780 weak_factory_(this) {
748 #if defined(ENABLE_PLUGINS) 781 #if defined(ENABLE_PLUGINS)
749 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) 782 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
750 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]); 783 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
751 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) 784 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
752 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); 785 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
(...skipping 1711 matching lines...) Expand 10 before | Expand all | Expand 10 after
2464 void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) { 2497 void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) {
2465 Profile* profile = Profile::FromBrowserContext( 2498 Profile* profile = Profile::FromBrowserContext(
2466 rfh->GetSiteInstance()->GetProcess()->GetBrowserContext()); 2499 rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
2467 BrowsingDataRemover* remover = 2500 BrowsingDataRemover* remover =
2468 BrowsingDataRemoverFactory::GetForBrowserContext(profile); 2501 BrowsingDataRemoverFactory::GetForBrowserContext(profile);
2469 int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA; 2502 int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
2470 remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask, 2503 remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask,
2471 BrowsingDataHelper::UNPROTECTED_WEB); 2504 BrowsingDataHelper::UNPROTECTED_WEB);
2472 } 2505 }
2473 2506
2507 void ChromeContentBrowserClient::ClearSiteData(
2508 content::BrowserContext* browser_context,
2509 const url::Origin& origin,
2510 bool remove_cookies,
2511 bool remove_storage,
2512 bool remove_cache,
2513 const base::Closure& callback) {
2514 BrowsingDataRemover* remover =
2515 BrowsingDataRemoverFactory::GetForBrowserContext(browser_context);
2516
2517 // ClearSiteDataObserver deletes itself when callbacks from both removal
2518 // tasks are received.
2519 ClearSiteDataObserver* observer =
2520 new ClearSiteDataObserver(remover, callback, 2 /* number of tasks */);
2521
2522 // Cookies and channel IDs are scoped to
2523 // a) eTLD+1 of |origin|'s host if |origin|'s host is a registrable domain
2524 // or a subdomain thereof
2525 // b) |origin|'s host exactly if it is an IP address or an internal hostname
2526 // (e.g. "localhost" or "fileserver").
2527 if (remove_cookies) {
2528 std::string domain = GetDomainAndRegistry(
2529 origin.host(),
2530 net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
2531
2532 if (domain.empty())
2533 domain = origin.host(); // IP address or internal hostname.
2534
2535 std::unique_ptr<RegistrableDomainFilterBuilder> domain_filter_builder(
2536 new RegistrableDomainFilterBuilder(
2537 BrowsingDataFilterBuilder::WHITELIST));
2538 domain_filter_builder->AddRegisterableDomain(domain);
2539
2540 remover->RemoveWithFilterAndReply(
2541 BrowsingDataRemover::Period(browsing_data::TimePeriod::ALL_TIME),
2542 BrowsingDataRemover::REMOVE_COOKIES |
2543 BrowsingDataRemover::REMOVE_CHANNEL_IDS,
2544 BrowsingDataHelper::ALL, std::move(domain_filter_builder), observer);
2545 } else {
2546 // The first removal task is a no-op.
2547 observer->OnBrowsingDataRemoverDone();
2548 }
2549
2550 // Delete origin-scoped data.
2551 int remove_mask = 0;
2552 if (remove_storage) {
2553 remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA &
2554 ~BrowsingDataRemover::REMOVE_COOKIES &
2555 ~BrowsingDataRemover::REMOVE_CHANNEL_IDS;
2556 }
2557 if (remove_cache)
2558 remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
2559
2560 if (remove_mask) {
2561 std::unique_ptr<OriginFilterBuilder> origin_filter_builder(
2562 new OriginFilterBuilder(BrowsingDataFilterBuilder::WHITELIST));
2563 origin_filter_builder->AddOrigin(origin);
2564
2565 remover->RemoveWithFilterAndReply(
2566 BrowsingDataRemover::Period(browsing_data::TimePeriod::ALL_TIME),
2567 remove_mask, BrowsingDataHelper::ALL, std::move(origin_filter_builder),
2568 observer);
2569 } else {
2570 // The second removal task is a no-op.
2571 observer->OnBrowsingDataRemoverDone();
2572 }
2573 }
2574
2474 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { 2575 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
2475 return DownloadPrefs::GetDefaultDownloadDirectory(); 2576 return DownloadPrefs::GetDefaultDownloadDirectory();
2476 } 2577 }
2477 2578
2478 std::string ChromeContentBrowserClient::GetDefaultDownloadName() { 2579 std::string ChromeContentBrowserClient::GetDefaultDownloadName() {
2479 return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME); 2580 return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME);
2480 } 2581 }
2481 2582
2482 base::FilePath ChromeContentBrowserClient::GetShaderDiskCacheDirectory() { 2583 base::FilePath ChromeContentBrowserClient::GetShaderDiskCacheDirectory() {
2483 base::FilePath user_data_dir; 2584 base::FilePath user_data_dir;
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
3058 if (channel <= kMaxDisableEncryptionChannel) { 3159 if (channel <= kMaxDisableEncryptionChannel) {
3059 static const char* const kWebRtcDevSwitchNames[] = { 3160 static const char* const kWebRtcDevSwitchNames[] = {
3060 switches::kDisableWebRtcEncryption, 3161 switches::kDisableWebRtcEncryption,
3061 }; 3162 };
3062 to_command_line->CopySwitchesFrom(from_command_line, 3163 to_command_line->CopySwitchesFrom(from_command_line,
3063 kWebRtcDevSwitchNames, 3164 kWebRtcDevSwitchNames,
3064 arraysize(kWebRtcDevSwitchNames)); 3165 arraysize(kWebRtcDevSwitchNames));
3065 } 3166 }
3066 } 3167 }
3067 #endif // defined(ENABLE_WEBRTC) 3168 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698