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

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

Issue 26442004: Service worker registration error support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-fix tests Created 7 years, 1 month 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
Index: content/browser/service_worker/service_worker_dispatcher_host.cc
diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc
index 7bea336a5775cda47e91b483f420921ed5f16748..b93f8a9440b30cf5cd818b176fb08bf03bde2ba6 100644
--- a/content/browser/service_worker/service_worker_dispatcher_host.cc
+++ b/content/browser/service_worker/service_worker_dispatcher_host.cc
@@ -4,11 +4,15 @@
#include "content/browser/service_worker/service_worker_dispatcher_host.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/browser/service_worker/service_worker_context.h"
#include "content/common/service_worker_messages.h"
#include "ipc/ipc_message_macros.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerError.h"
#include "url/gurl.h"
+using WebKit::WebServiceWorkerError;
+
namespace content {
ServiceWorkerDispatcherHost::ServiceWorkerDispatcherHost(
@@ -17,6 +21,11 @@ ServiceWorkerDispatcherHost::ServiceWorkerDispatcherHost(
ServiceWorkerDispatcherHost::~ServiceWorkerDispatcherHost() {}
+namespace {
+const char kDomainMismatchErrorMessage[] =
+ "Scope and scripts do not have the same origin";
+}
+
bool ServiceWorkerDispatcherHost::OnMessageReceived(const IPC::Message& message,
bool* message_was_ok) {
if (IPC_MESSAGE_CLASS(message) != ServiceWorkerMsgStart)
@@ -47,13 +56,26 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
int32 request_id,
const GURL& scope,
const GURL& script_url) {
- // TODO(alecflett): add a ServiceWorker-specific policy query in
- // ChildProcessSecurityImpl. See http://crbug.com/311631.
+ if (!context_->IsEnabled()) {
+ Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
+ thread_id,
+ request_id,
+ WebKit::WebServiceWorkerError::DisabledError,
+ ASCIIToUTF16("ServiceWorker is disabled")));
+ return;
+ }
- // TODO(alecflett): Throw an error for origin mismatch, rather than
- // just returning.
- if (scope.GetOrigin() != script_url.GetOrigin())
+ // TODO(alecflett): This check is insufficient for release. Add a
+ // ServiceWorker-specific policy query in
+ // ChildProcessSecurityImpl. See http://crbug.com/311631.
+ if (scope.GetOrigin() != script_url.GetOrigin()) {
+ Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
+ thread_id,
+ request_id,
+ WebKit::WebServiceWorkerError::SecurityError,
+ ASCIIToUTF16(kDomainMismatchErrorMessage)));
return;
+ }
Send(new ServiceWorkerMsg_ServiceWorkerRegistered(
thread_id, request_id, NextWorkerId()));
@@ -62,8 +84,17 @@ void ServiceWorkerDispatcherHost::OnRegisterServiceWorker(
void ServiceWorkerDispatcherHost::OnUnregisterServiceWorker(int32 thread_id,
int32 request_id,
const GURL& scope) {
- // TODO(alecflett): add a ServiceWorker-specific policy query in
+ // TODO(alecflett): This check is insufficient for release. Add a
+ // ServiceWorker-specific policy query in
// ChildProcessSecurityImpl. See http://crbug.com/311631.
+ if (!context_->IsEnabled()) {
+ Send(new ServiceWorkerMsg_ServiceWorkerRegistrationError(
+ thread_id,
+ request_id,
+ WebServiceWorkerError::DisabledError,
+ ASCIIToUTF16("ServiceWorker is disabled")));
+ return;
+ }
Send(new ServiceWorkerMsg_ServiceWorkerUnregistered(thread_id, request_id));
}

Powered by Google App Engine
This is Rietveld 408576698