Add test to ensure that URLs that redirect inside the PDF plugin fail to load

pdf/document_loader.cc

 // Copyright (c) 2010 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 "pdf/document_loader.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "net/http/http_util.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/url_loader.h"
 #include "ppapi/cpp/url_request_info.h"
 #include "ppapi/cpp/url_response_info.h"
 
 namespace chrome_pdf {
 
 namespace {
 
+// Return true if the HTTP response of |loader| is a succesful one and loading

[Lei Zhang, 2016/11/03 07:10:45]

typo

[raymes, 2016/11/07 03:25:44]

Done.

+// should continue. 4xx error indicate subsequent requests will fail too.
+// e.g. resource has been removed from the server while loading it. 301
+// indicates a redirect was returned which won't be successful because we
+// disable following redirects for PDF loading (we assume they are already
+// resolved by the browser.
+bool ResponseStatusSuccess(const pp::URLLoader& loader) {
+  int32_t http_code = loader.GetResponseInfo().GetStatusCode();
+  if ((http_code >= 400 && http_code < 500) || http_code == 301)

[Lei Zhang, 2016/11/03 07:10:45]

Just: return (http_code < 400 && http_code != 301) || http_code >= 500;
Or: keep the logic and change the method to ResponseStatusFailed().

[raymes, 2016/11/07 03:25:44]

Done.

+    return false;
+
+  return true;
+}
+
 // If the headers have a byte-range response, writes the start and end
 // positions and returns true if at least the start position was parsed.
 // The end position will be set to 0 if it was not found or parsed from the
 // response.
 // Returns false if not even a start position could be parsed.
 bool GetByteRange(const std::string& headers, uint32_t* start, uint32_t* end) {
   net::HttpUtil::HeadersIterator it(headers.begin(), headers.end(), "\n");
   while (it.GetNext()) {
     if (base::LowerCaseEqualsASCII(it.name(), "content-range")) {
       std::string range = it.values().c_str();
@@ skipping 63 matching lines @@
 DocumentLoader::~DocumentLoader() {
 }
 
 bool DocumentLoader::Init(const pp::URLLoader& loader,
                           const std::string& url,
                           const std::string& headers) {
   DCHECK(url_.empty());
   url_ = url;
   loader_ = loader;
 
+  // Check that the initial response status is a valid one.
+  if (!ResponseStatusSuccess(loader_))
+    return false;
+
   std::string response_headers;
   if (!headers.empty()) {
     response_headers = headers;
   } else {
     pp::URLResponseInfo response = loader_.GetResponseInfo();
     pp::Var headers_var = response.GetHeaders();
 
     if (headers_var.is_string()) {
       response_headers = headers_var.AsString();
     }
@@ skipping 236 matching lines @@
 
   return request;
 }
 
 void DocumentLoader::DidOpen(int32_t result) {
   if (result != PP_OK) {
     NOTREACHED();
     return;
   }
 
-  int32_t http_code = loader_.GetResponseInfo().GetStatusCode();
-  if (http_code >= 400 && http_code < 500) {
-    // Error accessing resource. 4xx error indicate subsequent requests
-    // will fail too.
-    // E.g. resource has been removed from the server while loading it.
-    // https://code.google.com/p/chromium/issues/detail?id=414827
+  if (!ResponseStatusSuccess(loader_)) {
+    client_->DocumentLoadFailed();
     return;
   }
 
   is_multipart_ = false;
   current_chunk_size_ = 0;
   current_chunk_read_ = 0;
 
   pp::Var headers_var = loader_.GetResponseInfo().GetHeaders();
   std::string headers;
   if (headers_var.is_string())
@@ skipping 160 matching lines @@
 
 void DocumentLoader::UpdateRendering() {
   if (header_request_)
     client_->OnPartialDocumentLoaded();
   else
     client_->OnPendingRequestComplete();
   header_request_ = false;
 }
 
 }  // namespace chrome_pdf