Partial implementation of subscription restrictions.

third_party/WebKit/Source/modules/push_messaging/PushManager.cpp

 // 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.
 
 #include "modules/push_messaging/PushManager.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
@@ skipping 20 matching lines @@
 {
     WebPushProvider* webPushProvider = Platform::current()->pushProvider();
     ASSERT(webPushProvider);
     return webPushProvider;
 }
 
 WebPushSubscriptionOptions toWebPushSubscriptionOptions(const PushSubscriptionOptions& options)
 {
     WebPushSubscriptionOptions webOptions;
     webOptions.userVisibleOnly = options.userVisibleOnly();
+    if (options.hasAppServicePublicKey() && options.appServicePublicKey())
+        webOptions.applicationServerKey = WTF::String(static_cast<const char*>(options.appServicePublicKey()->data()));

[Peter Beverloo, 2016/02/17 16:15:36]

This isn't safe because the |applicationServerKey| may contain NULL bytes, which
would early-terminate the string. We need to use the length (byteLength())
explicitly.

I think we have two options here—

  (1) Store and pass the key as a WebVector<uint8_t>.
  (2) Creating a UTF16 string out of the binary data so that we can convert it
back to a UTF8 string (i.e. std::string) later on.


webOptions.applicationServerKey = WebString::fromUTF8(
    static_cast<const char*>(options.applicationServerKey()->data(),
                             options.applicationServerKey()->byteLength()));

[harkness, 2016/02/18 10:45:15]

Done.

     return webOptions;
 }
 
 } // namespace
 
 PushManager::PushManager(ServiceWorkerRegistration* registration)
     : m_registration(registration)
 {
     ASSERT(registration);
 }
@@ skipping 44 matching lines @@
     pushProvider()->getPermissionStatus(m_registration->webRegistration(), toWebPushSubscriptionOptions(options), new PushPermissionStatusCallbacks(resolver));
     return promise;
 }
 
 DEFINE_TRACE(PushManager)
 {
     visitor->trace(m_registration);
 }
 
 } // namespace blink