[GCM] Updating the list of restricted keys for GCM API messages

chrome/browser/extensions/api/gcm/gcm_api.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 "chrome/browser/extensions/api/gcm/gcm_api.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/extensions/api/gcm.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 
 namespace {
 
 const size_t kMaximumMessageSize = 4096;  // in bytes.
+const char kCollapseKey[] = "collapse_key";
+const size_t kCollapseKeyLength = arraysize(kCollapseKey) - 1;

[not at google - send to devlin, 2014/02/12 01:42:23]

I don't really understand why you can't inline these kFooLength as just
arraysize(kFoo) - 1, but, whatever.

[fgorski, 2014/02/12 21:52:22]

Done.

 const char kGoogDotRestrictedPrefix[] = "goog.";
 const size_t kGoogDotPrefixLength = arraysize(kGoogDotRestrictedPrefix) - 1;
 const char kGoogleRestrictedPrefix[] = "google";
 const size_t kGooglePrefixLength = arraysize(kGoogleRestrictedPrefix) - 1;
 
 // Error messages.
 const char kInvalidParameter[] =
     "Function was called with invalid parameters.";
 const char kNotSignedIn[] = "Profile was not signed in.";
 const char kAsyncOperationPending[] =
@@ skipping 29 matching lines @@
     default:
       NOTREACHED() << "Unexpected value of result cannot be converted: "
                    << result;
   }
 
   // Never reached, but prevents missing return statement warning.
   return "";
 }
 
 bool IsMessageKeyValid(const std::string& key) {
+  std::string lower;
+  std::transform(key.begin(), key.end(), lower.begin(), ::tolower);

[jianli, 2014/02/12 01:30:32]

nit: use base::StringToLowerASCII. Or even better, you could probably use
base::LowerCaseEqualsASCII

[fgorski, 2014/02/12 21:52:22]

Done.

   return !key.empty() &&
-      key.compare(0, kGooglePrefixLength, kGoogleRestrictedPrefix) != 0 &&
-      key.compare(0, kGoogDotPrefixLength, kGoogDotRestrictedPrefix) != 0;
+         key.compare(0, kCollapseKeyLength, kCollapseKey) != 0 &&
+         lower.compare(0, kGooglePrefixLength, kGoogleRestrictedPrefix) != 0 &&
+         lower.compare(0, kGoogDotPrefixLength, kGoogDotRestrictedPrefix) != 0;
 }
 
 }  // namespace
 
 namespace extensions {
 
 bool GcmApiFunction::RunImpl() {
   if (!IsGcmApiEnabled())
     return false;
 
@@ skipping 124 matching lines @@
 
   scoped_ptr<Event> event(new Event(
       api::gcm::OnSendError::kEventName,
       api::gcm::OnSendError::Create(error).Pass(),
       profile_));
   ExtensionSystem::Get(profile_)->event_router()->DispatchEventToExtension(
       app_id, event.Pass());
 }
 
 }  // namespace extensions