net: make HSTS hosts use the normal SSL interstitials

content/browser/ssl/ssl_policy.cc

 // Copyright (c) 2011 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_policy.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/string_piece.h"
@@ skipping 40 matching lines @@
 
   // The judgment is either DENIED or UNKNOWN.
   // For now we handle the DENIED as the UNKNOWN, which means a blocking
   // page is shown to the user every time he comes back to the page.
 
   switch (handler->cert_error()) {
     case net::ERR_CERT_COMMON_NAME_INVALID:
     case net::ERR_CERT_DATE_INVALID:
     case net::ERR_CERT_AUTHORITY_INVALID:
     case net::ERR_CERT_WEAK_SIGNATURE_ALGORITHM:
       OnCertErrorInternal(handler, true);

[wtc, 2011/09/23 00:04:51]

We can pass !handler->must_be_fatal() instead of true
as the second argument here.  See also the next comment below.

       break;
     case net::ERR_CERT_NO_REVOCATION_MECHANISM:
       // Ignore this error.
       handler->ContinueRequest();
       break;
     case net::ERR_CERT_UNABLE_TO_CHECK_REVOCATION:
       // We ignore this error but will show a warning status in the location
       // bar.
       handler->ContinueRequest();
       break;
@@ skipping 116 matching lines @@
                                     bool overridable) {
   if (handler->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.
     handler->DenyRequest();
     return;
   }
 
+  // For HSTS hosts all certificate errors are fatal (the user cannot bypass).
+  // This is indicated by the |must_be_fatal()| flag.
+  if (handler->must_be_fatal())
+    overridable = false;

[wtc, 2011/09/23 00:04:51]

I think it is better to move this code to the
SSLPolicy::OnCertError() method above.

+
   Callback2<SSLCertErrorHandler*, bool>::Type* callback =
       NewCallback(this, &SSLPolicy::OnAllowCertificate);
   content::GetContentClient()->browser()->AllowCertificateError(
       handler, overridable, callback);
 }
 
 void SSLPolicy::InitializeEntryIfNeeded(NavigationEntry* entry) {
   if (entry->ssl().security_style() != SECURITY_STYLE_UNKNOWN)
     return;
 
   entry->ssl().set_security_style(entry->url().SchemeIsSecure() ?
       SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED);
 }
 
 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) {
   GURL parsed_origin(origin);
   if (parsed_origin.SchemeIsSecure())
     backend_->HostRanInsecureContent(parsed_origin.host(), pid);
 }