Implement meta referrer (part 1/2)

webkit/glue/weburlloader_impl.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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoadTiming.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "webkit/glue/ftp_directory_listing_response_delegate.h"
 #include "webkit/glue/multipart_response_delegate.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/weburlrequest_extradata_impl.h"
 
 using base::Time;
 using base::TimeDelta;
 using WebKit::WebData;
 using WebKit::WebHTTPBody;
 using WebKit::WebHTTPHeaderVisitor;
 using WebKit::WebHTTPLoadInfo;
+using WebKit::WebReferrerPolicy;
 using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLLoadTiming;
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderClient;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 
@@ skipping 234 matching lines @@
   friend class base::RefCounted<Context>;
   ~Context() {}
 
   // We can optimize the handling of data URLs in most cases.
   bool CanHandleDataURL(const GURL& url) const;
   void HandleDataURL();
 
   WebURLLoaderImpl* loader_;
   WebURLRequest request_;
   WebURLLoaderClient* client_;
+  WebReferrerPolicy referrer_policy_;
   scoped_ptr<ResourceLoaderBridge> bridge_;
   scoped_ptr<FtpDirectoryListingResponseDelegate> ftp_listing_delegate_;
   scoped_ptr<MultipartResponseDelegate> multipart_delegate_;
   scoped_ptr<ResourceLoaderBridge> completed_bridge_;
 };
 
 WebURLLoaderImpl::Context::Context(WebURLLoaderImpl* loader)
     : loader_(loader),
-      client_(NULL) {
+      client_(NULL),
+      referrer_policy_(WebKit::WebReferrerPolicyDefault) {
 }
 
 void WebURLLoaderImpl::Context::Cancel() {
   // The bridge will still send OnCompletedRequest, which will Release() us, so
   // we don't do that here.
   if (bridge_.get())
     bridge_->Cancel();
 
   // Ensure that we do not notify the multipart delegate anymore as it has
   // its own pointer to the client.
@@ skipping 93 matching lines @@
   request_info.requestor_pid = request.requestorProcessID();
   request_info.request_type =
       ResourceType::FromTargetType(request.targetType());
   request_info.appcache_host_id = request.appCacheHostID();
   request_info.routing_id = request.requestorID();
   request_info.download_to_file = request.downloadToFile();
   request_info.has_user_gesture = request.hasUserGesture();
   request_info.extra_data = request.extraData();
   bridge_.reset(ResourceLoaderBridge::Create(request_info));
 
+  referrer_policy_ = static_cast<WebURLRequestExtraDataImpl*>(

[darin (slow to review), 2011/11/21 22:44:37]

should you null check request.extraData() here?  outside the context of
RenderViewImpl, it seems like WebURLLoaderImpl could be used in contexts where
setExtraData has not been called.  maybe that explains some of the try bot test
failures?

[jochen (gone - plz use gerrit), 2011/11/22 10:38:28]

I've added both the null check, and code to the test shell to set the extra data

+      request.extraData())->referrer_policy();
+
   if (!request.httpBody().isNull()) {
     // GET and HEAD requests shouldn't have http bodies.
     DCHECK(method != "GET" && method != "HEAD");
     const WebHTTPBody& httpBody = request.httpBody();
     size_t i = 0;
     WebHTTPBody::Element element;
     while (httpBody.elementAt(i++, element)) {
       switch (element.type) {
         case WebHTTPBody::Element::TypeData:
           if (!element.data.isEmpty()) {
@@ skipping 54 matching lines @@
   response.initialize();
   PopulateURLResponse(request_.url(), info, &response);
 
   // TODO(darin): We lack sufficient information to construct the actual
   // request that resulted from the redirect.
   WebURLRequest new_request(new_url);
   new_request.setFirstPartyForCookies(request_.firstPartyForCookies());
   new_request.setDownloadToFile(request_.downloadToFile());
 
   WebString referrer_string = WebString::fromUTF8("Referer");
-  WebString referrer = request_.httpHeaderField(referrer_string);
-  if (!WebSecurityPolicy::shouldHideReferrer(new_url, referrer))
+  WebString referrer = WebSecurityPolicy::generateReferrerHeader(
+      referrer_policy_,
+      new_url,
+      request_.httpHeaderField(referrer_string));
+  if (!referrer.isEmpty())
     new_request.setHTTPHeaderField(referrer_string, referrer);
 
   if (response.httpStatusCode() == 307)
     new_request.setHTTPMethod(request_.httpMethod());
 
   client_->willSendRequest(loader_, new_request, response);
   request_ = new_request;
   *has_new_first_party_for_cookies = true;
   *new_first_party_for_cookies = request_.firstPartyForCookies();
 
@@ skipping 232 matching lines @@
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 void WebURLLoaderImpl::UpdateRoutingId(int new_routing_id) {
   context_->UpdateRoutingId(new_routing_id);
 }
 
 }  // namespace webkit_glue