Check the format of an applicationServerKey when used to register a push subscription.

chrome/browser/push_messaging/push_messaging_browsertest.cc

 // 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 <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <string>
 
@@ skipping 429 matching lines @@
   ASSERT_EQ("ok - service worker registered", script_result);
 
   GetPermissionRequestManager()->set_auto_response_for_test(
       PermissionRequestManager::ACCEPT_ALL);
   ASSERT_TRUE(RunScript("documentSubscribePush()", &script_result));
   // Both of these methods EXPECT that they succeed.
   ASSERT_NO_FATAL_FAILURE(EndpointToToken(script_result));
   GetAppIdentifierForServiceWorkerRegistration(0LL);
 }
 
-IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeFailureBadKey) {
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
+                       SubscribeSuccessValidSenderID) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
+  ASSERT_EQ("ok - service worker registered", script_result);
+
+  ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
+
+  ASSERT_TRUE(
+      RunScript("documentSubscribePushValidSenderId()", &script_result));
+
+  // Subscriptions with a sender ID instead of a VAPID key should be given the
+  // non-VAPID endpoint, even if the sender ID was passed to the subscribe
+  // call.
+  ASSERT_NO_FATAL_FAILURE(EndpointToToken(script_result, false));
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeFailureLongKey) {

[Peter Beverloo, 2016/10/11 15:10:41]

The following three tests should be layout tests.

In general, we use layout tests for all Web Exposed behaviour unless we
really can't, for example because it's depending on mocked behaviour.

That's not the case here -- the exception is thrown by Blink, and can be
observed by layout tests directly.

[harkness, 2016/10/14 13:53:55]

Done.

+  std::string script_result;
+
+  ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
+  ASSERT_EQ("ok - service worker registered", script_result);
+
+  ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
+
+  ASSERT_TRUE(RunScript("documentSubscribePushLongKey()", &script_result));
+  EXPECT_EQ(
+      "InvalidAccessError - Failed to execute 'subscribe' on 'PushManager': "
+      "The provided applicationServerKey is not valid.",
+      script_result);
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeFailureShortKey) {
+  std::string script_result;
+
+  ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
+  ASSERT_EQ("ok - service worker registered", script_result);
+
+  ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
+
+  ASSERT_TRUE(RunScript("documentSubscribePushShortKey()", &script_result));
+  EXPECT_EQ(
+      "InvalidAccessError - Failed to execute 'subscribe' on 'PushManager': "
+      "The provided applicationServerKey is not valid.",
+      script_result);
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
+                       SubscribeFailureNonNumericKey) {
+  std::string script_result;
+
+  ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
   ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
 
-  ASSERT_TRUE(RunScript("documentSubscribePushBadKey()", &script_result));
+  ASSERT_TRUE(
+      RunScript("documentSubscribePushNonNumericKey()", &script_result));
   EXPECT_EQ(
       "InvalidAccessError - Failed to execute 'subscribe' on 'PushManager': "
       "The provided applicationServerKey is not valid.",
       script_result);
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
                        SubscribeFailureNotificationsBlocked) {
   std::string script_result;
 
@@ skipping 1415 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SubscribeSuccessfully());
   ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive());
 
   // After dropping the last subscription background mode is still inactive.
   std::string script_result;
   ASSERT_TRUE(RunScript("unsubscribePush()", &script_result));
   EXPECT_EQ("unsubscribe result: true", script_result);
   ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive());
 }
 #endif  // BUILDFLAG(ENABLE_BACKGROUND) && !defined(OS_CHROMEOS)