UMA data collector for cross-site documents(XSD)

content/child/resource_dispatcher.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/child/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/files/file_path.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "content/child/request_extra_data.h"
+#include "content/child/site_isolation_policy.h"
 #include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/resource_messages.h"
 #include "content/public/child/resource_dispatcher_delegate.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_response_headers.h"
 #include "webkit/common/resource_type.h"
 
 using webkit_glue::ResourceLoaderBridge;
 using webkit_glue::ResourceRequestBody;
 using webkit_glue::ResourceResponseInfo;
@@ skipping 57 matching lines @@
   // The request to send, created on initialization for modification and
   // appending data.
   ResourceHostMsg_Request request_;
 
   // ID for the request, valid once Start()ed, -1 if not valid yet.
   int request_id_;
 
   // The routing id used when sending IPC messages.
   int routing_id_;
 
+  // The security origin of the frame that initiates this request

[Charlie Reis, 2013/08/22 18:23:30]

nit: End with period.

[dsjang, 2013/08/22 19:05:55]

Done.

+  GURL frame_origin_;
+
   bool is_synchronous_request_;
 };
 
 IPCResourceLoaderBridge::IPCResourceLoaderBridge(
     ResourceDispatcher* dispatcher,
     const ResourceLoaderBridge::RequestInfo& request_info)
     : peer_(NULL),
       dispatcher_(dispatcher),
       request_id_(-1),
       routing_id_(request_info.routing_id),
@@ skipping 19 matching lines @@
     request_.is_main_frame = extra_data->is_main_frame();
     request_.frame_id = extra_data->frame_id();
     request_.parent_is_main_frame = extra_data->parent_is_main_frame();
     request_.parent_frame_id = extra_data->parent_frame_id();
     request_.allow_download = extra_data->allow_download();
     request_.transition_type = extra_data->transition_type();
     request_.transferred_request_child_id =
         extra_data->transferred_request_child_id();
     request_.transferred_request_request_id =
         extra_data->transferred_request_request_id();
+    frame_origin_ = extra_data->frame_origin();
   } else {
     request_.is_main_frame = false;
     request_.frame_id = -1;
     request_.parent_is_main_frame = false;
     request_.parent_frame_id = -1;
     request_.allow_download = true;
     request_.transition_type = PAGE_TRANSITION_LINK;
     request_.transferred_request_child_id = -1;
     request_.transferred_request_request_id = -1;
   }
@@ skipping 24 matching lines @@
 bool IPCResourceLoaderBridge::Start(Peer* peer) {
   if (request_id_ != -1) {
     NOTREACHED() << "Starting a request twice";
     return false;
   }
 
   peer_ = peer;
 
   // generate the request ID, and append it to the message
   request_id_ = dispatcher_->AddPendingRequest(
-      peer_, request_.resource_type, request_.url);
+      peer_, request_.resource_type, frame_origin_, request_.url);
 
   return dispatcher_->message_sender()->Send(
       new ResourceHostMsg_RequestResource(routing_id_, request_id_, request_));
 }
 
 void IPCResourceLoaderBridge::Cancel() {
   if (request_id_ < 0) {
     NOTREACHED() << "Trying to cancel an unstarted request";
     return;
   }
@@ skipping 146 matching lines @@
   if (delegate_) {
     ResourceLoaderBridge::Peer* new_peer =
         delegate_->OnReceivedResponse(
             request_info->peer, response_head.mime_type, request_info->url);
     if (new_peer)
       request_info->peer = new_peer;
   }
 
   ResourceResponseInfo renderer_response_info;
   ToResourceResponseInfo(*request_info, response_head, &renderer_response_info);
+  SiteIsolationPolicy::OnReceivedResponse(request_id,
+                                          request_info->frame_origin,
+                                          request_info->response_url,
+                                          request_info->resource_type,
+                                          renderer_response_info);
   request_info->peer->OnReceivedResponse(renderer_response_info);
 }
 
 void ResourceDispatcher::OnReceivedCachedMetadata(
       int request_id, const std::vector<char>& data) {
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
 
   if (data.size())
@@ skipping 45 matching lines @@
     // It is possible for CancelPendingRequest() to be called before we exit
     // this scope.
     linked_ptr<base::SharedMemory> retain_buffer(request_info->buffer);
 
     base::TimeTicks time_start = base::TimeTicks::Now();
 
     const char* data_ptr = static_cast<char*>(request_info->buffer->memory());
     CHECK(data_ptr);
     CHECK(data_ptr + data_offset);
 
-    request_info->peer->OnReceivedData(
-        data_ptr + data_offset,
-        data_length,
-        encoded_data_length);
+    // Check whether this response data is compliant with our cross-site
+    // document blocking policy.
+    bool ok_response = SiteIsolationPolicy::OnReceivedData(

[Charlie Reis, 2013/08/22 18:23:30]

This name doesn't describe what the function is doing.  Perhaps something more
like block_response = SiteIsolationPolicy::ShouldBlockResponse?

[dsjang, 2013/08/22 19:05:55]

Done.

+        request_id, data_ptr + data_offset, data_length);
+
+    // We block a response when the command line switch is on.
+    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    if (!ok_response &&
+        command_line.HasSwitch(switches::kCrossSiteDocumentBlocking)) {
+      // if data_offset is not-zero, this is not the first data packet for

[Charlie Reis, 2013/08/22 18:23:30]

Nit: capitalize sentence.

[dsjang, 2013/08/22 19:05:55]

Done.

+      // this request. We just ignore it.
+      if (data_offset == 0) {
+        // If we decide to block the response data, we just return an empty
+        // one-character string as response data : this is needed to trigger

[Charlie Reis, 2013/08/22 18:23:30]

nit: Remove the colon and just have two sentences.

[dsjang, 2013/08/22 19:05:55]

Done.

+        // parsing errors in image decoders, etc.
+        LOG(ERROR) << request_info->response_url
+                   << " is blocked as an illegal cross-site document from "
+                   << request_info->frame_origin;
+        const char* empty_data_ptr = " ";
+        request_info->peer->OnReceivedData(empty_data_ptr, 1, 1);
+      }
+    } else {
+      request_info->peer->OnReceivedData(
+          data_ptr + data_offset,
+          data_length,
+          encoded_data_length);
+    }
 
     UMA_HISTOGRAM_TIMES("ResourceDispatcher.OnReceivedDataTime",
                         base::TimeTicks::Now() - time_start);
   }
 
   // Acknowledge the reception of this data.
   message_sender()->Send(
       new ResourceHostMsg_DataReceived_ACK(message.routing_id(), request_id));
 }
 
@@ skipping 27 matching lines @@
   ResourceResponseInfo renderer_response_info;
   ToResourceResponseInfo(*request_info, response_head, &renderer_response_info);
   if (request_info->peer->OnReceivedRedirect(new_url, renderer_response_info,
                                              &has_new_first_party_for_cookies,
                                              &new_first_party_for_cookies)) {
     // Double-check if the request is still around. The call above could
     // potentially remove it.
     request_info = GetPendingRequestInfo(request_id);
     if (!request_info)
       return;
+    // We update the response_url here so that we can sent it to

[Charlie Reis, 2013/08/22 18:23:30]

nit: sent -> send

[dsjang, 2013/08/22 19:05:55]

Done.

+    // SiteIsolationPolicy later when OnReceivedResponse is called.
+    request_info->response_url = new_url;
     request_info->pending_redirect_message.reset(
         new ResourceHostMsg_FollowRedirect(routing_id, request_id,
                                            has_new_first_party_for_cookies,
                                            new_first_party_for_cookies));
     if (!request_info->is_deferred) {
       FollowPendingRedirect(request_id, *request_info);
     }
   } else {
     CancelPendingRequest(routing_id, request_id);
   }
 }
 
 void ResourceDispatcher::FollowPendingRedirect(
     int request_id,
     PendingRequestInfo& request_info) {
   IPC::Message* msg = request_info.pending_redirect_message.release();
   if (msg)
     message_sender()->Send(msg);
 }
 
 void ResourceDispatcher::OnRequestComplete(
     int request_id,
     int error_code,
     bool was_ignored_by_handler,
     const std::string& security_info,
     const base::TimeTicks& browser_completion_time) {
+  // TODO(dsjang): This logging code is just temporary. There has to
+  // be a better way to connect the received data to the response_url

[Charlie Reis, 2013/08/22 18:23:30]

I don't understand this comment.
1) Are you planning to remove this when we're done logging, even if the blocking
code stays?
2) What's wrong with this way?

[dsjang, 2013/08/22 19:05:55]

With the blocking logic, everything about SiteIsolationPolicy will remain here.
The comment was just an old one to go away.

On 2013/08/22 18:23:30, creis wrote:

+  // than this.
+  SiteIsolationPolicy::OnRequestComplete(request_id);
+
   PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
   if (!request_info)
     return;
   request_info->completion_time = ConsumeIOTimestamp();
   request_info->buffer.reset();
   request_info->buffer_size = 0;
 
   ResourceLoaderBridge::Peer* peer = request_info->peer;
 
   if (delegate_) {
     ResourceLoaderBridge::Peer* new_peer =
         delegate_->OnRequestComplete(
             request_info->peer, request_info->resource_type, error_code);
     if (new_peer)
       request_info->peer = new_peer;
   }
 
   base::TimeTicks renderer_completion_time = ToRendererCompletionTime(
       *request_info, browser_completion_time);
+

[Charlie Reis, 2013/08/22 18:23:30]

nit: Don't add extra line.

[dsjang, 2013/08/22 19:05:55]

Done.

   // The request ID will be removed from our pending list in the destructor.
   // Normally, dispatching this message causes the reference-counted request to
   // die immediately.
   peer->OnCompletedRequest(error_code, was_ignored_by_handler, security_info,
                            renderer_completion_time);
 }
 
 int ResourceDispatcher::AddPendingRequest(
     ResourceLoaderBridge::Peer* callback,
     ResourceType::Type resource_type,
+    const GURL& frame_origin,
     const GURL& request_url) {
   // Compute a unique request_id for this renderer process.
   int id = MakeRequestID();
   pending_requests_[id] =
-      PendingRequestInfo(callback, resource_type, request_url);
+      PendingRequestInfo(callback, resource_type, frame_origin, request_url);
   return id;
 }
 
 bool ResourceDispatcher::RemovePendingRequest(int request_id) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end())
     return false;
 
+  SiteIsolationPolicy::OnRequestComplete(request_id);
   PendingRequestInfo& request_info = it->second;
   ReleaseResourcesInMessageQueue(&request_info.deferred_message_queue);
   pending_requests_.erase(it);
 
   return true;
 }
 
 void ResourceDispatcher::CancelPendingRequest(int routing_id,
                                               int request_id) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end()) {
     DVLOG(1) << "unknown request";
     return;
   }
 
+  SiteIsolationPolicy::OnRequestComplete(request_id);
   PendingRequestInfo& request_info = it->second;
   ReleaseResourcesInMessageQueue(&request_info.deferred_message_queue);
   pending_requests_.erase(it);
 
   message_sender()->Send(
       new ResourceHostMsg_CancelRequest(routing_id, request_id));
 }
 
 void ResourceDispatcher::SetDefersLoading(int request_id, bool value) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
@@ skipping 27 matching lines @@
 ResourceDispatcher::PendingRequestInfo::PendingRequestInfo()
     : peer(NULL),
       resource_type(ResourceType::SUB_RESOURCE),
       is_deferred(false),
       buffer_size(0) {
 }
 
 ResourceDispatcher::PendingRequestInfo::PendingRequestInfo(
     webkit_glue::ResourceLoaderBridge::Peer* peer,
     ResourceType::Type resource_type,
+    const GURL& frame_origin,
     const GURL& request_url)
     : peer(peer),
       resource_type(resource_type),
       is_deferred(false),
       url(request_url),
+      frame_origin(frame_origin),
+      response_url(request_url),
       request_start(base::TimeTicks::Now()) {
 }
 
 ResourceDispatcher::PendingRequestInfo::~PendingRequestInfo() {}
 
 void ResourceDispatcher::DispatchMessage(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(ResourceDispatcher, message)
     IPC_MESSAGE_HANDLER(ResourceMsg_UploadProgress, OnUploadProgress)
     IPC_MESSAGE_HANDLER(ResourceMsg_ReceivedResponse, OnReceivedResponse)
     IPC_MESSAGE_HANDLER(ResourceMsg_ReceivedCachedMetadata,
@@ skipping 148 matching lines @@
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }
 
 }  // namespace content