Introduce the PushSubscription.curve25519dh attribute (2/3)

content/common/push_messaging_messages.h

Index: content/common/push_messaging_messages.h
diff --git a/content/common/push_messaging_messages.h b/content/common/push_messaging_messages.h
index 3849c5ab0021543ef8b56486a2640fe4ff99a7d3..f83f7368b25900d179129d20f7cc682636870be0 100644
--- a/content/common/push_messaging_messages.h
+++ b/content/common/push_messaging_messages.h
@@ -31,13 +31,15 @@ IPC_ENUM_TRAITS_MAX_VALUE(
 
 // Messages sent from the browser to the child process.
 
-IPC_MESSAGE_ROUTED2(PushMessagingMsg_SubscribeFromDocumentSuccess,
+IPC_MESSAGE_ROUTED3(PushMessagingMsg_SubscribeFromDocumentSuccess,
                     int32_t /* request_id */,
-                    GURL /* push_endpoint */)
+                    GURL /* push_endpoint */,
+                    std::vector<uint8_t> /* curve25519dh */)
 
-IPC_MESSAGE_CONTROL2(PushMessagingMsg_SubscribeFromWorkerSuccess,
+IPC_MESSAGE_CONTROL3(PushMessagingMsg_SubscribeFromWorkerSuccess,
                      int32_t /* request_id */,
-                     GURL /* push_endpoint */)
+                     GURL /* push_endpoint */,
+                     std::vector<uint8_t> /* curve25519dh */)
 
 IPC_MESSAGE_ROUTED2(PushMessagingMsg_SubscribeFromDocumentError,
                     int32_t /* request_id */,
@@ -56,9 +58,10 @@ IPC_MESSAGE_CONTROL3(PushMessagingMsg_UnsubscribeError,
                      blink::WebPushError::ErrorType /* error_type */,
                      std::string /* error_message */)
 
-IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetRegistrationSuccess,
+IPC_MESSAGE_CONTROL3(PushMessagingMsg_GetRegistrationSuccess,
                      int32_t /* request_id */,
-                     GURL /* push_endpoint */)
+                     GURL /* push_endpoint */,
+                     std::vector<uint8_t> /* curve25519dh */)
 
 IPC_MESSAGE_CONTROL2(PushMessagingMsg_GetRegistrationError,
                      int32_t /* request_id */,
@@ -90,8 +93,9 @@ IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_Unsubscribe,
                      int32_t /* request_id */,
                      int64_t /* service_worker_registration_id */)
 
-IPC_MESSAGE_CONTROL2(PushMessagingHostMsg_GetRegistration,
+IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_GetRegistration,
                      int32_t /* request_id */,
+                     GURL /* origin */,

[johnme, 2015/07/09 16:02:53]

It seems problematic to let the untrusted renderer provide the origin directly.

Other handlers typically use
service_worker_context_->GetLiveRegistration(service_worker_registration_id)->pattern().GetOrigin()
to get the origin from the browser-process, though that's not much better (as it
seems easy to enumerate all possible service worker registration ids), though
perhaps it at least limits it to origins which have a SW (which in this case
isn't a particularly useful limitation).

Is there some way we can check if the origin makes sense for the render process?
I guess this is blocked on https://crbug.com/109792 :-(

[Peter Beverloo, 2015/07/09 18:54:17]

I don't buy that argument. Passing the origin would allow us to check that the
origin matches the SW registration id, making iterating over possible SW
registration ids *much* harder. Right now we'd return the registration if it
exists, regardless of origin.

That said, keeping this all in PushMessagingMessageFilter and keeping the IPCs
consistent is good. I've moved it there.

                      int64_t /* service_worker_registration_id */)
 
 IPC_MESSAGE_CONTROL3(PushMessagingHostMsg_GetPermissionStatus,