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

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: Final fixes 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_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"
17 #include "chrome/browser/extensions/permissions_updater.h"
16 #include "chrome/browser/extensions/tab_helper.h" 18 #include "chrome/browser/extensions/tab_helper.h"
17 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/sessions/session_id.h" 20 #include "chrome/browser/sessions/session_id.h"
19 #include "chrome/common/extensions/api/extension_action/action_info.h" 21 #include "chrome/common/extensions/api/extension_action/action_info.h"
20 #include "content/public/browser/navigation_controller.h" 22 #include "content/public/browser/navigation_controller.h"
21 #include "content/public/browser/navigation_entry.h" 23 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
23 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
24 #include "extensions/browser/extension_registry.h" 26 #include "extensions/browser/extension_registry.h"
25 #include "extensions/common/extension.h" 27 #include "extensions/common/extension.h"
26 #include "extensions/common/extension_messages.h" 28 #include "extensions/common/extension_messages.h"
27 #include "extensions/common/extension_set.h" 29 #include "extensions/common/extension_set.h"
28 #include "extensions/common/feature_switch.h" 30 #include "extensions/common/feature_switch.h"
29 #include "extensions/common/manifest.h" 31 #include "extensions/common/manifest.h"
32 #include "extensions/common/permissions/permission_set.h"
30 #include "extensions/common/permissions/permissions_data.h" 33 #include "extensions/common/permissions/permissions_data.h"
31 #include "ipc/ipc_message_macros.h" 34 #include "ipc/ipc_message_macros.h"
32 35
33 namespace extensions { 36 namespace extensions {
34 37
35 namespace { 38 namespace {
36 39
37 // 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
38 // 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
39 // 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
94 ad_injectors, permitted_extensions_).size(); 97 ad_injectors, permitted_extensions_).size();
95 98
96 UMA_HISTOGRAM_COUNTS_100( 99 UMA_HISTOGRAM_COUNTS_100(
97 "Extensions.ActiveScriptController.PreventableAdInjectors", 100 "Extensions.ActiveScriptController.PreventableAdInjectors",
98 num_preventable_ad_injectors); 101 num_preventable_ad_injectors);
99 UMA_HISTOGRAM_COUNTS_100( 102 UMA_HISTOGRAM_COUNTS_100(
100 "Extensions.ActiveScriptController.UnpreventableAdInjectors", 103 "Extensions.ActiveScriptController.UnpreventableAdInjectors",
101 ad_injectors.size() - num_preventable_ad_injectors); 104 ad_injectors.size() - num_preventable_ad_injectors);
102 } 105 }
103 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 // TODO(devlin): Make sure that the permission is removed from
133 // withheld_permissions if appropriate.
134 PermissionsUpdater(web_contents()->GetBrowserContext())
135 .AddPermissions(extension, new_permissions.get());
136
137 // Allow current tab to run injection.
138 OnClicked(extension);
139 }
140
141 bool ActiveScriptController::HasActiveScriptAction(const Extension* extension) {
142 return enabled_ && active_script_actions_.count(extension->id()) > 0;
143 }
144
104 ExtensionAction* ActiveScriptController::GetActionForExtension( 145 ExtensionAction* ActiveScriptController::GetActionForExtension(
105 const Extension* extension) { 146 const Extension* extension) {
106 if (!enabled_ || pending_requests_.count(extension->id()) == 0) 147 if (!enabled_ || pending_requests_.count(extension->id()) == 0)
107 return NULL; // No action for this extension. 148 return NULL; // No action for this extension.
108 149
109 ActiveScriptMap::iterator existing = 150 ActiveScriptMap::iterator existing =
110 active_script_actions_.find(extension->id()); 151 active_script_actions_.find(extension->id());
111 if (existing != active_script_actions_.end()) 152 if (existing != active_script_actions_.end())
112 return existing->second.get(); 153 return existing->second.get();
113 154
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 UMA_HISTOGRAM_COUNTS_100( 346 UMA_HISTOGRAM_COUNTS_100(
306 "Extensions.ActiveScriptController.PermittedExtensions", 347 "Extensions.ActiveScriptController.PermittedExtensions",
307 permitted_extensions_.size()); 348 permitted_extensions_.size());
308 UMA_HISTOGRAM_COUNTS_100( 349 UMA_HISTOGRAM_COUNTS_100(
309 "Extensions.ActiveScriptController.DeniedExtensions", 350 "Extensions.ActiveScriptController.DeniedExtensions",
310 pending_requests_.size()); 351 pending_requests_.size());
311 } 352 }
312 } 353 }
313 354
314 } // namespace extensions 355 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/active_script_controller.h ('k') | chrome/browser/extensions/active_script_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698