Improve TransportSecurityState data storage.

chrome/browser/ui/webui/net_internals/net_internals_ui.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 "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 1215 matching lines @@
         GetMainContext()->transport_security_state();
     if (!transport_security_state) {
       result->SetString("error", "no TransportSecurityState active");
     } else {
       net::TransportSecurityState::DomainState state;
       const bool found = transport_security_state->GetDomainState(
           domain, true, &state);
 
       result->SetBoolean("result", found);
       if (found) {
-        result->SetInteger("mode", static_cast<int>(state.upgrade_mode));
-        result->SetBoolean("subdomains", state.include_subdomains);
-        result->SetString("domain", state.domain);
-        result->SetDouble("expiry", state.upgrade_expiry.ToDoubleT());
-        result->SetDouble("dynamic_spki_hashes_expiry",
-                          state.dynamic_spki_hashes_expiry.ToDoubleT());
-
-        result->SetString("static_spki_hashes",
-                          HashesToBase64String(state.static_spki_hashes));
-        result->SetString("dynamic_spki_hashes",
-                          HashesToBase64String(state.dynamic_spki_hashes));
+        result->SetBoolean("HSTS", state.ShouldUpgradeToSSL());
+        if (state.HasPublicKeyPins()) {
+          const net::HashValueVector& good_hashes =
+            state.GetPublicKeyPinsGoodHashes();
+          const net::HashValueVector& bad_hashes =
+            state.GetPublicKeyPinsBadHashes();
+          if (!good_hashes.empty())
+            result->SetString("Public_Key_Pins_Good",
+                              HashesToBase64String(
+                                state.GetPublicKeyPinsGoodHashes()));
+          if (!bad_hashes.empty())
+            result->SetString("Public_Key_Pins_Bad",
+                              HashesToBase64String(
+                                state.GetPublicKeyPinsBadHashes()));
+        }
       }
     }
   }
 
   SendJavascriptCommand("receivedHSTSResult", result);
 }
 
 void NetInternalsMessageHandler::IOThreadImpl::OnHSTSAdd(
     const ListValue* list) {
   // |list| should be: [<domain to query>, <include subdomains>, <cert pins>].
   std::string domain;
   CHECK(list->GetString(0, &domain));
   if (!IsStringASCII(domain)) {
     // Silently fail. The user will get a helpful error if they query for the
     // name.
     return;
   }
   bool include_subdomains;
   CHECK(list->GetBoolean(1, &include_subdomains));
   std::string hashes_str;
   CHECK(list->GetString(2, &hashes_str));
 
   net::TransportSecurityState* transport_security_state =
       GetMainContext()->transport_security_state();
   if (!transport_security_state)
     return;
 
-  base::Time expiry = base::Time::Now() + base::TimeDelta::FromDays(1000);
+  base::Time now = base::Time::Now();
+  base::Time expiry = now + base::TimeDelta::FromDays(1000);
   net::HashValueVector hashes;
   if (!hashes_str.empty()) {
     if (!Base64StringToHashes(hashes_str, &hashes))
       return;
   }
 
-  transport_security_state->AddHSTS(domain, expiry, include_subdomains);
-  transport_security_state->AddHPKP(domain, expiry, include_subdomains,
+  transport_security_state->AddHSTS(domain, now, expiry, include_subdomains);
+  transport_security_state->AddHPKP(domain, now, expiry, include_subdomains,
                                     hashes);
 }
 
 void NetInternalsMessageHandler::IOThreadImpl::OnHSTSDelete(
     const ListValue* list) {
   // |list| should be: [<domain to query>].
   std::string domain;
   CHECK(list->GetString(0, &domain));
   if (!IsStringASCII(domain)) {
     // There cannot be a unicode entry in the HSTS set.
@@ skipping 645 matching lines @@
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
 }