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

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: Test attempt Created 6 years, 5 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"
18 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/sessions/session_id.h" 19 #include "chrome/browser/sessions/session_id.h"
18 #include "chrome/common/extensions/api/extension_action/action_info.h" 20 #include "chrome/common/extensions/api/extension_action/action_info.h"
19 #include "content/public/browser/navigation_controller.h" 21 #include "content/public/browser/navigation_controller.h"
20 #include "content/public/browser/navigation_entry.h" 22 #include "content/public/browser/navigation_entry.h"
21 #include "content/public/browser/render_view_host.h" 23 #include "content/public/browser/render_view_host.h"
22 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "extensions/browser/extension_prefs.h"
23 #include "extensions/browser/extension_registry.h" 26 #include "extensions/browser/extension_registry.h"
24 #include "extensions/common/extension.h" 27 #include "extensions/common/extension.h"
25 #include "extensions/common/extension_messages.h" 28 #include "extensions/common/extension_messages.h"
26 #include "extensions/common/extension_set.h" 29 #include "extensions/common/extension_set.h"
27 #include "extensions/common/feature_switch.h" 30 #include "extensions/common/feature_switch.h"
28 #include "extensions/common/manifest.h" 31 #include "extensions/common/manifest.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
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::AddPersistedPermission(
108 const Extension* extension) {
109 // Allow current tab to run injection.
110 OnClicked(extension);
111
112 GURL url = web_contents()->GetVisibleURL();
113 extensions::URLPatternSet new_hosts;
114 URLPattern pattern(extensions::UserScript::ValidUserScriptSchemes());
115
116 pattern.SetScheme(url.scheme());
117 pattern.SetHost(url.host());
118 pattern.SetPath("/*");
119 new_hosts.AddPattern(pattern);
120
121 scoped_refptr<extensions::PermissionSet> new_permissions =
122 new extensions::PermissionSet(extensions::APIPermissionSet(),
123 extensions::ManifestPermissionSet(),
124 extensions::URLPatternSet(),
125 new_hosts);
126
127 // Update active permissions for the session.
128 extensions::PermissionsUpdater updater(
129 Profile::FromBrowserContext(web_contents()->GetBrowserContext()));
130 updater.AddPermissions(extension, new_permissions.get());
131
132 // Update persisted permissions for extension.
133 extensions::ExtensionPrefs* prefs =
134 extensions::ExtensionPrefs::Get(web_contents()->GetBrowserContext());
135 prefs->ClearPersistedPermissions(extension);
136 prefs->AddPersistedPermission(extension, &pattern);
137 }
138
103 ExtensionAction* ActiveScriptController::GetActionForExtension( 139 ExtensionAction* ActiveScriptController::GetActionForExtension(
104 const Extension* extension) { 140 const Extension* extension) {
105 if (!enabled_ || pending_requests_.count(extension->id()) == 0) 141 if (!enabled_ || pending_requests_.count(extension->id()) == 0)
106 return NULL; // No action for this extension. 142 return NULL; // No action for this extension.
107 143
108 ActiveScriptMap::iterator existing = 144 ActiveScriptMap::iterator existing =
109 active_script_actions_.find(extension->id()); 145 active_script_actions_.find(extension->id());
110 if (existing != active_script_actions_.end()) 146 if (existing != active_script_actions_.end())
111 return existing->second.get(); 147 return existing->second.get();
112 148
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 UMA_HISTOGRAM_COUNTS_100( 349 UMA_HISTOGRAM_COUNTS_100(
314 "Extensions.ActiveScriptController.PermittedExtensions", 350 "Extensions.ActiveScriptController.PermittedExtensions",
315 permitted_extensions_.size()); 351 permitted_extensions_.size());
316 UMA_HISTOGRAM_COUNTS_100( 352 UMA_HISTOGRAM_COUNTS_100(
317 "Extensions.ActiveScriptController.DeniedExtensions", 353 "Extensions.ActiveScriptController.DeniedExtensions",
318 pending_requests_.size()); 354 pending_requests_.size());
319 } 355 }
320 } 356 }
321 357
322 } // namespace extensions 358 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698