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_action_manager.h" | 14 #include "chrome/browser/extensions/extension_action_manager.h" |
15 #include "chrome/browser/extensions/extension_util.h" | 15 #include "chrome/browser/extensions/extension_util.h" |
16 #include "chrome/browser/extensions/location_bar_controller.h" | 16 #include "chrome/browser/extensions/location_bar_controller.h" |
17 #include "chrome/browser/extensions/permissions_updater.h" | |
17 #include "chrome/browser/extensions/tab_helper.h" | 18 #include "chrome/browser/extensions/tab_helper.h" |
18 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/sessions/session_id.h" | 20 #include "chrome/browser/sessions/session_id.h" |
20 #include "chrome/common/extensions/api/extension_action/action_info.h" | 21 #include "chrome/common/extensions/api/extension_action/action_info.h" |
21 #include "content/public/browser/navigation_controller.h" | 22 #include "content/public/browser/navigation_controller.h" |
22 #include "content/public/browser/navigation_entry.h" | 23 #include "content/public/browser/navigation_entry.h" |
23 #include "content/public/browser/render_view_host.h" | 24 #include "content/public/browser/render_view_host.h" |
24 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
25 #include "extensions/browser/extension_registry.h" | 26 #include "extensions/browser/extension_registry.h" |
26 #include "extensions/common/extension.h" | 27 #include "extensions/common/extension.h" |
27 #include "extensions/common/extension_messages.h" | 28 #include "extensions/common/extension_messages.h" |
28 #include "extensions/common/extension_set.h" | 29 #include "extensions/common/extension_set.h" |
29 #include "extensions/common/feature_switch.h" | 30 #include "extensions/common/feature_switch.h" |
30 #include "extensions/common/manifest.h" | 31 #include "extensions/common/manifest.h" |
32 #include "extensions/common/permissions/permission_set.h" | |
31 #include "extensions/common/permissions/permissions_data.h" | 33 #include "extensions/common/permissions/permissions_data.h" |
32 #include "ipc/ipc_message_macros.h" | 34 #include "ipc/ipc_message_macros.h" |
33 | 35 |
34 namespace extensions { | 36 namespace extensions { |
35 | 37 |
36 namespace { | 38 namespace { |
37 | 39 |
38 // 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 |
39 // 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 |
40 // 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... | |
95 ad_injectors, permitted_extensions_).size(); | 97 ad_injectors, permitted_extensions_).size(); |
96 | 98 |
97 UMA_HISTOGRAM_COUNTS_100( | 99 UMA_HISTOGRAM_COUNTS_100( |
98 "Extensions.ActiveScriptController.PreventableAdInjectors", | 100 "Extensions.ActiveScriptController.PreventableAdInjectors", |
99 num_preventable_ad_injectors); | 101 num_preventable_ad_injectors); |
100 UMA_HISTOGRAM_COUNTS_100( | 102 UMA_HISTOGRAM_COUNTS_100( |
101 "Extensions.ActiveScriptController.UnpreventableAdInjectors", | 103 "Extensions.ActiveScriptController.UnpreventableAdInjectors", |
102 ad_injectors.size() - num_preventable_ad_injectors); | 104 ad_injectors.size() - num_preventable_ad_injectors); |
103 } | 105 } |
104 | 106 |
107 void ActiveScriptController::AlwaysRunOnVisibleOrigin( | |
108 const Extension* extension) { | |
109 const GURL& url = web_contents()->GetVisibleURL(); | |
110 URLPatternSet new_explicit_hosts; | |
111 URLPatternSet new_scriptable_hosts; | |
112 | |
113 scoped_refptr<const PermissionSet> withheld_permissions = | |
114 extension->permissions_data()->withheld_permissions(); | |
115 if (withheld_permissions->explicit_hosts().MatchesURL(url)) { | |
116 new_explicit_hosts.AddOrigin(UserScript::ValidUserScriptSchemes(), | |
117 url.GetOrigin()); | |
118 } | |
119 if (withheld_permissions->scriptable_hosts().MatchesURL(url)) { | |
120 new_scriptable_hosts.AddOrigin(UserScript::ValidUserScriptSchemes(), | |
121 url.GetOrigin()); | |
122 } | |
123 | |
124 scoped_refptr<PermissionSet> new_permissions = | |
125 new PermissionSet(APIPermissionSet(), | |
126 ManifestPermissionSet(), | |
127 new_explicit_hosts, | |
128 new_scriptable_hosts); | |
129 | |
130 // Update permissions for the session. This adds |new_permissions| to active | |
131 // permissions and granted permissions. | |
132 PermissionsUpdater(web_contents()->GetBrowserContext()) | |
133 .AddPermissions(extension, new_permissions.get()); | |
Devlin
2014/08/15 15:10:31
I realize that there's a potential problem in here
gpdavis
2014/08/15 18:08:26
Done.
| |
134 | |
135 // Allow current tab to run injection. | |
136 OnClicked(extension); | |
137 } | |
138 | |
139 bool ActiveScriptController::HasActiveScriptAction(const Extension* extension) { | |
140 return enabled_ && active_script_actions_.count(extension->id()) > 0; | |
141 } | |
142 | |
105 ExtensionAction* ActiveScriptController::GetActionForExtension( | 143 ExtensionAction* ActiveScriptController::GetActionForExtension( |
106 const Extension* extension) { | 144 const Extension* extension) { |
107 if (!enabled_ || pending_requests_.count(extension->id()) == 0) | 145 if (!enabled_ || pending_requests_.count(extension->id()) == 0) |
108 return NULL; // No action for this extension. | 146 return NULL; // No action for this extension. |
109 | 147 |
110 ActiveScriptMap::iterator existing = | 148 ActiveScriptMap::iterator existing = |
111 active_script_actions_.find(extension->id()); | 149 active_script_actions_.find(extension->id()); |
112 if (existing != active_script_actions_.end()) | 150 if (existing != active_script_actions_.end()) |
113 return existing->second.get(); | 151 return existing->second.get(); |
114 | 152 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
306 UMA_HISTOGRAM_COUNTS_100( | 344 UMA_HISTOGRAM_COUNTS_100( |
307 "Extensions.ActiveScriptController.PermittedExtensions", | 345 "Extensions.ActiveScriptController.PermittedExtensions", |
308 permitted_extensions_.size()); | 346 permitted_extensions_.size()); |
309 UMA_HISTOGRAM_COUNTS_100( | 347 UMA_HISTOGRAM_COUNTS_100( |
310 "Extensions.ActiveScriptController.DeniedExtensions", | 348 "Extensions.ActiveScriptController.DeniedExtensions", |
311 pending_requests_.size()); | 349 pending_requests_.size()); |
312 } | 350 } |
313 } | 351 } |
314 | 352 |
315 } // namespace extensions | 353 } // namespace extensions |
OLD | NEW |