[ServiceWorker] Introduce the new security restriction of redirected response.

third_party/WebKit/Source/modules/serviceworkers/FetchRespondWithObserver.cpp

 // Copyright 2014 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 "modules/serviceworkers/FetchRespondWithObserver.h"
 
 #include <v8.h>
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/modules/v8/V8Response.h"
@@ skipping 81 matching lines @@
                      "redirect mode is not \"follow\".";
       break;
     case WebServiceWorkerResponseErrorUnknown:
     default:
       errorMessage = errorMessage + "an unexpected error occurred.";
       break;
   }
   return errorMessage;
 }
 
-const String getErrorMessageForRedirectedResponseForNavigationRequest(
-    const KURL& requestURL,
-    const Vector<KURL>& responseURLList) {
-  String errorMessage =
-      "In Chrome 59, the navigation to \"" + requestURL.getString() + "\" " +
-      "will result in a network error, because FetchEvent.respondWith() was " +
-      "called with a redirected response. See https://crbug.com/658249. The " +
-      "url list of the response was: [\"" + responseURLList[0].getString() +
-      "\"";
-  for (size_t i = 1; i < responseURLList.size(); ++i) {
-    errorMessage =
-        errorMessage + ", \"" + responseURLList[i].getString() + "\"";
-  }
-  return errorMessage + "]";
-}
-
 bool isNavigationRequest(WebURLRequest::FrameType frameType) {
   return frameType != WebURLRequest::FrameTypeNone;
 }
 
 bool isClientRequest(WebURLRequest::FrameType frameType,
                      WebURLRequest::RequestContext requestContext) {
   return isNavigationRequest(frameType) ||
          requestContext == WebURLRequest::RequestContextSharedWorker ||
          requestContext == WebURLRequest::RequestContextWorker;
 }
@@ skipping 78 matching lines @@
       return;
     }
   }
   if (m_redirectMode != WebURLRequest::FetchRedirectModeManual &&
       responseType == FetchResponseData::OpaqueRedirectType) {
     onResponseRejected(WebServiceWorkerResponseErrorResponseTypeOpaqueRedirect);
     return;
   }
   if (m_redirectMode != WebURLRequest::FetchRedirectModeFollow &&
       response->redirected()) {
-    if (!isNavigationRequest(m_frameType)) {
-      onResponseRejected(
-          WebServiceWorkerResponseErrorRedirectedResponseForNotFollowRequest);
-      return;
-    }
-    // TODO(horo): We should just reject even if the request was a navigation.
-    // Currently we measure the impact of the restriction with the use counter
-    // in DocumentLoader.
-    getExecutionContext()->addConsoleMessage(ConsoleMessage::create(
-        JSMessageSource, ErrorMessageLevel,
-        getErrorMessageForRedirectedResponseForNavigationRequest(
-            m_requestURL, response->internalURLList())));
+    onResponseRejected(
+        WebServiceWorkerResponseErrorRedirectedResponseForNotFollowRequest);
+    return;
   }
   if (response->isBodyLocked()) {
     onResponseRejected(WebServiceWorkerResponseErrorBodyLocked);
     return;
   }
   if (response->bodyUsed()) {
     onResponseRejected(WebServiceWorkerResponseErrorBodyUsed);
     return;
   }
 
@@ skipping 35 matching lines @@
       m_requestMode(requestMode),
       m_redirectMode(redirectMode),
       m_frameType(frameType),
       m_requestContext(requestContext) {}
 
 DEFINE_TRACE(FetchRespondWithObserver) {
   RespondWithObserver::trace(visitor);
 }
 
 }  // namespace blink