Set SSL info when an HTTP auth dialog is triggered by direct navigation.

content/browser/ssl/ssl_manager.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.
 
 #include "content/browser/ssl/ssl_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/supports_user_data.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/ssl/ssl_policy.h"
 #include "content/browser/ssl/ssl_request_info.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/load_from_memory_cache_details.h"
 #include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/common/ssl_status.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 namespace {
 
 const char kSSLManagerKeyName[] = "content_ssl_manager";
 
@@ skipping 38 matching lines @@
                  new SSLCertErrorHandler(delegate,
                                          resource_type,
                                          url,
                                          render_process_id,
                                          render_frame_id,
                                          ssl_info,
                                          fatal)));
 }
 
 // static
+void SSLManager::OnAuthDialog(int render_process_id,
+                              int render_frame_id,
+                              const std::string& serialized_security_info,
+                              bool is_main_frame) {
+  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {

[Charlie Reis, 2015/03/18 17:46:38]

Please have a separate method for the UI thread version (e.g. OnAuthDialogOnUI).
 The threading model gets confusing when we have methods that can be called from
multiple threads.

[palmer, 2015/09/29 00:03:33]

The sole call site is on the IO thread. Making the change you request and adding
DCHECK_CURRENTLY_ON(BrowserThread::IO); at
https://codereview.chromium.org/1368863002.

+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(SSLManager::OnAuthDialog, render_process_id, render_frame_id,
+                   serialized_security_info, is_main_frame));
+    return;
+  }
+  RenderFrameHost* render_frame_host =
+      RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
+  WebContents* web_contents =
+      WebContents::FromRenderFrameHost(render_frame_host);
+  if (!web_contents)
+    return;
+  NavigationControllerImpl* controller =
+      static_cast<NavigationControllerImpl*>(&web_contents->GetController());
+  NavigationEntryImpl* entry = controller->GetPendingEntry();

[Charlie Reis, 2015/03/18 17:46:38]

If you've just done a PostTask to get here, then there's no guarantee that the
pending entry still exists or is for the same navigation.  (It may have been
discarded or replaced with a different one in the meantime.)

[palmer, 2015/09/29 00:03:33]

Added a comment on the other CL.

+  controller->ssl_manager()->UpdateEntry(serialized_security_info,
+                                         is_main_frame, entry);
+}
+
+// static
 void SSLManager::NotifySSLInternalStateChanged(BrowserContext* context) {
   SSLManagerSet* managers = static_cast<SSLManagerSet*>(
       context->GetUserData(kSSLManagerKeyName));
 
   for (std::set<SSLManager*>::iterator i = managers->get().begin();
        i != managers->get().end(); ++i) {
     (*i)->UpdateEntry((*i)->controller()->GetLastCommittedEntry());
   }
 }
 
@@ skipping 13 matching lines @@
 }
 
 SSLManager::~SSLManager() {
   SSLManagerSet* managers = static_cast<SSLManagerSet*>(
       controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName));
   managers->get().erase(this);
 }
 
 void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
   NavigationEntryImpl* entry = controller_->GetLastCommittedEntry();
+  UpdateEntry(details.serialized_security_info, details.is_main_frame, entry);
+}
 
-  if (details.is_main_frame) {
-    if (entry) {
-      // Decode the security details.
-      int ssl_cert_id;
-      net::CertStatus ssl_cert_status;
-      int ssl_security_bits;
-      int ssl_connection_status;
-      SignedCertificateTimestampIDStatusList
-          ssl_signed_certificate_timestamp_ids;
-      DeserializeSecurityInfo(details.serialized_security_info,
-                              &ssl_cert_id,
-                              &ssl_cert_status,
-                              &ssl_security_bits,
-                              &ssl_connection_status,
-                              &ssl_signed_certificate_timestamp_ids);
+void SSLManager::UpdateEntry(const std::string& serialized_security_info,
+                             bool is_main_frame,
+                             NavigationEntryImpl* entry) {
+  if (is_main_frame && entry) {
+    // Decode the security details.
+    int ssl_cert_id;
+    net::CertStatus ssl_cert_status;
+    int ssl_security_bits;
+    int ssl_connection_status;
+    SignedCertificateTimestampIDStatusList ssl_signed_certificate_timestamp_ids;
+    DeserializeSecurityInfo(serialized_security_info, &ssl_cert_id,
+                            &ssl_cert_status, &ssl_security_bits,
+                            &ssl_connection_status,
+                            &ssl_signed_certificate_timestamp_ids);
 
-      // We may not have an entry if this is a navigation to an initial blank
-      // page. Reset the SSL information and add the new data we have.
-      entry->GetSSL() = SSLStatus();
-      entry->GetSSL().cert_id = ssl_cert_id;
-      entry->GetSSL().cert_status = ssl_cert_status;
-      entry->GetSSL().security_bits = ssl_security_bits;
-      entry->GetSSL().connection_status = ssl_connection_status;
-      entry->GetSSL().signed_certificate_timestamp_ids =
-          ssl_signed_certificate_timestamp_ids;
-    }
+    // We may not have an entry if this is a navigation to an initial blank
+    // page. Reset the SSL information and add the new data we have.
+    entry->GetSSL() = SSLStatus();
+    entry->GetSSL().cert_id = ssl_cert_id;
+    entry->GetSSL().cert_status = ssl_cert_status;
+    entry->GetSSL().security_bits = ssl_security_bits;
+    entry->GetSSL().connection_status = ssl_connection_status;
+    entry->GetSSL().signed_certificate_timestamp_ids =
+        ssl_signed_certificate_timestamp_ids;
   }
 
   UpdateEntry(entry);
 }
 
 void SSLManager::DidDisplayInsecureContent() {
   UpdateEntry(controller_->GetLastCommittedEntry());
 }
 
 void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
@@ skipping 54 matching lines @@
 
   WebContentsImpl* contents =
       static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
   policy()->UpdateEntry(entry, contents);
 
   if (!entry->GetSSL().Equals(original_ssl_status))
     contents->DidChangeVisibleSSLState();
 }
 
 }  // namespace content