Change WebURLLoaderClient::willFollowRedirect() API to return bool

third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 104 matching lines @@
   if (m_loader)
     m_loader->didChangePriority(
         static_cast<WebURLRequest::Priority>(loadPriority), intraPriorityValue);
 }
 
 void ResourceLoader::cancel() {
   didFail(nullptr, ResourceError::cancelledError(
                        m_resource->lastResourceRequest().url()));
 }
 
-void ResourceLoader::willFollowRedirect(
+void ResourceLoader::cancelForRedirectAccessCheckError(const KURL& newURL) {
+  m_resource->willNotFollowRedirect();
+
+  if (m_loader)
+    didFail(nullptr, ResourceError::cancelledDueToAccessCheckError(newURL));
+}
+
+bool ResourceLoader::willFollowRedirect(
     WebURLLoader*,
     WebURLRequest& passedNewRequest,
     const WebURLResponse& passedRedirectResponse) {
   DCHECK(!passedNewRequest.isNull());
   DCHECK(!passedRedirectResponse.isNull());
 
   ResourceRequest& newRequest(passedNewRequest.toMutableResourceRequest());
   const ResourceResponse& redirectResponse(
       passedRedirectResponse.toResourceResponse());
   newRequest.setRedirectStatus(
       ResourceRequest::RedirectStatus::FollowedRedirect);
 
-  if (m_fetcher->willFollowRedirect(m_resource.get(), newRequest,
-                                    redirectResponse)) {
-    m_resource->willFollowRedirect(newRequest, redirectResponse);
-  } else {
-    m_resource->willNotFollowRedirect();
-    if (m_loader)
-      didFail(nullptr,
-              ResourceError::cancelledDueToAccessCheckError(newRequest.url()));
+  const KURL originalURL = newRequest.url();
+
+  if (!m_fetcher->willFollowRedirect(m_resource.get(), newRequest,
+                                     redirectResponse)) {
+    cancelForRedirectAccessCheckError(newRequest.url());
+    return false;
   }
+
+  // ResourceFetcher::willFollowRedirect() may rewrite the URL to
+  // something else not for rejecting redirect but for other reasons.
+  // E.g. WebFrameTestClient::willSendRequest() and
+  // RenderFrameImpl::willSendRequest(). We should reflect the
+  // rewriting but currently we cannot. So, return false to make the
+  // redirect fail.
+  if (newRequest.url() != originalURL) {
+    cancelForRedirectAccessCheckError(newRequest.url());
+    return false;
+  }
+
+  if (!m_resource->willFollowRedirect(newRequest, redirectResponse)) {
+    cancelForRedirectAccessCheckError(newRequest.url());
+    return false;
+  }
+
+  return true;
 }
 
 void ResourceLoader::didReceiveCachedMetadata(WebURLLoader*,
                                               const char* data,
                                               int length) {
   m_resource->setSerializedCachedMetadata(data, length);
 }
 
 void ResourceLoader::didSendData(WebURLLoader*,
                                  unsigned long long bytesSent,
@@ skipping 78 matching lines @@
   // a 304, where it will overwrite the cached data we should be reusing.
   if (dataOut.size()) {
     m_fetcher->didReceiveData(m_resource.get(), dataOut.data(), dataOut.size(),
                               encodedDataLength);
     m_resource->setResourceBuffer(dataOut);
   }
   didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength);
 }
 
 }  // namespace blink