Communicate ExtensionSettings policy to renderers

extensions/common/extension_messages.h

Index: extensions/common/extension_messages.h
diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h
index f7952e80e21ca0d0e2b1033c3c96f572add242d4..78ed533ede41309486a63ebc9de805090105bc01 100644
--- a/extensions/common/extension_messages.h
+++ b/extensions/common/extension_messages.h
@@ -293,6 +293,9 @@ struct ExtensionMsg_PermissionSetStruct {
   extensions::ManifestPermissionSet manifest_permissions;
   extensions::URLPatternSet explicit_hosts;
   extensions::URLPatternSet scriptable_hosts;
+  extensions::URLPatternSet policy_blocked_hosts;
+  extensions::URLPatternSet policy_allowed_hosts;
+  bool uses_default_policy_host_restrictions;

[vabr (Chromium), 2017/04/18 14:17:48]

Do the POD fields like uses_default_policy_host_restrictions and
uses_default_policy_blocked_allowed_hosts below need an initial value, either
here or in all constructors?

Is that what MSan is complaining about in https://crbug.com/712641?

[nrpeter, 2017/04/18 15:30:39]

I think msan is complaining about the policy_blocked_hosts and
policy_allowed_hosts. I only initialize those when
use_default_policy_host_restrictions is true. On the receiving end, we also look
at the boolean to see whether we will use the URLPatternSets. The issue is that
policy_blocked_hosts and policy_allowed_hosts get written to the message
regardless.

I'll either have to conditionally write them to the message (yuck) or send empty
URLPatternSet objects (wasteful). Maybe Devlin has another idea about how to do
this efficiently.

 };
 
 struct ExtensionMsg_Loaded_Params {
@@ -321,6 +324,14 @@ struct ExtensionMsg_Loaded_Params {
   ExtensionMsg_PermissionSetStruct withheld_permissions;
   std::map<int, ExtensionMsg_PermissionSetStruct> tab_specific_permissions;
 
+  // Contains URLPatternSets defining which URLs an extension may not interact
+  // with by policy.
+  extensions::URLPatternSet policy_blocked_hosts;
+  extensions::URLPatternSet policy_allowed_hosts;
+
+  // If the extension uses the default list of blocked / allowed URLs.
+  bool uses_default_policy_blocked_allowed_hosts;
+
   // We keep this separate so that it can be used in logging.
   std::string id;
 
@@ -442,6 +453,15 @@ IPC_STRUCT_BEGIN(ExtensionMsg_UpdatePermissions_Params)
   IPC_STRUCT_MEMBER(std::string, extension_id)
   IPC_STRUCT_MEMBER(ExtensionMsg_PermissionSetStruct, active_permissions)
   IPC_STRUCT_MEMBER(ExtensionMsg_PermissionSetStruct, withheld_permissions)
+  IPC_STRUCT_MEMBER(extensions::URLPatternSet, policy_blocked_hosts)
+  IPC_STRUCT_MEMBER(extensions::URLPatternSet, policy_allowed_hosts)
+  IPC_STRUCT_MEMBER(bool, uses_default_policy_host_restrictions)
+IPC_STRUCT_END()
+
+// Parameters structure for ExtensionMsg_UpdateDefaultPolicyHostRestrictions.
+IPC_STRUCT_BEGIN(ExtensionMsg_UpdateDefaultPolicyHostRestrictions_Params)
+  IPC_STRUCT_MEMBER(extensions::URLPatternSet, default_policy_blocked_hosts)
+  IPC_STRUCT_MEMBER(extensions::URLPatternSet, default_policy_allowed_hosts)
 IPC_STRUCT_END()
 
 // Messages sent from the browser to the renderer:
@@ -548,6 +568,10 @@ IPC_MESSAGE_ROUTED1(ExtensionMsg_SetTabId,
 IPC_MESSAGE_CONTROL1(ExtensionMsg_UpdatePermissions,
                      ExtensionMsg_UpdatePermissions_Params)
 
+// Tell the renderer to update an extension's policy_blocked_hosts set.
+IPC_MESSAGE_CONTROL1(ExtensionMsg_UpdateDefaultPolicyHostRestrictions,
+                     ExtensionMsg_UpdateDefaultPolicyHostRestrictions_Params)
+
 // Tell the render view about new tab-specific permissions for an extension.
 IPC_MESSAGE_CONTROL5(ExtensionMsg_UpdateTabSpecificPermissions,
                      GURL /* url */,