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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 2833843004: Reland: Communicate ExtensionSettings policy to renderers (Closed)
Patch Set: Removed unused URLPatternSet parameters in ExtensionMsg_PermissionSetStruct which was causing MSAN … Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/renderer/dispatcher.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 86aa53373ec9371b21aa27215aaa6fef99b7ab39..429056c9a998cde4a8b943890f35ff2811ad782d 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -908,6 +908,8 @@ bool Dispatcher::OnControlMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ExtensionMsg_TransferBlobs, OnTransferBlobs)
IPC_MESSAGE_HANDLER(ExtensionMsg_Unloaded, OnUnloaded)
IPC_MESSAGE_HANDLER(ExtensionMsg_UpdatePermissions, OnUpdatePermissions)
+ IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateDefaultPolicyHostRestrictions,
+ OnUpdateDefaultPolicyHostRestrictions)
IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateTabSpecificPermissions,
OnUpdateTabSpecificPermissions)
IPC_MESSAGE_HANDLER(ExtensionMsg_ClearTabSpecificPermissions,
@@ -1031,7 +1033,6 @@ void Dispatcher::OnLoaded(
extension_load_errors_[param.id] = error;
continue;
}
-
RendererExtensionRegistry* extension_registry =
RendererExtensionRegistry::Get();
// TODO(kalman): This test is deliberately not a CHECK (though I wish it
@@ -1048,12 +1049,18 @@ void Dispatcher::OnLoaded(
// consider making this a release CHECK.
NOTREACHED();
}
+ if (param.uses_default_policy_blocked_allowed_hosts) {
+ extension->permissions_data()->SetUsesDefaultHostRestrictions();
+ } else {
+ extension->permissions_data()->SetPolicyHostRestrictions(
+ param.policy_blocked_hosts, param.policy_allowed_hosts);
+ }
}
// Update the available bindings for all contexts. These may have changed if
// an externally_connectable extension was loaded that can connect to an
// open webpage.
- UpdateBindings("");
+ UpdateBindings(std::string());
}
void Dispatcher::OnMessageInvoke(const std::string& extension_id,
@@ -1180,6 +1187,13 @@ void Dispatcher::OnUnloaded(const std::string& id) {
// extension's URL just won't match anything anymore.
}
+void Dispatcher::OnUpdateDefaultPolicyHostRestrictions(
+ const ExtensionMsg_UpdateDefaultPolicyHostRestrictions_Params& params) {
+ PermissionsData::SetDefaultPolicyHostRestrictions(
+ params.default_policy_blocked_hosts, params.default_policy_allowed_hosts);
+ UpdateBindings(std::string());
+}
+
void Dispatcher::OnUpdatePermissions(
const ExtensionMsg_UpdatePermissions_Params& params) {
const Extension* extension =
@@ -1199,6 +1213,12 @@ void Dispatcher::OnUpdatePermissions(
extension->permissions_data()->SetPermissions(std::move(active),
std::move(withheld));
+ if (params.uses_default_policy_host_restrictions) {
+ extension->permissions_data()->SetUsesDefaultHostRestrictions();
+ } else {
+ extension->permissions_data()->SetPolicyHostRestrictions(
+ params.policy_blocked_hosts, params.policy_allowed_hosts);
+ }
UpdateBindings(extension->id());
}
« no previous file with comments | « extensions/renderer/dispatcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698