Stop sending serialized SSLStatus to the renderer.

content/browser/loader/resource_dispatcher_host_impl.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/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <stddef.h>
 
@@ skipping 58 matching lines @@
 #include "content/browser/streams/stream.h"
 #include "content/browser/streams/stream_context.h"
 #include "content/browser/streams/stream_registry.h"
 #include "content/common/navigation_params.h"
 #include "content/common/net/url_request_service_worker_data.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_request.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/common/site_isolation_policy.h"
-#include "content/common/ssl_status_serialization.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/browser/stream_info.h"
 #include "content/public/common/browser_side_navigation_policy.h"
@@ skipping 327 matching lines @@
       routing_ids->insert(pending_frame_host->GetGlobalFrameRoutingId());
   }
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&NotifyForRouteSetOnIO, frame_callback,
                                      base::Passed(std::move(routing_ids))));
 }
 
 void UpdateSSLStatus(int render_process_id,
                      int render_frame_host_id,
                      const GURL& url,
-                     int new_cert_id) {
+                     CertStore* cert_store) {
   RenderFrameHostImpl* render_frame_host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_host_id);
   if (!render_frame_host)
     return;
 
   NavigationHandleImpl* navigation_handle =
       render_frame_host->navigation_handle();
-  if (navigation_handle && navigation_handle->GetURL() == url)
-    navigation_handle->UpdateSSLCertId(new_cert_id);
+  if (!navigation_handle || navigation_handle->GetURL() != url)
+    return;
+
+  scoped_refptr<net::X509Certificate> cert;
+  if (!cert_store->RetrieveCert(
+          navigation_handle->ssl_status().cert_id, &cert)) {
+    NOTREACHED() << "Must have set an SSL certificate already.";
+    return;
+  }
+
+  int new_cert_id = cert_store->StoreCert(cert.get(), render_process_id);
+  navigation_handle->UpdateSSLCertId(new_cert_id);
 }
 
 }  // namespace
 
 ResourceDispatcherHostImpl::HeaderInterceptorInfo::HeaderInterceptorInfo() {}
 
 ResourceDispatcherHostImpl::HeaderInterceptorInfo::~HeaderInterceptorInfo() {}
 
 ResourceDispatcherHostImpl::HeaderInterceptorInfo::HeaderInterceptorInfo(
     const HeaderInterceptorInfo& other) {}
@@ skipping 1852 matching lines @@
 
   // If enqueing/starting this request will exceed our per-process memory
   // bound, abort it right away.
   OustandingRequestsStats stats = IncrementOutstandingRequestsMemory(1, *info);
   if (stats.memory_cost > max_outstanding_requests_cost_per_process_) {
     // We call "CancelWithError()" as a way of setting the net::URLRequest's
     // status -- it has no effect beyond this, since the request hasn't started.
     request->CancelWithError(net::ERR_INSUFFICIENT_RESOURCES);
 
     bool defer = false;
-    handler->OnResponseCompleted(request->status(), std::string(), &defer);
+    handler->OnResponseCompleted(request->status(), &defer);
     if (defer) {
       // TODO(darin): The handler is not ready for us to kill the request. Oops!
       NOTREACHED();
     }
 
     IncrementOutstandingRequestsMemory(-1, *info);
 
     // A ResourceHandler must not outlive its associated URLRequest.
     handler.reset();
     return;
@@ skipping 303 matching lines @@
     load_flags |= net::LOAD_IGNORE_LIMITS;
 
   return load_flags;
 }
 
 void ResourceDispatcherHostImpl::UpdateResponseCertificateForTransfer(
     ResourceResponse* response,
     net::URLRequest* request,
     ResourceRequestInfoImpl* info) {
   const net::SSLInfo& ssl_info = request->ssl_info();
-  if (!ssl_info.cert)
+  if (info->GetResourceType() != RESOURCE_TYPE_MAIN_FRAME || !ssl_info.cert)
     return;
-  SSLStatus ssl;
-  // DeserializeSecurityInfo() often takes security info sent by a
-  // renderer as input, in which case it's important to check that the
-  // security info deserializes properly and kill the renderer if
-  // not. In this case, however, the security info has been provided by
-  // the ResourceLoader, so it does not need to be treated as untrusted
-  // data.
-  bool deserialized =
-      DeserializeSecurityInfo(response->head.security_info, &ssl);
-  DCHECK(deserialized);
-  ssl.cert_id = GetCertStore()->StoreCert(ssl_info.cert.get(),
-                                          info->GetChildID());
-  response->head.security_info = SerializeSecurityInfo(ssl);
-
-  if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME) {
-    int render_process_id, render_frame_id;
-    if (info->GetAssociatedRenderFrame(&render_process_id, &render_frame_id)) {
-      BrowserThread::PostTask(BrowserThread::UI,
-                              FROM_HERE,
-                              base::Bind(UpdateSSLStatus,
-                                         render_process_id,
-                                         render_frame_id,
-                                         request->url(),
-                                         ssl.cert_id));
-    }
+  int render_process_id, render_frame_id;
+  if (info->GetAssociatedRenderFrame(&render_process_id, &render_frame_id)) {
+    BrowserThread::PostTask(BrowserThread::UI,
+                            FROM_HERE,
+                            base::Bind(UpdateSSLStatus,
+                                       render_process_id,
+                                       render_frame_id,
+                                       request->url(),
+                                       GetCertStore()));
   }
 }
 
 CertStore* ResourceDispatcherHostImpl::GetCertStore() {
   return cert_store_for_testing_ ? cert_store_for_testing_
                                  : CertStore::GetInstance();
 }
 
 bool ResourceDispatcherHostImpl::ShouldServiceRequest(
     int process_type,
@@ skipping 67 matching lines @@
         request_info->GetRouteID(), is_content_initiated, true, &throttles);
     if (!throttles.empty()) {
       handler.reset(new ThrottlingResourceHandler(std::move(handler), request,
                                                   std::move(throttles)));
     }
   }
   return handler;
 }
 
 }  // namespace content