Create withheld permissions

extensions/common/extension_messages.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // IPC messages for extensions.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/shared_memory.h"
 #include "base/values.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/socket_permission_request.h"
 #include "extensions/common/api/messaging/message.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/draggable_region.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/media_galleries_permission_data.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/socket_permission_data.h"
 #include "extensions/common/permissions/usb_device_permission_data.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "extensions/common/view_type.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 #include "url/gurl.h"
 
 #define IPC_MESSAGE_START ExtensionMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(extensions::ViewType, extensions::VIEW_TYPE_LAST)
 IPC_ENUM_TRAITS_MAX_VALUE(content::SocketPermissionRequest::OperationType,
                           content::SocketPermissionRequest::OPERATION_TYPE_LAST)
 
+IPC_ENUM_TRAITS_MAX_VALUE(extension_misc::InjectedScriptType,
+                          extension_misc::PROGRAMMATIC_SCRIPT)

[not at google - send to devlin, 2014/06/27 23:24:34]

define a constant like INJECTED_SCRIPT_LAST as PROGRAMMATIC_SCRIPT and use here.

[Devlin, 2014/06/30 17:06:10]

Done.

+
 // Parameters structure for ExtensionHostMsg_AddAPIActionToActivityLog and
 // ExtensionHostMsg_AddEventToActivityLog.
 IPC_STRUCT_BEGIN(ExtensionHostMsg_APIActionOrEvent_Params)
   // API name.
   IPC_STRUCT_MEMBER(std::string, api_call)
 
   // List of arguments.
   IPC_STRUCT_MEMBER(base::ListValue, arguments)
 
   // Extra logging information.
@@ skipping 103 matching lines @@
   IPC_STRUCT_MEMBER(std::string, target_id)
 
   // The ID of the extension that initiated the request. May be empty if it
   // wasn't initiated by an extension.
   IPC_STRUCT_MEMBER(std::string, source_id)
 
   // The URL of the frame that initiated the request.
   IPC_STRUCT_MEMBER(GURL, source_url)
 IPC_STRUCT_END()
 
-// Parameters structure for ExtensionMsg_UpdatePermissions.
-IPC_STRUCT_BEGIN(ExtensionMsg_UpdatePermissions_Params)
-  IPC_STRUCT_MEMBER(int /* UpdateExtensionPermissionsInfo::REASON */, reason_id)
-  IPC_STRUCT_MEMBER(std::string, extension_id)
-  IPC_STRUCT_MEMBER(extensions::APIPermissionSet, apis)
-  IPC_STRUCT_MEMBER(extensions::ManifestPermissionSet, manifest_permissions)
-  IPC_STRUCT_MEMBER(extensions::URLPatternSet, explicit_hosts)
-  IPC_STRUCT_MEMBER(extensions::URLPatternSet, scriptable_hosts)
-IPC_STRUCT_END()
-
 IPC_STRUCT_TRAITS_BEGIN(extensions::DraggableRegion)
   IPC_STRUCT_TRAITS_MEMBER(draggable)
   IPC_STRUCT_TRAITS_MEMBER(bounds)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::SocketPermissionRequest)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(host)
   IPC_STRUCT_TRAITS_MEMBER(port)
 IPC_STRUCT_TRAITS_END()
@@ skipping 26 matching lines @@
 #define EXTENSIONS_COMMON_EXTENSION_MESSAGES_H_
 
 // IPC_MESSAGE macros choke on extra , in the std::map, when expanding. We need
 // to typedef it to avoid that.
 // Substitution map for l10n messages.
 typedef std::map<std::string, std::string> SubstitutionMap;
 
 // Map of extensions IDs to the executing script paths.
 typedef std::map<std::string, std::set<std::string> > ExecutingScriptsMap;
 
+struct ExtensionMsg_PermissionSetStruct {

[not at google - send to devlin, 2014/06/27 23:24:33]

can you instead implement IPC serialization for PermissionSet? having this
separate structure is confusing.

[Devlin, 2014/06/30 17:06:10]

Yeah, it is.  But we can't do it on PermissionSet because a PermissionSet is
immutable.

[not at google - send to devlin, 2014/07/01 00:28:35]

ok... why does that mean you can't implement IPCs for it? e.g. the Write is
still an const operation, and the Read could be an alternative constructor or
factory method?

[not at google - send to devlin, 2014/07/01 02:56:50]

my comment might have been nonsensical; what does it mean that "permissionset is
immutable" that prevents it from implementing the IPC methods?

[Devlin, 2014/07/01 16:27:05]

Sorry, I should have said that PermissionSets are immutable _and_ refcounted.

The Read() methods work by reading in a parameter at a time and populating the
given point to them.

// |param_type| is typedef'd to PermissionSet
Read(const Message* m, PickleIterator* iter, param_type* p) {
  ReadParam(m, iter, &dest);
}

So, since PermissionSets are immutable, we can't do the typical
ReadParam(m, iter, &p->apis);
as the apis portion of p cannot be changed.

And, since they are refcounted, we can't do:
URLPatternSet foo;
ReadParam(m, iter, &foo);
*p = PermissionSet(foo);

[not at google - send to devlin, 2014/07/01 17:02:11]

I still don't really follow why this implies you need an external object.... is
there something you can add or whatever to PermissionSet to make it support what
you need? this external structure is a real pain.

[Devlin, 2014/07/01 18:34:08]

Resolved offline; we'll keep the IPC struct until there's a better workaround,
because this way all the ugliness is concentrated in one place.

+  ExtensionMsg_PermissionSetStruct();
+  explicit ExtensionMsg_PermissionSetStruct(
+      const extensions::PermissionSet* permissions);
+  ~ExtensionMsg_PermissionSetStruct();
+
+  scoped_refptr<const extensions::PermissionSet> ToPermissionSet() const;
+
+  extensions::APIPermissionSet apis;
+  extensions::ManifestPermissionSet manifest_permissions;
+  extensions::URLPatternSet explicit_hosts;
+  extensions::URLPatternSet scriptable_hosts;
+};
+
 struct ExtensionMsg_Loaded_Params {
   ExtensionMsg_Loaded_Params();
   ~ExtensionMsg_Loaded_Params();
   explicit ExtensionMsg_Loaded_Params(const extensions::Extension* extension);
 
   // Creates a new extension from the data in this object.
   scoped_refptr<extensions::Extension> ConvertToExtension(
       std::string* error) const;
 
   // The subset of the extension manifest data we send to renderers.
   linked_ptr<base::DictionaryValue> manifest;
 
   // The location the extension was installed from.
   extensions::Manifest::Location location;
 
   // The path the extension was loaded from. This is used in the renderer only
   // to generate the extension ID for extensions that are loaded unpacked.
   base::FilePath path;
 
-  // The extension's active permissions.
-  extensions::APIPermissionSet apis;
-  extensions::ManifestPermissionSet manifest_permissions;
-  extensions::URLPatternSet explicit_hosts;
-  extensions::URLPatternSet scriptable_hosts;
+  // The extension's active and withheld permissions.
+  ExtensionMsg_PermissionSetStruct active_permissions;
+  ExtensionMsg_PermissionSetStruct withheld_permissions;
 
   // We keep this separate so that it can be used in logging.
   std::string id;
 
   // Send creation flags so extension is initialized identically.
   int creation_flags;
 };
 
 namespace IPC {
 
@@ skipping 31 matching lines @@
 
 template <>
 struct ParamTraits<extensions::ManifestPermissionSet> {
   typedef extensions::ManifestPermissionSet param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
+struct ParamTraits<extensions::PermissionSet> {
+  typedef extensions::PermissionSet param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
+  static void Log(const param_type& p, std::string* l);
+};
+
+template <>
+struct ParamTraits<ExtensionMsg_PermissionSetStruct> {
+  typedef ExtensionMsg_PermissionSetStruct param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* p);
+  static void Log(const param_type& p, std::string* l);
+};
+
+template <>
 struct ParamTraits<ExtensionMsg_Loaded_Params> {
   typedef ExtensionMsg_Loaded_Params param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, PickleIterator* iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
 #endif  // EXTENSIONS_COMMON_EXTENSION_MESSAGES_H_
 
+// Parameters structure for ExtensionMsg_UpdatePermissions.
+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_END()
+
 // Messages sent from the browser to the renderer.
 
 // The browser sends this message in response to all extension api calls. The
 // response data (if any) is one of the base::Value subclasses, wrapped as the
 // first element in a ListValue.
 IPC_MESSAGE_ROUTED4(ExtensionMsg_Response,
                     int /* request_id */,
                     bool /* success */,
                     base::ListValue /* response wrapper (see comment above) */,
                     std::string /* error */)
@@ skipping 269 matching lines @@
 IPC_MESSAGE_ROUTED3(ExtensionHostMsg_ContentScriptsExecuting,
                     ExecutingScriptsMap,
                     int32 /* page_id of the _topmost_ frame */,
                     GURL /* url of the _topmost_ frame */)
 
 // Sent from the renderer to the browser to request permission for a script
 // injection.
 // If request id is -1, this signals that the request has already ran, and this
 // merely serves as a notification. This happens when the feature to disable
 // scripts running without user consent is not enabled.
-IPC_MESSAGE_ROUTED3(ExtensionHostMsg_RequestScriptInjectionPermission,
+IPC_MESSAGE_ROUTED4(ExtensionHostMsg_RequestScriptInjectionPermission,
                     std::string /* extension id */,
+                    extension_misc::InjectedScriptType /* script type */,
                     int /* page id */,
                     int /* request id */)
 
 // Sent from the browser to the renderer in reply to a
 // RequestScriptInjectionPermission message, granting permission for a script
 // script to run.
 IPC_MESSAGE_ROUTED1(ExtensionMsg_PermitScriptInjection, int /* request id */)
 
 // Sent by the renderer when a web page is checking if its app is installed.
 IPC_MESSAGE_ROUTED3(ExtensionHostMsg_GetAppInstallState,
@@ skipping 58 matching lines @@
 //   FrameHostMsg_DidCommitProvisionalLoad. Currently this only fires for the
 //   main frame.
 // * Something changed on an existing frame causing the set of matching searches
 //   to change.
 IPC_MESSAGE_ROUTED1(ExtensionHostMsg_OnWatchedPageChange,
                     std::vector<std::string> /* Matching CSS selectors */)
 
 // Sent by the renderer when it has received a Blob handle from the browser.
 IPC_MESSAGE_CONTROL1(ExtensionHostMsg_TransferBlobsAck,
                      std::vector<std::string> /* blob_uuids */)