Don't use SSLStatus from FrameHostMsg_DidCommitProvisionalLoad and instead cache it on the browser …

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 398 matching lines @@
     if (frame_host)
       routing_ids->insert(frame_host->GetGlobalFrameRoutingId());
     if (pending_frame_host)
       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 SetTransferredRFHSSLStatus(int render_process_id,
+                                int render_frame_id,
+                                const GURL& url,
+                                const SSLStatus& ssl_status) {
+  RenderFrameHostImpl* rfh =
+      RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
+  if (rfh)
+    rfh->SetSSLStatusForPendingNavigate(url, ssl_status);
+}
+
 }  // namespace
 
 ResourceDispatcherHostImpl::HeaderInterceptorInfo::HeaderInterceptorInfo() {}
 
 ResourceDispatcherHostImpl::HeaderInterceptorInfo::~HeaderInterceptorInfo() {}
 
 ResourceDispatcherHostImpl::HeaderInterceptorInfo::HeaderInterceptorInfo(
     const HeaderInterceptorInfo& other) {}
 
 // static
@@ skipping 753 matching lines @@
   // ResourceRequestInfo rather than caching it locally.  This lets us update
   // the info object when a transfer occurs.
   info->UpdateForTransfer(child_id, route_id, request_data.render_frame_id,
                           request_data.origin_pid, request_id,
                           filter_->GetWeakPtr());
 
   // If a certificate is stored with the ResourceResponse, it has to be
   // updated to be associated with the new process.
   if (loader->transferring_response()) {
     UpdateResponseCertificateForTransfer(loader->transferring_response(),
-                                         loader->request()->ssl_info(),
-                                         child_id);
+                                         loader->request(),
+                                         info);
   }
 
   // Update maps that used the old IDs, if necessary.  Some transfers in tests
   // do not actually use a different ID, so not all maps need to be updated.
   pending_loaders_[new_request_id] = std::move(loader);
   IncrementOutstandingRequestsMemory(1, *info);
   if (should_update_count)
     IncrementOutstandingRequestsCount(1, info);
   if (old_routing_id != new_routing_id) {
     if (blocked_loaders_map_.find(old_routing_id) !=
@@ skipping 1383 matching lines @@
   }
 
   if (is_sync_load)
     load_flags |= net::LOAD_IGNORE_LIMITS;
 
   return load_flags;
 }
 
 void ResourceDispatcherHostImpl::UpdateResponseCertificateForTransfer(
     ResourceResponse* response,
-    const net::SSLInfo& ssl_info,
-    int child_id) {
+    net::URLRequest* request,
+    ResourceRequestInfoImpl* info) {
+  const net::SSLInfo& ssl_info = request->ssl_info();
   if (!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(), child_id);
+  ssl.cert_id = GetCertStore()->StoreCert(ssl_info.cert.get(),
+                                          info->GetChildID());
   response->head.security_info = SerializeSecurityInfo(ssl);
+
+  if (!info->IsMainFrame())
+    return;
+
+  // TODO(jam): eventually we'll get rid of this serialized SSLStatus in the
+  // response and won't send it to the child process. So for preparation, don't
+  // use it below.
+  SSLStatus ssl_status;
+  ResourceLoader::GetSSLStatusForRequest(
+      request->url(), ssl_info, info->GetChildID(),
+      ResourceDispatcherHostImpl::Get()->GetCertStore(), &ssl_status);
+
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(SetTransferredRFHSSLStatus,
+                                     info->GetChildID(),
+                                     info->GetRenderFrameID(),
+                                     request->url(),
+                                     ssl_status));
 }
 
 CertStore* ResourceDispatcherHostImpl::GetCertStore() {
   return cert_store_for_testing_ ? cert_store_for_testing_
                                  : CertStore::GetInstance();
 }
 
 bool ResourceDispatcherHostImpl::ShouldServiceRequest(
     int process_type,
     int child_id,
@@ skipping 45 matching lines @@
                        << iter->filesystem_url().spec();
           return false;
         }
       }
     }
   }
   return true;
 }
 
 }  // namespace content