Service Worker: Obey content settings when deciding to control a page

content/browser/service_worker/service_worker_controllee_request_handler.cc

Index: content/browser/service_worker/service_worker_controllee_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
index 82470e1af9fd9352f252fd5b42a29e34205c48c6..df938fc74810e05d8d1843b6dbf367403300e472 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -13,6 +13,8 @@
 #include "content/browser/service_worker/service_worker_utils.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
+#include "content/public/browser/content_browser_client.h"
+#include "content/public/common/content_client.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request.h"
@@ -60,7 +62,8 @@ ServiceWorkerControlleeRequestHandler::
 
 net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
     net::URLRequest* request,
-    net::NetworkDelegate* network_delegate) {
+    net::NetworkDelegate* network_delegate,
+    ResourceContext* resource_context) {
   if (!context_ || !provider_host_) {
     // We can't do anything other than to fall back to network.
     job_ = NULL;
@@ -93,6 +96,8 @@ net::URLRequestJob* ServiceWorkerControlleeRequestHandler::MaybeCreateJob(
                                         request_context_type_,
                                         frame_type_,
                                         body_);
+  resource_context_ = resource_context;
+
   if (is_main_resource_load_)
     PrepareForMainResource(request);
   else
@@ -175,6 +180,19 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
   }
   DCHECK(registration.get());
 
+  if (!GetContentClient()->browser()->AllowServiceWorker(
+          registration->pattern(),
+          provider_host_->topmost_frame_url(),
+          resource_context_)) {
+    job_->FallbackToNetwork();
+    TRACE_EVENT_ASYNC_END1(
+        "ServiceWorker",
+        "ServiceWorkerControlleeRequestHandler::PrepareForMainResource",
+        job_.get(),
+        "Status", status);

[michaeln, 2014/10/10 22:26:31]

I wonder if it makes sense to call host->SetAllowAssociation(false) here too and
leave it set that way for the duration, so later registration jobs won't be able
to graft a registration to this doc?

[falken, 2014/10/15 04:39:37]

Hmm, good question. But if AllowServiceWorker is on when register() is called,
it seems reasonable to let it associate with the doc?

Anyway the scenario seems unlikely: AllowServiceWorker would have to flip
between here and when register() is called (or register was already called and
queued up the job, then AllowServiceWorker flipped false, then the page load
starts, then the job runs). And this all happens before page load finishes.

Also the job only associates when it creates a new registration, which it
shouldn't since there's an existing one at this point.

[michaeln1, 2014/10/15 19:33:05]

Right, it doesn't make sense to do that.

+    return;
+  }
+
   // Initiate activation of a waiting version.
   // Usually a register job initiates activation but that
   // doesn't happen if the browser exits prior to activation