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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/service_worker/service_worker_dispatcher_host_unittest.cc

Issue 906453002: ServiceWorker: Make browser-side check stricter for non-HTTP(s) schemes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/browser/service_worker/service_worker_dispatcher_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
diff --git a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
index 040761e451c66a3ff44c8c0995032b448b534695..8931290ea6e9765a5e80f61c9601fbdadd8df0dc 100644
--- a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
+++ b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc
@@ -212,8 +212,8 @@ TEST_F(ServiceWorkerDispatcherHostTest, Register_InvalidScopeShouldFail) {
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_);
}
@@ -235,10 +235,10 @@ TEST_F(ServiceWorkerDispatcherHostTest, Register_NonSecureOriginShouldFail) {
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) {
@@ -249,40 +249,40 @@ TEST_F(ServiceWorkerDispatcherHostTest, Register_CrossOriginShouldFail) {
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,
@@ -293,20 +293,20 @@ TEST_F(ServiceWorkerDispatcherHostTest,
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,
@@ -317,20 +317,20 @@ TEST_F(ServiceWorkerDispatcherHostTest,
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) {
@@ -346,7 +346,7 @@ TEST_F(ServiceWorkerDispatcherHostTest, Unregister_HTTPS) {
}
TEST_F(ServiceWorkerDispatcherHostTest,
- Unregister_NonSecureTransportLocalhost) {
+ Unregister_NotSecureTransportLocalhost) {
const int64 kProviderId = 99; // Dummy value
scoped_ptr<ServiceWorkerProviderHost> host(
CreateServiceWorkerProviderHost(kProviderId));
@@ -365,9 +365,8 @@ TEST_F(ServiceWorkerDispatcherHostTest, Unregister_CrossOriginShouldFail) {
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) {
@@ -388,9 +387,8 @@ TEST_F(ServiceWorkerDispatcherHostTest, Unregister_NonSecureOriginShouldFail) {
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) {
@@ -455,9 +453,8 @@ TEST_F(ServiceWorkerDispatcherHostTest, GetRegistration_CrossOriginShouldFail) {
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,
@@ -473,16 +470,15 @@ TEST_F(ServiceWorkerDispatcherHostTest,
}
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) {
« no previous file with comments | « content/browser/service_worker/service_worker_dispatcher_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698