[GCM] Only allow the senders that the application is currently registered for

google_apis/gcm/gcm_client_impl.cc

 // Copyright 2013 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.
 
 #include "google_apis/gcm/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 438 matching lines @@
   else if (status != MCSClient::SENT)
     delegate_->OnSendFinished(app_id, message_id, ToGCMClientResult(status));
 }
 
 void GCMClientImpl::OnMCSError() {
   // TODO(fgorski): For now it replaces the initialization method. Long term it
   // should have an error or status passed in.
 }
 
 void GCMClientImpl::HandleIncomingMessage(const gcm::MCSMessage& message) {
+  DCHECK(delegate_);
+
   const mcs_proto::DataMessageStanza& data_message_stanza =
       reinterpret_cast<const mcs_proto::DataMessageStanza&>(
           message.GetProtobuf());
+  DCHECK_EQ(data_message_stanza.device_user_id(), kDefaultUserSerialNumber);
+
   IncomingMessage incoming_message;
   MessageType message_type = DATA_MESSAGE;
   for (int i = 0; i < data_message_stanza.app_data_size(); ++i) {
     std::string key = data_message_stanza.app_data(i).key();
     if (key == kMessageTypeKey)
       message_type = DecodeMessageType(data_message_stanza.app_data(i).value());
     else
       incoming_message.data[key] = data_message_stanza.app_data(i).value();
   }
 
-  if (data_message_stanza.has_token())
-    incoming_message.collapse_key = data_message_stanza.token();
-
-  DCHECK_EQ(data_message_stanza.device_user_id(), kDefaultUserSerialNumber);
-  DCHECK(delegate_);
 
   switch (message_type) {
     case DATA_MESSAGE:
+      incoming_message.sender_id = data_message_stanza.from();
+      if (data_message_stanza.has_token())
+        incoming_message.collapse_key = data_message_stanza.token();
       delegate_->OnMessageReceived(data_message_stanza.category(),
                                    incoming_message);
       break;
     case DELETED_MESSAGES:
       delegate_->OnMessagesDeleted(data_message_stanza.category());
       break;
     case SEND_ERROR:
       NotifyDelegateOnMessageSendError(
           delegate_, data_message_stanza.category(), incoming_message);
       break;
@@ skipping 15 matching lines @@
   if (iter != incoming_message.data.end())
     message_id = iter->second;
   delegate->OnMessageSendError(app_id, message_id, SERVER_ERROR);
 }
 
 void GCMClientImpl::SetMCSClientForTesting(scoped_ptr<MCSClient> mcs_client) {
   mcs_client_ = mcs_client.Pass();
 }
 
 }  // namespace gcm