Forwarding POST body into renderer after a cross-site transfer.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 528 matching lines @@
           common_params.report_type));
   return request;
 }
 
 // Converts the HTTP body data stored in ResourceRequestBody format to a
 // WebHTTPBody, which is then added to the WebURLRequest.
 // PlzNavigate: used to add the POST data sent by the renderer at commit time
 // to the WebURLRequest used to commit the navigation. This ensures that the
 // POST data will be in the PageState sent to the browser on commit.
 void AddHTTPBodyToRequest(WebURLRequest* request,
-                          scoped_refptr<ResourceRequestBody> body) {
+                          const scoped_refptr<ResourceRequestBody>& body) {
   WebHTTPBody http_body;
   http_body.initialize();
   http_body.setIdentifier(body->identifier());
   for (const ResourceRequestBody::Element& element : *(body->elements())) {
     long long length = -1;
     switch (element.type()) {
       case storage::DataElement::TYPE_BYTES:
         http_body.appendData(WebData(element.bytes(), element.length()));
         break;
       case storage::DataElement::TYPE_FILE:
@@ skipping 4703 matching lines @@
   }
 
   Send(new FrameHostMsg_OpenURL(routing_id_, params));
 }
 
 void RenderFrameImpl::NavigateInternal(
     const CommonNavigationParams& common_params,
     const StartNavigationParams& start_params,
     const RequestNavigationParams& request_params,
     std::unique_ptr<StreamOverrideParameters> stream_params,
     scoped_refptr<ResourceRequestBody> post_data) {

[clamy, 2016/05/20 15:49:14]

Note: moving post_data to the CommonNavigationParams IPC means we can get rid of
that parameter.

[Łukasz Anforowicz, 2016/05/20 22:18:47]

Done.

   bool browser_side_navigation = IsBrowserSideNavigationEnabled();
 
   // Lower bound for browser initiated navigation start time.
   base::TimeTicks renderer_navigation_start = base::TimeTicks::Now();
   bool is_reload = IsReload(common_params.navigation_type);
   bool is_history_navigation = request_params.page_state.IsValid();
   WebCachePolicy cache_policy = WebCachePolicy::UseProtocolCachePolicy;
   RenderFrameImpl::PrepareRenderViewForNavigation(
       common_params.url, request_params);
 
@@ skipping 135 matching lines @@
     if (!start_params.extra_headers.empty() && !browser_side_navigation) {
       for (net::HttpUtil::HeadersIterator i(start_params.extra_headers.begin(),
                                             start_params.extra_headers.end(),
                                             "\n");
            i.GetNext();) {
         request.addHTTPHeaderField(WebString::fromUTF8(i.name()),
                                    WebString::fromUTF8(i.values()));
       }
     }
 
-    if (common_params.method == "POST" && !browser_side_navigation) {
-      // Set post data.
-      WebHTTPBody http_body;
-      http_body.initialize();
-      const char* data = nullptr;
-      if (start_params.browser_initiated_post_data.size()) {
-        data = reinterpret_cast<const char*>(
-            &start_params.browser_initiated_post_data.front());
-      }
-      http_body.appendData(
-          WebData(data, start_params.browser_initiated_post_data.size()));
-      request.setHTTPBody(http_body);
+    if (common_params.method == "POST" && !browser_side_navigation &&

[clamy, 2016/05/20 15:49:14]

This means that the post data will only be added to the request if the
navigation is a regular navigation: history and reloads are treated above. Is
that ok for site-per-process (we add it for all navigations with PlzNavigate).

[Łukasz Anforowicz, 2016/05/20 22:18:47]

Done.  You're right - now that this handles not only browser-initiated-post, it
should probably be moved out of the else branch.

+        start_params.post_data) {
+      AddHTTPBodyToRequest(&request, start_params.post_data);
     }
 
     // A session history navigation should have been accompanied by state.
     CHECK_EQ(request_params.page_id, -1);
 
     should_load_request = true;
   }
 
   if (should_load_request) {
     // Sanitize navigation start now that we know the load_type.
@@ skipping 690 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content