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" | |
15 #include "chrome/browser/subresource_filter/subresource_filter_content_settings_ manager_factory.h" | 13 #include "chrome/browser/subresource_filter/subresource_filter_content_settings_ manager_factory.h" |
16 #include "chrome/browser/ui/android/content_settings/subresource_filter_infobar_ delegate.h" | 14 #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" | 15 #include "components/subresource_filter/content/browser/content_ruleset_service. h" |
16 #include "components/subresource_filter/core/common/activation_level.h" | |
17 #include "components/subresource_filter/core/common/activation_state.h" | |
20 | 18 |
21 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient( | 19 ChromeSubresourceFilterClient::ChromeSubresourceFilterClient( |
22 content::WebContents* web_contents) | 20 content::WebContents* web_contents) |
23 : web_contents_(web_contents), shown_for_navigation_(false) { | 21 : web_contents_(web_contents), shown_for_navigation_(false) { |
24 DCHECK(web_contents); | 22 DCHECK(web_contents); |
25 // Ensure the content settings manager is initialized. | 23 settings_manager_ = |
engedy
2017/04/12 14:02:50
nit: Can we put this on the initializer list? We w
Charlie Harrison
2017/04/12 17:53:44
Done.
| |
26 SubresourceFilterContentSettingsManagerFactory::EnsureForProfile( | 24 SubresourceFilterContentSettingsManagerFactory::EnsureForProfile( |
27 Profile::FromBrowserContext(web_contents_->GetBrowserContext())); | 25 Profile::FromBrowserContext(web_contents_->GetBrowserContext())); |
28 } | 26 } |
29 | 27 |
30 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {} | 28 ChromeSubresourceFilterClient::~ChromeSubresourceFilterClient() {} |
31 | 29 |
32 void ChromeSubresourceFilterClient::ToggleNotificationVisibility( | 30 void ChromeSubresourceFilterClient::ToggleNotificationVisibility( |
33 bool visibility) { | 31 bool visibility) { |
34 if (shown_for_navigation_ && visibility) | 32 if (shown_for_navigation_ && visibility) |
35 return; | 33 return; |
36 | 34 shown_for_navigation_ = false; |
37 shown_for_navigation_ = visibility; | |
38 TabSpecificContentSettings* content_settings = | |
39 TabSpecificContentSettings::FromWebContents(web_contents_); | |
40 | 35 |
41 // |visibility| is false when a new navigation starts. | 36 // |visibility| is false when a new navigation starts. |
42 if (visibility) { | 37 if (visibility) { |
43 content_settings->OnContentBlocked( | 38 const GURL& url = web_contents_->GetLastCommittedURL(); |
44 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER); | 39 if (!settings_manager_->ShouldShowUIForSite(url)) { |
45 LogAction(kActionUIShown); | 40 LogAction(kActionUISuppressed); |
41 return; | |
42 } | |
46 #if defined(OS_ANDROID) | 43 #if defined(OS_ANDROID) |
47 InfoBarService* infobar_service = | 44 InfoBarService* infobar_service = |
48 InfoBarService::FromWebContents(web_contents_); | 45 InfoBarService::FromWebContents(web_contents_); |
49 SubresourceFilterInfobarDelegate::Create(infobar_service); | 46 SubresourceFilterInfobarDelegate::Create(infobar_service); |
50 #endif | 47 #endif |
48 TabSpecificContentSettings* content_settings = | |
49 TabSpecificContentSettings::FromWebContents(web_contents_); | |
50 content_settings->OnContentBlocked( | |
51 CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER); | |
52 OnDidShowUI(url); | |
51 } else { | 53 } else { |
52 LogAction(kActionNavigationStarted); | 54 LogAction(kActionNavigationStarted); |
53 } | 55 } |
54 } | 56 } |
55 | 57 |
56 bool ChromeSubresourceFilterClient::IsWhitelistedByContentSettings( | 58 bool ChromeSubresourceFilterClient::IsWhitelistedByContentSettings( |
57 const GURL& url) { | 59 const GURL& url) { |
58 return GetContentSettingForUrl(url) == CONTENT_SETTING_BLOCK; | 60 return settings_manager_->GetContentSetting(url) == CONTENT_SETTING_BLOCK; |
59 } | 61 } |
60 | 62 |
61 void ChromeSubresourceFilterClient::WhitelistByContentSettings( | 63 void ChromeSubresourceFilterClient::WhitelistByContentSettings( |
62 const GURL& url) { | 64 const GURL& url) { |
engedy
2017/04/12 14:02:50
nit: Do you think it would add some clarity to s/u
Charlie Harrison
2017/04/12 17:53:44
Done.
| |
63 // Whitelist via content settings. | 65 // Whitelist via content settings. |
64 Profile* profile = | 66 settings_manager_->SetContentSetting(url, CONTENT_SETTING_BLOCK, |
65 Profile::FromBrowserContext(web_contents_->GetBrowserContext()); | 67 true /* log_metrics */); |
66 DCHECK(profile); | 68 LogAction(kActionContentSettingsBlockedFromUI); |
67 HostContentSettingsMap* settings_map = | 69 } |
68 HostContentSettingsMapFactory::GetForProfile(profile); | |
69 settings_map->SetContentSettingDefaultScope( | |
70 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, | |
71 std::string(), CONTENT_SETTING_BLOCK); | |
72 | 70 |
73 LogAction(kActionContentSettingsBlockedFromUI); | 71 void ChromeSubresourceFilterClient::OnActivationComputed( |
72 const GURL& url, | |
73 const subresource_filter::ActivationState& state) { | |
74 // Clear the content setting when the site does not trigger activation. | |
75 if (state.activation_level == subresource_filter::ActivationLevel::DISABLED && | |
engedy
2017/04/12 14:02:50
Should we also remove the content setting if this
Charlie Harrison
2017/04/12 17:53:44
Sure. Done.
| |
76 settings_manager_->GetContentSetting(url) == CONTENT_SETTING_ALLOW) { | |
77 settings_manager_->ClearContentSetting(url); | |
78 } | |
74 } | 79 } |
75 | 80 |
76 // static | 81 // static |
77 void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) { | 82 void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) { |
78 UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.Actions", action, | 83 UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.Actions", action, |
79 kActionLastEntry); | 84 kActionLastEntry); |
80 } | 85 } |
81 | 86 |
82 ContentSetting ChromeSubresourceFilterClient::GetContentSettingForUrl( | 87 void ChromeSubresourceFilterClient::OnDidShowUI(const GURL& url) { |
engedy
2017/04/12 14:02:50
This is now three lines and called from a single c
Charlie Harrison
2017/04/12 17:53:44
Done.
| |
83 const GURL& url) { | 88 LogAction(kActionUIShown); |
84 Profile* profile = | 89 shown_for_navigation_ = true; |
85 Profile::FromBrowserContext(web_contents_->GetBrowserContext()); | 90 |
86 DCHECK(profile); | 91 settings_manager_->OnDidShowUI(url); |
87 HostContentSettingsMap* settings_map = | |
88 HostContentSettingsMapFactory::GetForProfile(profile); | |
89 return settings_map->GetContentSetting( | |
90 url, url, ContentSettingsType::CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, | |
91 std::string()); | |
92 } | 92 } |
93 | 93 |
94 subresource_filter::VerifiedRulesetDealer::Handle* | 94 subresource_filter::VerifiedRulesetDealer::Handle* |
95 ChromeSubresourceFilterClient::GetRulesetDealer() { | 95 ChromeSubresourceFilterClient::GetRulesetDealer() { |
96 subresource_filter::ContentRulesetService* ruleset_service = | 96 subresource_filter::ContentRulesetService* ruleset_service = |
97 g_browser_process->subresource_filter_ruleset_service(); | 97 g_browser_process->subresource_filter_ruleset_service(); |
98 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr; | 98 return ruleset_service ? ruleset_service->ruleset_dealer() : nullptr; |
99 } | 99 } |
OLD | NEW |