Change the bad-certificate handler for SSL (using NSS) to return an...

chrome/browser/ssl/ssl_policy.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/ssl/ssl_policy.h"
 
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "chrome/browser/cert_store.h"
@@ skipping 300 matching lines @@
 // SSLBlockingPage::Delegate methods
 
 SSLErrorInfo SSLPolicy::GetSSLErrorInfo(SSLManager::CertError* error) {
   return SSLErrorInfo::CreateError(
       SSLErrorInfo::NetErrorToErrorType(error->cert_error()),
       error->ssl_info().cert, error->request_url());
 }
 
 void SSLPolicy::OnDenyCertificate(SSLManager::CertError* error) {
   // Default behavior for rejecting a certificate.
-  error->CancelRequest();
+  //
+  // While DenyCertForHost() executes synchronously on this thread,
+  // CancelRequest() gets posted to a different thread. Calling
+  // DenyCertForHost() first ensures deterministic ordering.
   error->manager()->DenyCertForHost(error->ssl_info().cert,
                                     error->request_url().host());
+  error->CancelRequest();
 }
 
 void SSLPolicy::OnAllowCertificate(SSLManager::CertError* error) {
   // Default behavior for accepting a certificate.
   // Note that we should not call SetMaxSecurityStyle here, because the active
   // NavigationEntry has just been deleted (in HideInterstitialPage) and the
   // new NavigationEntry will not be set until DidNavigate.  This is ok,
   // because the new NavigationEntry will have its max security style set
   // within DidNavigate.
-  error->ContinueRequest();
+  //
+  // While AllowCertForHost() executes synchronously on this thread,
+  // ContinueRequest() gets posted to a different thread. Calling
+  // AllowCertForHost() first ensures deterministic ordering.
   error->manager()->AllowCertForHost(error->ssl_info().cert,
                                      error->request_url().host());
+  error->ContinueRequest();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Certificate Error Routines
 
 void SSLPolicy::OnOverridableCertError(SSLManager::CertError* error) {
   if (error->resource_type() != ResourceType::MAIN_FRAME) {
     // A sub-resource has a certificate error.  The user doesn't really
     // have a context for making the right decision, so block the
     // request hard, without an info bar to allow showing the insecure
     // content.
     error->DenyRequest();
     return;
   }
   // We need to ask the user to approve this certificate.
   ShowBlockingPage(this, error);
 }
 
 void SSLPolicy::OnFatalCertError(SSLManager::CertError* error) {
   if (error->resource_type() != ResourceType::MAIN_FRAME) {
     error->DenyRequest();
     return;
   }
   error->CancelRequest();
   ShowErrorPage(this, error);
   // No need to degrade our security indicators because we didn't continue.
 }