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

Side by Side Diff: chrome/browser/extensions/active_script_controller.cc

Issue 396033002: Support "always allow" for runtime script execution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup extravaganza Created 6 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 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"
23 #include "extensions/browser/extension_registry.h" 24 #include "extensions/browser/extension_registry.h"
24 #include "extensions/common/extension.h" 25 #include "extensions/common/extension.h"
25 #include "extensions/common/extension_messages.h" 26 #include "extensions/common/extension_messages.h"
26 #include "extensions/common/extension_set.h" 27 #include "extensions/common/extension_set.h"
27 #include "extensions/common/feature_switch.h" 28 #include "extensions/common/feature_switch.h"
28 #include "extensions/common/manifest.h" 29 #include "extensions/common/manifest.h"
30 #include "extensions/common/manifest_handlers/permissions_parser.h"
31 #include "extensions/common/permissions/permission_set.h"
29 #include "extensions/common/permissions/permissions_data.h" 32 #include "extensions/common/permissions/permissions_data.h"
30 #include "ipc/ipc_message_macros.h" 33 #include "ipc/ipc_message_macros.h"
31 34
32 namespace extensions { 35 namespace extensions {
33 36
34 namespace { 37 namespace {
35 38
36 // Returns true if the extension should be regarded as a "permitted" extension 39 // 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 40 // 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 41 // 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
93 ad_injectors, permitted_extensions_).size(); 96 ad_injectors, permitted_extensions_).size();
94 97
95 UMA_HISTOGRAM_COUNTS_100( 98 UMA_HISTOGRAM_COUNTS_100(
96 "Extensions.ActiveScriptController.PreventableAdInjectors", 99 "Extensions.ActiveScriptController.PreventableAdInjectors",
97 num_preventable_ad_injectors); 100 num_preventable_ad_injectors);
98 UMA_HISTOGRAM_COUNTS_100( 101 UMA_HISTOGRAM_COUNTS_100(
99 "Extensions.ActiveScriptController.UnpreventableAdInjectors", 102 "Extensions.ActiveScriptController.UnpreventableAdInjectors",
100 ad_injectors.size() - num_preventable_ad_injectors); 103 ad_injectors.size() - num_preventable_ad_injectors);
101 } 104 }
102 105
106 void ActiveScriptController::AlwaysRunOnVisibleHost(
107 const Extension* extension) {
108 GURL url = web_contents()->GetVisibleURL();
109 extensions::URLPatternSet new_explicit_hosts;
110 extensions::URLPatternSet new_scriptable_hosts;
111
112 scoped_refptr<const PermissionSet> withheld_permissions =
113 extension->permissions_data()->withheld_permissions();
114 if (withheld_permissions->explicit_hosts().MatchesURL(url)) {
115 new_explicit_hosts.AddOrigin(
116 UserScript::ValidUserScriptSchemes(), url.GetOrigin());
117 }
118 if (withheld_permissions->scriptable_hosts().MatchesURL(url)) {
119 new_scriptable_hosts.AddOrigin(
120 UserScript::ValidUserScriptSchemes(), url.GetOrigin());
121 }
122
123 scoped_refptr<extensions::PermissionSet> new_permissions =
124 new extensions::PermissionSet(extensions::APIPermissionSet(),
125 extensions::ManifestPermissionSet(),
126 new_explicit_hosts,
127 new_scriptable_hosts);
128
129 // Update permissions for the session. This adds |new_permissions| to active
130 // permissions and granted permissions.
131 extensions::PermissionsUpdater updater(web_contents()->GetBrowserContext());
132 updater.AddPermissions(extension, new_permissions.get());
133
134 URLPatternSet permissions_union;
135 URLPatternSet::CreateUnion(
136 withheld_permissions->scriptable_hosts(),
137 PermissionsParser::GetRequiredPermissions(extension)->scriptable_hosts(),
138 &permissions_union);
139 UMA_HISTOGRAM_COUNTS_100(
140 "Extensions.ActiveScriptController.AlwaysRunCount",
141 extension->permissions_data()->GetEffectiveHostPermissions().size() -
142 permissions_union.size());
143
144 // Allow current tab to run injection.
145 OnClicked(extension);
146 }
147
148 bool ActiveScriptController::HasActiveScriptAction(const Extension* extension) {
149 return enabled_ && active_script_actions_.count(extension->id()) > 0;
150 }
151
103 ExtensionAction* ActiveScriptController::GetActionForExtension( 152 ExtensionAction* ActiveScriptController::GetActionForExtension(
104 const Extension* extension) { 153 const Extension* extension) {
105 if (!enabled_ || pending_requests_.count(extension->id()) == 0) 154 if (!enabled_ || pending_requests_.count(extension->id()) == 0)
106 return NULL; // No action for this extension. 155 return NULL; // No action for this extension.
107 156
108 ActiveScriptMap::iterator existing = 157 ActiveScriptMap::iterator existing =
109 active_script_actions_.find(extension->id()); 158 active_script_actions_.find(extension->id());
110 if (existing != active_script_actions_.end()) 159 if (existing != active_script_actions_.end())
111 return existing->second.get(); 160 return existing->second.get();
112 161
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 UMA_HISTOGRAM_COUNTS_100( 362 UMA_HISTOGRAM_COUNTS_100(
314 "Extensions.ActiveScriptController.PermittedExtensions", 363 "Extensions.ActiveScriptController.PermittedExtensions",
315 permitted_extensions_.size()); 364 permitted_extensions_.size());
316 UMA_HISTOGRAM_COUNTS_100( 365 UMA_HISTOGRAM_COUNTS_100(
317 "Extensions.ActiveScriptController.DeniedExtensions", 366 "Extensions.ActiveScriptController.DeniedExtensions",
318 pending_requests_.size()); 367 pending_requests_.size());
319 } 368 }
320 } 369 }
321 370
322 } // namespace extensions 371 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698