Move Service Worker %2f path validation logic from browser into Blink (1)

content/child/service_worker/web_service_worker_provider_impl.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/child/service_worker/web_service_worker_provider_impl.h"
 
 #include "content/child/service_worker/service_worker_dispatcher.h"
 #include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/web_service_worker_impl.h"
 #include "content/child/thread_safe_sender.h"
+#include "content/common/service_worker/service_worker_utils.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerProviderClient.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 using blink::WebURL;
 
 namespace content {
 
 WebServiceWorkerProviderImpl::WebServiceWorkerProviderImpl(
     ThreadSafeSender* thread_safe_sender,
     ServiceWorkerProviderContext* context)
@@ skipping 47 matching lines @@
     WebServiceWorkerGetRegistrationsCallbacks* callbacks) {
   GetDispatcher()->GetRegistrations(
       context_->provider_id(), callbacks);
 }
 
 void WebServiceWorkerProviderImpl::getRegistrationForReady(
     WebServiceWorkerGetRegistrationForReadyCallbacks* callbacks) {
   GetDispatcher()->GetRegistrationForReady(context_->provider_id(), callbacks);
 }
 
+bool WebServiceWorkerProviderImpl::validateScopeAndScriptURL(
+    const blink::WebURL& scope,
+    const blink::WebURL& script_url,
+    blink::WebString* error_message) {
+  std::string error;
+  bool has_error = ServiceWorkerUtils::ContainsDisallowedCharacter(
+      scope, script_url, &error);
+  if (has_error)
+    *error_message =
+        blink::WebString::fromUTF8(kServiceWorkerRegisterErrorPrefix + error);

[falken, 2015/08/03 03:56:32]

There's some discussion on the Blink patch about this. I agree with nhiroki that
kServiceWorkerRegisterErrorPrefix probably shouldn't be here since this function
could conceivably be used outside of registration.

nit: I like braces for multiline body

+  return !has_error;
+}
+
 int WebServiceWorkerProviderImpl::provider_id() const {
   return context_->provider_id();
 }
 
 void WebServiceWorkerProviderImpl::RemoveProviderClient() {
   // Remove the provider client, but only if the dispatcher is still there.
   // (For cleanup path we don't need to bother creating a new dispatcher)
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   if (dispatcher)
     dispatcher->RemoveProviderClient(context_->provider_id());
 }
 
 ServiceWorkerDispatcher* WebServiceWorkerProviderImpl::GetDispatcher() {
   return ServiceWorkerDispatcher::GetThreadSpecificInstance();
 }
 
 }  // namespace content