ServiceWorker: Make browser-side check stricter for non-HTTP(s) schemes

content/browser/service_worker/service_worker_dispatcher_host_unittest.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 "content/browser/service_worker/service_worker_dispatcher_host.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
@@ skipping 194 matching lines @@
            ServiceWorkerMsg_ServiceWorkerRegistered::ID);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Register_InvalidScopeShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
-  SendRegister(
-      kProviderId, GURL(""), GURL("https://www.example.com/bar/hoge.js"));
+  SendRegister(kProviderId, GURL(""),
+               GURL("https://www.example.com/bar/hoge.js"));
   EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Register_InvalidScriptShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
   SendRegister(kProviderId, GURL("https://www.example.com/bar/"), GURL(""));
   EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Register_NonSecureOriginShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("http://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
-  Register(kProviderId,
-           GURL("http://www.example.com/"),
-           GURL("http://www.example.com/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("http://www.example.com/"),
+               GURL("http://www.example.com/bar"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Register_CrossOriginShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
   // Script has a different host
-  Register(kProviderId,
-           GURL("https://www.example.com/"),
-           GURL("https://foo.example.com/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("https://www.example.com/"),
+               GURL("https://foo.example.com/bar"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 
   // Scope has a different host
-  Register(kProviderId,
-           GURL("https://foo.example.com/"),
-           GURL("https://www.example.com/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("https://foo.example.com/"),
+               GURL("https://www.example.com/bar"));
+  EXPECT_EQ(2, dispatcher_host_->bad_messages_received_count_);
 
   // Script has a different port
-  Register(kProviderId,
-           GURL("https://www.example.com/"),
-           GURL("https://www.example.com:8080/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("https://www.example.com/"),
+               GURL("https://www.example.com:8080/bar"));
+  EXPECT_EQ(3, dispatcher_host_->bad_messages_received_count_);
 
   // Scope has a different transport
-  Register(kProviderId,
-           GURL("wss://www.example.com/"),
-           GURL("https://www.example.com/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("wss://www.example.com/"),
+               GURL("https://www.example.com/bar"));
+  EXPECT_EQ(4, dispatcher_host_->bad_messages_received_count_);
 
   // Script and scope have a different host but match each other
-  Register(kProviderId,
-           GURL("https://foo.example.com/"),
-           GURL("https://foo.example.com/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("https://foo.example.com/"),
+               GURL("https://foo.example.com/bar"));
+  EXPECT_EQ(5, dispatcher_host_->bad_messages_received_count_);
 
   // Script and scope URLs are invalid
   SendRegister(kProviderId,
                GURL(),
                GURL("h@ttps://@"));
-  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
+  EXPECT_EQ(6, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest,
        Register_FileSystemDocumentShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("filesystem:https://www.example.com/temporary/a"));
   context()->AddProviderHost(host.Pass());
 
-  Register(kProviderId,
-           GURL("filesystem:https://www.example.com/temporary/"),
-           GURL("https://www.example.com/temporary/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("filesystem:https://www.example.com/temporary/"),
+               GURL("https://www.example.com/temporary/bar"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 
-  Register(kProviderId,
-           GURL("https://www.example.com/temporary/"),
-           GURL("filesystem:https://www.example.com/temporary/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("https://www.example.com/temporary/"),
+               GURL("filesystem:https://www.example.com/temporary/bar"));
+  EXPECT_EQ(2, dispatcher_host_->bad_messages_received_count_);
 
-  Register(kProviderId,
-           GURL("filesystem:https://www.example.com/temporary/"),
-           GURL("filesystem:https://www.example.com/temporary/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("filesystem:https://www.example.com/temporary/"),
+               GURL("filesystem:https://www.example.com/temporary/bar"));
+  EXPECT_EQ(3, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest,
        Register_FileSystemScriptOrScopeShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/temporary/"));
   context()->AddProviderHost(host.Pass());
 
-  Register(kProviderId,
-           GURL("filesystem:https://www.example.com/temporary/"),
-           GURL("https://www.example.com/temporary/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("filesystem:https://www.example.com/temporary/"),
+               GURL("https://www.example.com/temporary/bar"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 
-  Register(kProviderId,
-           GURL("https://www.example.com/temporary/"),
-           GURL("filesystem:https://www.example.com/temporary/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("https://www.example.com/temporary/"),
+               GURL("filesystem:https://www.example.com/temporary/bar"));
+  EXPECT_EQ(2, dispatcher_host_->bad_messages_received_count_);
 
-  Register(kProviderId,
-           GURL("filesystem:https://www.example.com/temporary/"),
-           GURL("filesystem:https://www.example.com/temporary/bar"),
-           ServiceWorkerMsg_ServiceWorkerRegistrationError::ID);
+  SendRegister(kProviderId,
+               GURL("filesystem:https://www.example.com/temporary/"),
+               GURL("filesystem:https://www.example.com/temporary/bar"));
+  EXPECT_EQ(3, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Unregister_HTTPS) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
   Unregister(kProviderId,
              GURL("https://www.example.com/"),
              ServiceWorkerMsg_ServiceWorkerUnregistered::ID);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest,
-       Unregister_NonSecureTransportLocalhost) {
+       Unregister_NotSecureTransportLocalhost) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("http://localhost/foo"));
   context()->AddProviderHost(host.Pass());
 
   Unregister(kProviderId,
              GURL("http://localhost/"),
              ServiceWorkerMsg_ServiceWorkerUnregistered::ID);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Unregister_CrossOriginShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
-  Unregister(kProviderId,
-             GURL("https://foo.example.com/"),
-             ServiceWorkerMsg_ServiceWorkerUnregistrationError::ID);
+  SendUnregister(kProviderId, GURL("https://foo.example.com/"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Unregister_InvalidScopeShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
   SendUnregister(kProviderId, GURL(""));
   EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, Unregister_NonSecureOriginShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("http://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
-  Unregister(kProviderId,
-             GURL("http://www.example.com/"),
-             ServiceWorkerMsg_ServiceWorkerUnregistrationError::ID);
+  SendUnregister(kProviderId, GURL("http://www.example.com/"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, EarlyContextDeletion) {
   helper_->ShutdownContext();
 
   // Let the shutdown reach the simulated IO thread.
   base::RunLoop().RunUntilIdle();
 
   Register(-1,
            GURL(),
@@ skipping 44 matching lines @@
                   ServiceWorkerMsg_DidGetRegistration::ID);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, GetRegistration_CrossOriginShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
-  GetRegistration(kProviderId,
-                  GURL("https://foo.example.com/"),
-                  ServiceWorkerMsg_ServiceWorkerGetRegistrationError::ID);
+  SendGetRegistration(kProviderId, GURL("https://foo.example.com/"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest,
        GetRegistration_InvalidScopeShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("https://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
   SendGetRegistration(kProviderId, GURL(""));
   EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest,
-       GetRegistration_NotSecureOriginShouldFail) {
+       GetRegistration_NonSecureOriginShouldFail) {
   const int64 kProviderId = 99;  // Dummy value
   scoped_ptr<ServiceWorkerProviderHost> host(
       CreateServiceWorkerProviderHost(kProviderId));
   host->SetDocumentUrl(GURL("http://www.example.com/foo"));
   context()->AddProviderHost(host.Pass());
 
-  GetRegistration(kProviderId,
-                  GURL("http://www.example.com/"),
-                  ServiceWorkerMsg_ServiceWorkerGetRegistrationError::ID);
+  SendGetRegistration(kProviderId, GURL("http://www.example.com/"));
+  EXPECT_EQ(1, dispatcher_host_->bad_messages_received_count_);
 }
 
 TEST_F(ServiceWorkerDispatcherHostTest, GetRegistration_EarlyContextDeletion) {
   helper_->ShutdownContext();
 
   // Let the shutdown reach the simulated IO thread.
   base::RunLoop().RunUntilIdle();
 
   GetRegistration(-1,
                   GURL(),
@@ skipping 48 matching lines @@
 
   // To show the new dispatcher can operate, simulate provider creation. Since
   // the old dispatcher cleaned up the old provider host, the new one won't
   // complain.
   new_dispatcher_host->OnMessageReceived(
       ServiceWorkerHostMsg_ProviderCreated(kProviderId, MSG_ROUTING_NONE));
   EXPECT_EQ(0, new_dispatcher_host->bad_messages_received_count_);
 }
 
 }  // namespace content