OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/subresource_filter/chrome_subresource_filter_client.h" | 5 #include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h" |
6 | 6 |
7 #include <string> | |
8 | |
9 #include "base/metrics/histogram_macros.h" | 7 #include "base/metrics/histogram_macros.h" |
10 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | |
12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
13 #include "chrome/browser/infobars/infobar_service.h" | 10 #include "chrome/browser/infobars/infobar_service.h" |
14 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/subresource_filter/subresource_filter_content_settings_
manager.h" |
| 13 #include "chrome/browser/subresource_filter/subresource_filter_profile_context.h
" |
15 #include "chrome/browser/subresource_filter/subresource_filter_profile_context_f
actory.h" | 14 #include "chrome/browser/subresource_filter/subresource_filter_profile_context_f
actory.h" |
16 #include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_
delegate.h" | 15 #include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_
delegate.h" |
17 #include "components/content_settings/core/browser/host_content_settings_map.h" | |
18 #include "components/content_settings/core/common/content_settings_types.h" | |
19 #include "components/subresource_filter/content/browser/content_ruleset_service.
h" | 16 #include "components/subresource_filter/content/browser/content_ruleset_service.
h" |
| 17 #include "components/subresource_filter/core/common/activation_level.h" |
| 18 #include "components/subresource_filter/core/common/activation_state.h" |
20 #include "content/public/browser/navigation_handle.h" | 19 #include "content/public/browser/navigation_handle.h" |
21 | 20 |
22 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient( | 21 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient( |
23 content::WebContents* web_contents) | 22 content::WebContents* web_contents) |
24 : web_contents_(web_contents), did_show_ui_for_navigation_(false) { | 23 : web_contents_(web_contents), did_show_ui_for_navigation_(false) { |
25 DCHECK(web_contents); | 24 DCHECK(web_contents); |
26 SubresourceFilterProfileContextFactory::EnsureForProfile( | 25 SubresourceFilterProfileContext* context = |
27 Profile::FromBrowserContext(web_contents_->GetBrowserContext())); | 26 SubresourceFilterProfileContextFactory::GetForProfile( |
| 27 Profile::FromBrowserContext(web_contents_->GetBrowserContext())); |
| 28 settings_manager_ = context->settings_manager(); |
28 } | 29 } |
29 | 30 |
30 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {} | 31 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {} |
31 | 32 |
32 void ChromeSubresourceFilterClient::ToggleNotificationVisibility( | 33 void ChromeSubresourceFilterClient::ToggleNotificationVisibility( |
33 bool visibility) { | 34 bool visibility) { |
34 if (did_show_ui_for_navigation_ && visibility) | 35 if (did_show_ui_for_navigation_ && visibility) |
35 return; | 36 return; |
36 | 37 did_show_ui_for_navigation_ = false; |
37 did_show_ui_for_navigation_ = visibility; | |
38 TabSpecificContentSettings* content_settings = | |
39 TabSpecificContentSettings::FromWebContents(web_contents_); | |
40 | 38 |
41 // |visibility| is false when a new navigation starts. | 39 // |visibility| is false when a new navigation starts. |
42 if (visibility) { | 40 if (visibility) { |
43 content_settings->OnContentBlocked( | 41 const GURL& top_level_url = web_contents_->GetLastCommittedURL(); |
44 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER); | 42 if (!settings_manager_->ShouldShowUIForSite(top_level_url)) { |
45 LogAction(kActionUIShown); | 43 LogAction(kActionUISuppressed); |
| 44 return; |
| 45 } |
46 #if defined(OS_ANDROID) | 46 #if defined(OS_ANDROID) |
47 InfoBarService* infobar_service = | 47 InfoBarService* infobar_service = |
48 InfoBarService::FromWebContents(web_contents_); | 48 InfoBarService::FromWebContents(web_contents_); |
49 SubresourceFilterInfobarDelegate::Create(infobar_service); | 49 SubresourceFilterInfobarDelegate::Create(infobar_service); |
50 #endif | 50 #endif |
| 51 TabSpecificContentSettings* content_settings = |
| 52 TabSpecificContentSettings::FromWebContents(web_contents_); |
| 53 content_settings->OnContentBlocked( |
| 54 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER); |
| 55 |
| 56 LogAction(kActionUIShown); |
| 57 did_show_ui_for_navigation_ = true; |
| 58 settings_manager_->OnDidShowUI(top_level_url); |
51 } else { | 59 } else { |
52 LogAction(kActionNavigationStarted); | 60 LogAction(kActionNavigationStarted); |
53 } | 61 } |
54 } | 62 } |
55 | 63 |
56 bool ChromeSubresourceFilterClient::ShouldSuppressActivation( | 64 bool ChromeSubresourceFilterClient::ShouldSuppressActivation( |
57 content::NavigationHandle* navigation_handle) { | 65 content::NavigationHandle* navigation_handle) { |
58 const GURL& url(navigation_handle->GetURL()); | 66 const GURL& url(navigation_handle->GetURL()); |
59 return navigation_handle->IsInMainFrame() && | 67 return navigation_handle->IsInMainFrame() && |
60 (whitelisted_hosts_.find(url.host()) != whitelisted_hosts_.end() || | 68 (whitelisted_hosts_.find(url.host()) != whitelisted_hosts_.end() || |
61 GetContentSettingForUrl(url) == CONTENT_SETTING_BLOCK); | 69 settings_manager_->GetSitePermission(url) == CONTENT_SETTING_BLOCK); |
62 } | 70 } |
63 | 71 |
64 void ChromeSubresourceFilterClient::WhitelistByContentSettings( | 72 void ChromeSubresourceFilterClient::WhitelistByContentSettings( |
65 const GURL& url) { | 73 const GURL& top_level_url) { |
66 // Whitelist via content settings. | 74 // Whitelist via content settings. SetContentSettings has logic to ignore |
67 Profile* profile = | 75 // metrics for these calls, so also log the generic blocked metrics. |
68 Profile::FromBrowserContext(web_contents_->GetBrowserContext()); | 76 settings_manager_->SetSitePermission(top_level_url, CONTENT_SETTING_BLOCK, |
69 DCHECK(profile); | 77 true /* from_ui */); |
70 HostContentSettingsMap* settings_map = | |
71 HostContentSettingsMapFactory::GetForProfile(profile); | |
72 settings_map->SetContentSettingDefaultScope( | |
73 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, | |
74 std::string(), CONTENT_SETTING_BLOCK); | |
75 | |
76 LogAction(kActionContentSettingsBlockedFromUI); | |
77 } | 78 } |
78 | 79 |
79 void ChromeSubresourceFilterClient::WhitelistInCurrentWebContents( | 80 void ChromeSubresourceFilterClient::WhitelistInCurrentWebContents( |
80 const GURL& url) { | 81 const GURL& url) { |
81 if (url.SchemeIsHTTPOrHTTPS()) | 82 if (url.SchemeIsHTTPOrHTTPS()) |
82 whitelisted_hosts_.insert(url.host()); | 83 whitelisted_hosts_.insert(url.host()); |
83 } | 84 } |
84 | 85 |
85 // static | 86 // static |
86 void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) { | 87 void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) { |
87 UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.Actions", action, | 88 UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.Actions", action, |
88 kActionLastEntry); | 89 kActionLastEntry); |
89 } | 90 } |
90 | 91 |
91 ContentSetting ChromeSubresourceFilterClient::GetContentSettingForUrl( | |
92 const GURL& url) { | |
93 Profile* profile = | |
94 Profile::FromBrowserContext(web_contents_->GetBrowserContext()); | |
95 DCHECK(profile); | |
96 HostContentSettingsMap* settings_map = | |
97 HostContentSettingsMapFactory::GetForProfile(profile); | |
98 return settings_map->GetContentSetting( | |
99 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, | |
100 std::string()); | |
101 } | |
102 | |
103 subresource_filter::VerifiedRulesetDealer::Handle* | 92 subresource_filter::VerifiedRulesetDealer::Handle* |
104 ChromeSubresourceFilterClient::GetRulesetDealer() { | 93 ChromeSubresourceFilterClient::GetRulesetDealer() { |
105 subresource_filter::ContentRulesetService* ruleset_service = | 94 subresource_filter::ContentRulesetService* ruleset_service = |
106 g_browser_process->subresource_filter_ruleset_service(); | 95 g_browser_process->subresource_filter_ruleset_service(); |
107 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr; | 96 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr; |
108 } | 97 } |
OLD | NEW |