OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/extensions/active_script_controller.h" | 5 #include "chrome/browser/extensions/active_script_controller.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "chrome/browser/extensions/active_tab_permission_granter.h" | 12 #include "chrome/browser/extensions/active_tab_permission_granter.h" |
13 #include "chrome/browser/extensions/extension_action.h" | 13 #include "chrome/browser/extensions/extension_action.h" |
14 #include "chrome/browser/extensions/extension_util.h" | 14 #include "chrome/browser/extensions/extension_util.h" |
15 #include "chrome/browser/extensions/location_bar_controller.h" | 15 #include "chrome/browser/extensions/location_bar_controller.h" |
16 #include "chrome/browser/extensions/permissions_updater.h" | |
16 #include "chrome/browser/extensions/tab_helper.h" | 17 #include "chrome/browser/extensions/tab_helper.h" |
17 #include "chrome/browser/sessions/session_id.h" | 18 #include "chrome/browser/sessions/session_id.h" |
18 #include "chrome/common/extensions/api/extension_action/action_info.h" | 19 #include "chrome/common/extensions/api/extension_action/action_info.h" |
19 #include "content/public/browser/navigation_controller.h" | 20 #include "content/public/browser/navigation_controller.h" |
20 #include "content/public/browser/navigation_entry.h" | 21 #include "content/public/browser/navigation_entry.h" |
21 #include "content/public/browser/render_view_host.h" | 22 #include "content/public/browser/render_view_host.h" |
22 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
24 #include "extensions/browser/extension_prefs.h" | |
23 #include "extensions/browser/extension_registry.h" | 25 #include "extensions/browser/extension_registry.h" |
24 #include "extensions/common/extension.h" | 26 #include "extensions/common/extension.h" |
25 #include "extensions/common/extension_messages.h" | 27 #include "extensions/common/extension_messages.h" |
26 #include "extensions/common/extension_set.h" | 28 #include "extensions/common/extension_set.h" |
27 #include "extensions/common/feature_switch.h" | 29 #include "extensions/common/feature_switch.h" |
28 #include "extensions/common/manifest.h" | 30 #include "extensions/common/manifest.h" |
31 #include "extensions/common/manifest_handlers/permissions_parser.h" | |
32 #include "extensions/common/permissions/permission_set.h" | |
29 #include "extensions/common/permissions/permissions_data.h" | 33 #include "extensions/common/permissions/permissions_data.h" |
30 #include "ipc/ipc_message_macros.h" | 34 #include "ipc/ipc_message_macros.h" |
31 | 35 |
32 namespace extensions { | 36 namespace extensions { |
33 | 37 |
34 namespace { | 38 namespace { |
35 | 39 |
36 // Returns true if the extension should be regarded as a "permitted" extension | 40 // Returns true if the extension should be regarded as a "permitted" extension |
37 // for the case of metrics. We need this because we only actually withhold | 41 // for the case of metrics. We need this because we only actually withhold |
38 // permissions if the switch is enabled, but want to record metrics in all | 42 // permissions if the switch is enabled, but want to record metrics in all |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
93 ad_injectors, permitted_extensions_).size(); | 97 ad_injectors, permitted_extensions_).size(); |
94 | 98 |
95 UMA_HISTOGRAM_COUNTS_100( | 99 UMA_HISTOGRAM_COUNTS_100( |
96 "Extensions.ActiveScriptController.PreventableAdInjectors", | 100 "Extensions.ActiveScriptController.PreventableAdInjectors", |
97 num_preventable_ad_injectors); | 101 num_preventable_ad_injectors); |
98 UMA_HISTOGRAM_COUNTS_100( | 102 UMA_HISTOGRAM_COUNTS_100( |
99 "Extensions.ActiveScriptController.UnpreventableAdInjectors", | 103 "Extensions.ActiveScriptController.UnpreventableAdInjectors", |
100 ad_injectors.size() - num_preventable_ad_injectors); | 104 ad_injectors.size() - num_preventable_ad_injectors); |
101 } | 105 } |
102 | 106 |
107 void ActiveScriptController::AlwaysRunOnVisibleHost( | |
108 const Extension* extension) { | |
109 GURL url = web_contents()->GetVisibleURL(); | |
110 URLPattern pattern(extensions::UserScript::ValidUserScriptSchemes()); | |
111 pattern.SetScheme(url.scheme()); | |
112 pattern.SetHost(url.host()); | |
113 pattern.SetPort(url.port()); | |
114 pattern.SetPath("/*"); | |
not at google - send to devlin
2014/08/11 22:59:29
I think you should do something similar to:
https
gpdavis
2014/08/12 00:52:05
Sweet deal. No worries; I see the value in factor
| |
115 | |
116 extensions::URLPatternSet new_explicit_hosts; | |
117 extensions::URLPatternSet new_scriptable_hosts; | |
118 | |
119 scoped_refptr<const PermissionSet> withheld_permissions = | |
120 extension->permissions_data()->withheld_permissions(); | |
121 if (withheld_permissions->explicit_hosts().MatchesURL(url)) | |
122 new_explicit_hosts.AddPattern(pattern); | |
123 if (withheld_permissions->scriptable_hosts().MatchesURL(url)) | |
124 new_scriptable_hosts.AddPattern(pattern); | |
125 | |
126 scoped_refptr<extensions::PermissionSet> new_permissions = | |
127 new extensions::PermissionSet(extensions::APIPermissionSet(), | |
128 extensions::ManifestPermissionSet(), | |
129 new_explicit_hosts, | |
130 new_scriptable_hosts); | |
131 | |
132 // Update permissions for the session. This adds |new_permissions| to active | |
133 // permissions and granted permissions. | |
134 extensions::PermissionsUpdater updater(web_contents()->GetBrowserContext()); | |
135 updater.AddPermissions(extension, new_permissions.get()); | |
136 | |
137 URLPatternSet permissions_union; | |
138 URLPatternSet::CreateUnion( | |
139 withheld_permissions->scriptable_hosts(), | |
140 PermissionsParser::GetRequiredPermissions(extension)->scriptable_hosts(), | |
141 &permissions_union); | |
142 UMA_HISTOGRAM_COUNTS_100( | |
143 "Extensions.ActiveScriptController.AlwaysRunCount", | |
144 extension->permissions_data()->GetEffectiveHostPermissions().size() - | |
145 permissions_union.size()); | |
146 | |
147 // Allow current tab to run injection. | |
148 OnClicked(extension); | |
149 } | |
150 | |
151 bool ActiveScriptController::HasActiveScriptAction( | |
152 const Extension* extension) { | |
153 return enabled_ && active_script_actions_.count(extension->id()) > 0; | |
154 } | |
155 | |
103 ExtensionAction* ActiveScriptController::GetActionForExtension( | 156 ExtensionAction* ActiveScriptController::GetActionForExtension( |
104 const Extension* extension) { | 157 const Extension* extension) { |
105 if (!enabled_ || pending_requests_.count(extension->id()) == 0) | 158 if (!enabled_ || pending_requests_.count(extension->id()) == 0) |
106 return NULL; // No action for this extension. | 159 return NULL; // No action for this extension. |
107 | 160 |
108 ActiveScriptMap::iterator existing = | 161 ActiveScriptMap::iterator existing = |
109 active_script_actions_.find(extension->id()); | 162 active_script_actions_.find(extension->id()); |
110 if (existing != active_script_actions_.end()) | 163 if (existing != active_script_actions_.end()) |
111 return existing->second.get(); | 164 return existing->second.get(); |
112 | 165 |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
313 UMA_HISTOGRAM_COUNTS_100( | 366 UMA_HISTOGRAM_COUNTS_100( |
314 "Extensions.ActiveScriptController.PermittedExtensions", | 367 "Extensions.ActiveScriptController.PermittedExtensions", |
315 permitted_extensions_.size()); | 368 permitted_extensions_.size()); |
316 UMA_HISTOGRAM_COUNTS_100( | 369 UMA_HISTOGRAM_COUNTS_100( |
317 "Extensions.ActiveScriptController.DeniedExtensions", | 370 "Extensions.ActiveScriptController.DeniedExtensions", |
318 pending_requests_.size()); | 371 pending_requests_.size()); |
319 } | 372 } |
320 } | 373 } |
321 | 374 |
322 } // namespace extensions | 375 } // namespace extensions |
OLD | NEW |