Correctly whitelist ftp directory listings.

webkit/glue/ftp_directory_listing_response_delegate.cc

 // Copyright (c) 2011 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 "webkit/glue/ftp_directory_listing_response_delegate.h"
 
 #include <vector>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/ftp/ftp_directory_listing_parser.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
+#include "webkit/glue/weburlresponse_extradata_impl.h"
 
 using net::FtpDirectoryListingEntry;
 
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderClient;
 using WebKit::WebURLResponse;
 
 namespace {
 
 string16 ConvertPathToUTF16(const std::string& path) {
@@ skipping 21 matching lines @@
 }  // namespace
 
 namespace webkit_glue {
 
 FtpDirectoryListingResponseDelegate::FtpDirectoryListingResponseDelegate(
     WebURLLoaderClient* client,
     WebURLLoader* loader,
     const WebURLResponse& response)
     : client_(client),
       loader_(loader) {
+  if (response.extraData()) {
+    // extraData can be NULL during tests.
+    WebURLResponseExtraDataImpl* extra_data =
+        static_cast<WebURLResponseExtraDataImpl*>(response.extraData());
+    extra_data->set_is_ftp_directory_listing(true);
+  }
   Init(response.url());
 }
 
 void FtpDirectoryListingResponseDelegate::OnReceivedData(const char* data,
                                                          int data_len) {
   buffer_.append(data, data_len);
 }
 
 void FtpDirectoryListingResponseDelegate::OnCompletedRequest() {
   std::vector<FtpDirectoryListingEntry> entries;
@@ skipping 34 matching lines @@
         ASCIIToUTF16(".."), std::string(), false, 0, base::Time()));
   }
 }
 
 void FtpDirectoryListingResponseDelegate::SendDataToClient(
     const std::string& data) {
   client_->didReceiveData(loader_, data.data(), data.length(), -1);
 }
 
 }  // namespace webkit_glue