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

Unified Diff: content/renderer/push_messaging_dispatcher.cc

Issue 686133003: Reject push registrations when no sender Id has been provided. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 6 years, 2 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 | « content/public/common/push_messaging_status.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/push_messaging_dispatcher.cc
diff --git a/content/renderer/push_messaging_dispatcher.cc b/content/renderer/push_messaging_dispatcher.cc
index 7c9d05a662792e30aa9ac008ac1e50b925b100b6..d21f6f5c6ca0efc181f94f77e8bb5a180d2dda97 100644
--- a/content/renderer/push_messaging_dispatcher.cc
+++ b/content/renderer/push_messaging_dispatcher.cc
@@ -55,12 +55,18 @@ void PushMessagingDispatcher::DoRegister(
int callbacks_id = registration_callbacks_.Add(callbacks);
int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>(
service_worker_provider)->provider_id();
+
+ std::string sender_id = manifest.gcm_sender_id.is_null()
+ ? std::string() : base::UTF16ToUTF8(manifest.gcm_sender_id.string());
+ if (sender_id.empty()) {
+ OnRegisterError(callbacks_id, PUSH_REGISTRATION_STATUS_NO_SENDER_ID);
+ return;
+ }
+
Send(new PushMessagingHostMsg_Register(
routing_id(),
callbacks_id,
- manifest.gcm_sender_id.is_null()
- ? std::string()
- : base::UTF16ToUTF8(manifest.gcm_sender_id.string()),
+ sender_id,
blink::WebUserGestureIndicator::isProcessingUserGesture(),
service_worker_provider_id));
}
« no previous file with comments | « content/public/common/push_messaging_status.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698