Revert 224269 "Don't persist HPKP if PrivacyMode is enabled."

trunk/src/net/http/transport_security_state_unittest.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 "net/http/transport_security_state.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 52 matching lines @@
     return state->EnableHost(host, domain_state);
   }
 };
 
 TEST_F(TransportSecurityStateTest, SimpleMatches) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
   const base::Time current_time(base::Time::Now());
   const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
 
-  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, &domain_state));
   bool include_subdomains = false;
   state.AddHSTS("yahoo.com", expiry, include_subdomains);
-  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, MatchesCase1) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
   const base::Time current_time(base::Time::Now());
   const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
 
-  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, &domain_state));
   bool include_subdomains = false;
   state.AddHSTS("YAhoo.coM", expiry, include_subdomains);
-  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, MatchesCase2) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
   const base::Time current_time(base::Time::Now());
   const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
 
-  EXPECT_FALSE(state.GetDomainState("YAhoo.coM", true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("YAhoo.coM", true, &domain_state));
   bool include_subdomains = false;
   state.AddHSTS("yahoo.com", expiry, include_subdomains);
-  EXPECT_TRUE(state.GetDomainState("YAhoo.coM", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("YAhoo.coM", true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, SubdomainMatches) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
   const base::Time current_time(base::Time::Now());
   const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
 
-  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, &domain_state));
   bool include_subdomains = true;
   state.AddHSTS("yahoo.com", expiry, include_subdomains);
-  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, true, &domain_state));
-  EXPECT_TRUE(state.GetDomainState("foo.yahoo.com", true, true, &domain_state));
-  EXPECT_TRUE(
-      state.GetDomainState("foo.bar.yahoo.com", true, true, &domain_state));
-  EXPECT_TRUE(
-      state.GetDomainState("foo.bar.baz.yahoo.com", true, true, &domain_state));
-  EXPECT_FALSE(state.GetDomainState("com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("foo.yahoo.com", true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("foo.bar.yahoo.com", true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("foo.bar.baz.yahoo.com", true,
+                                   &domain_state));
+  EXPECT_FALSE(state.GetDomainState("com", true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, DeleteAllDynamicDataSince) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
   const base::Time current_time(base::Time::Now());
   const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
   const base::Time older = current_time - base::TimeDelta::FromSeconds(1000);
 
-  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, &domain_state));
   bool include_subdomains = false;
   state.AddHSTS("yahoo.com", expiry, include_subdomains);
 
   state.DeleteAllDynamicDataSince(expiry);
-  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, &domain_state));
   state.DeleteAllDynamicDataSince(older);
-  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, DeleteDynamicDataForHost) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
   const base::Time current_time(base::Time::Now());
   const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
   bool include_subdomains = false;
   state.AddHSTS("yahoo.com", expiry, include_subdomains);
 
-  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, true, &domain_state));
-  EXPECT_FALSE(state.GetDomainState("example.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("yahoo.com", true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("example.com", true, &domain_state));
   EXPECT_TRUE(state.DeleteDynamicDataForHost("yahoo.com"));
-  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("yahoo.com", true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, IsPreloaded) {
   const std::string paypal = CanonicalizeHost("paypal.com");
   const std::string www_paypal = CanonicalizeHost("www.paypal.com");
   const std::string foo_paypal = CanonicalizeHost("foo.paypal.com");
   const std::string a_www_paypal = CanonicalizeHost("a.www.paypal.com");
   const std::string abc_paypal = CanonicalizeHost("a.b.c.paypal.com");
   const std::string example = CanonicalizeHost("example.com");
   const std::string aypal = CanonicalizeHost("aypal.com");
@@ skipping 10 matching lines @@
   EXPECT_FALSE(GetStaticDomainState(&state, example, true, &domain_state));
   EXPECT_FALSE(GetStaticDomainState(&state, aypal, true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, PreloadedDomainSet) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
 
   // The domain wasn't being set, leading to a blank string in the
   // chrome://net-internals/#hsts UI. So test that.
-  EXPECT_TRUE(
-      state.GetDomainState("market.android.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("market.android.com", true, &domain_state));
   EXPECT_EQ(domain_state.domain, "market.android.com");
-  EXPECT_TRUE(state.GetDomainState(
-      "sub.market.android.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("sub.market.android.com", true,
+                                   &domain_state));
   EXPECT_EQ(domain_state.domain, "market.android.com");
 }
 
 static bool ShouldRedirect(const char* hostname) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
-  return state.GetDomainState(
-             hostname, true /* SNI ok */, true, &domain_state) &&
+  return state.GetDomainState(hostname, true /* SNI ok */, &domain_state) &&
          domain_state.ShouldUpgradeToSSL();
 }
 
 static bool HasState(const char* hostname) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
-  return state.GetDomainState(hostname, true /* SNI ok */, true, &domain_state);
+  return state.GetDomainState(hostname, true /* SNI ok */, &domain_state);
 }
 
 static bool HasPublicKeyPins(const char* hostname, bool sni_enabled) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
-  if (!state.GetDomainState(hostname, sni_enabled, true, &domain_state))
+  if (!state.GetDomainState(hostname, sni_enabled, &domain_state))
     return false;
 
   return domain_state.HasPublicKeyPins();
 }
 
 static bool HasPublicKeyPins(const char* hostname) {
   return HasPublicKeyPins(hostname, true);
 }
 
 static bool OnlyPinning(const char *hostname) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
-  if (!state.GetDomainState(hostname, true /* SNI ok */, true, &domain_state))
+  if (!state.GetDomainState(hostname, true /* SNI ok */, &domain_state))
     return false;
 
   return (domain_state.static_spki_hashes.size() > 0 ||
           domain_state.bad_static_spki_hashes.size() > 0 ||
           domain_state.dynamic_spki_hashes.size() > 0) &&
          !domain_state.ShouldUpgradeToSSL();
 }
 
 TEST_F(TransportSecurityStateTest, Preloaded) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
 
   // We do more extensive checks for the first domain.
-  EXPECT_TRUE(
-      state.GetDomainState("www.paypal.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("www.paypal.com", true, &domain_state));
   EXPECT_EQ(domain_state.upgrade_mode,
             TransportSecurityState::DomainState::MODE_FORCE_HTTPS);
   EXPECT_FALSE(domain_state.sts_include_subdomains);
   EXPECT_FALSE(domain_state.pkp_include_subdomains);
 
   EXPECT_TRUE(HasState("paypal.com"));
   EXPECT_FALSE(HasState("www2.paypal.com"));
   EXPECT_FALSE(HasState("www2.paypal.com"));
 
   // Google hosts:
@@ skipping 41 matching lines @@
   EXPECT_TRUE(OnlyPinning("www.google-analytics.com"));
   EXPECT_TRUE(OnlyPinning("googleapis.com"));
   EXPECT_TRUE(OnlyPinning("googleadservices.com"));
   EXPECT_TRUE(OnlyPinning("googlecode.com"));
   EXPECT_TRUE(OnlyPinning("appspot.com"));
   EXPECT_TRUE(OnlyPinning("googlesyndication.com"));
   EXPECT_TRUE(OnlyPinning("doubleclick.net"));
   EXPECT_TRUE(OnlyPinning("googlegroups.com"));
 
   // Tests for domains that don't work without SNI.
-  EXPECT_FALSE(state.GetDomainState("gmail.com", false, true, &domain_state));
-  EXPECT_FALSE(
-      state.GetDomainState("www.gmail.com", false, true, &domain_state));
-  EXPECT_FALSE(state.GetDomainState("m.gmail.com", false, true, &domain_state));
-  EXPECT_FALSE(
-      state.GetDomainState("googlemail.com", false, true, &domain_state));
-  EXPECT_FALSE(
-      state.GetDomainState("www.googlemail.com", false, true, &domain_state));
-  EXPECT_FALSE(
-      state.GetDomainState("m.googlemail.com", false, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("gmail.com", false, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("www.gmail.com", false, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("m.gmail.com", false, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("googlemail.com", false, &domain_state));
+  EXPECT_FALSE(state.GetDomainState("www.googlemail.com", false,
+                                    &domain_state));
+  EXPECT_FALSE(state.GetDomainState("m.googlemail.com", false, &domain_state));
 
   // Other hosts:
 
   EXPECT_TRUE(ShouldRedirect("aladdinschools.appspot.com"));
 
   EXPECT_TRUE(ShouldRedirect("ottospora.nl"));
   EXPECT_TRUE(ShouldRedirect("www.ottospora.nl"));
 
   EXPECT_TRUE(ShouldRedirect("www.paycheckrecords.com"));
 
@@ skipping 73 matching lines @@
   EXPECT_TRUE(ShouldRedirect("simon.butcher.name"));
   EXPECT_TRUE(ShouldRedirect("foo.simon.butcher.name"));
 
   EXPECT_TRUE(ShouldRedirect("linx.net"));
   EXPECT_TRUE(ShouldRedirect("foo.linx.net"));
 
   EXPECT_TRUE(ShouldRedirect("dropcam.com"));
   EXPECT_TRUE(ShouldRedirect("www.dropcam.com"));
   EXPECT_FALSE(HasState("foo.dropcam.com"));
 
-  EXPECT_TRUE(
-      state.GetDomainState("torproject.org", false, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("torproject.org", false, &domain_state));
   EXPECT_FALSE(domain_state.static_spki_hashes.empty());
-  EXPECT_TRUE(
-      state.GetDomainState("www.torproject.org", false, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("www.torproject.org", false,
+                                   &domain_state));
   EXPECT_FALSE(domain_state.static_spki_hashes.empty());
-  EXPECT_TRUE(
-      state.GetDomainState("check.torproject.org", false, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("check.torproject.org", false,
+                                   &domain_state));
   EXPECT_FALSE(domain_state.static_spki_hashes.empty());
-  EXPECT_TRUE(
-      state.GetDomainState("blog.torproject.org", false, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("blog.torproject.org", false,
+                                   &domain_state));
   EXPECT_FALSE(domain_state.static_spki_hashes.empty());
   EXPECT_TRUE(ShouldRedirect("ebanking.indovinabank.com.vn"));
   EXPECT_TRUE(ShouldRedirect("foo.ebanking.indovinabank.com.vn"));
 
   EXPECT_TRUE(ShouldRedirect("epoxate.com"));
   EXPECT_FALSE(HasState("foo.epoxate.com"));
 
   EXPECT_TRUE(HasPublicKeyPins("torproject.org"));
   EXPECT_TRUE(HasPublicKeyPins("www.torproject.org"));
   EXPECT_TRUE(HasPublicKeyPins("check.torproject.org"));
@@ skipping 51 matching lines @@
   EXPECT_TRUE(HasPublicKeyPins("www.twitter.com"));
 }
 
 TEST_F(TransportSecurityStateTest, LongNames) {
   TransportSecurityState state;
   const char kLongName[] =
       "lookupByWaveIdHashAndWaveIdIdAndWaveIdDomainAndWaveletIdIdAnd"
       "WaveletIdDomainAndBlipBlipid";
   TransportSecurityState::DomainState domain_state;
   // Just checks that we don't hit a NOTREACHED.
-  EXPECT_FALSE(state.GetDomainState(kLongName, true, true, &domain_state));
+  EXPECT_FALSE(state.GetDomainState(kLongName, true, &domain_state));
 }
 
 TEST_F(TransportSecurityStateTest, BuiltinCertPins) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
 
-  EXPECT_TRUE(
-      state.GetDomainState("chrome.google.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("chrome.google.com", true, &domain_state));
   EXPECT_TRUE(HasPublicKeyPins("chrome.google.com"));
 
   HashValueVector hashes;
   // Checks that a built-in list does exist.
   EXPECT_FALSE(domain_state.CheckPublicKeyPins(hashes));
   EXPECT_FALSE(HasPublicKeyPins("www.paypal.com"));
 
   EXPECT_TRUE(HasPublicKeyPins("docs.google.com"));
   EXPECT_TRUE(HasPublicKeyPins("1.docs.google.com"));
   EXPECT_TRUE(HasPublicKeyPins("sites.google.com"));
@@ skipping 67 matching lines @@
 
   for (size_t i = 0; kGoodPath[i]; i++) {
     EXPECT_TRUE(AddHash(kGoodPath[i], &good_hashes));
   }
   for (size_t i = 0; kBadPath[i]; i++) {
     EXPECT_TRUE(AddHash(kBadPath[i], &bad_hashes));
   }
 
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
-  EXPECT_TRUE(
-      state.GetDomainState("plus.google.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("plus.google.com", true, &domain_state));
   EXPECT_TRUE(domain_state.HasPublicKeyPins());
 
   EXPECT_TRUE(domain_state.CheckPublicKeyPins(good_hashes));
   EXPECT_FALSE(domain_state.CheckPublicKeyPins(bad_hashes));
 }
 
 TEST_F(TransportSecurityStateTest, PinValidationWithoutRejectedCerts) {
   // kGoodPath is blog.torproject.org.
   static const char* kGoodPath[] = {
     "sha1/m9lHYJYke9k0GtVZ+bXSQYE8nDI=",
@@ skipping 15 matching lines @@
 
   for (size_t i = 0; kGoodPath[i]; i++) {
     EXPECT_TRUE(AddHash(kGoodPath[i], &good_hashes));
   }
   for (size_t i = 0; kBadPath[i]; i++) {
     EXPECT_TRUE(AddHash(kBadPath[i], &bad_hashes));
   }
 
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
-  EXPECT_TRUE(
-      state.GetDomainState("blog.torproject.org", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("blog.torproject.org", true, &domain_state));
   EXPECT_TRUE(domain_state.HasPublicKeyPins());
 
   EXPECT_TRUE(domain_state.CheckPublicKeyPins(good_hashes));
   EXPECT_FALSE(domain_state.CheckPublicKeyPins(bad_hashes));
 }
 
 TEST_F(TransportSecurityStateTest, PinValidationWithRejectedCertsMixedHashes) {
   static const char* ee_sha1 = "sha1/4BjDjn8v2lWeUFQnqSs0BgbIcrU=";
   static const char* ee_sha256 =
       "sha256/sRJBQqWhpaKIGcc1NA7/jJ4vgWj+47oYfyU7waOS1+I=";
   static const char* google_1024_sha1 = "sha1/QMVAHW+MuvCLAO3vse6H0AWzuc0=";
   static const char* google_1024_sha256 =
       "sha256/trlUMquuV/4CDLK3T0+fkXPIxwivyecyrOIyeQR8bQU=";
   static const char* equifax_sha1 = "sha1/SOZo+SvSspXXR9gjIBBPM5iQn9Q=";
   static const char* equifax_sha256 =
       "sha256//1aAzXOlcD2gSBegdf1GJQanNQbEuBoVg+9UlHjSZHY=";
   static const char* trustcenter_sha1 = "sha1/gzuEEAB/bkqdQS3EIjk2by7lW+k=";
   static const char* trustcenter_sha256 =
       "sha256/Dq58KIA4NMLsboWMLU8/aTREzaAGEFW+EtUule8dd/M=";
 
   // Good chains for plus.google.com chain up through google_1024_sha{1,256}
   // to equifax_sha{1,256}. Bad chains chain up to Equifax through
   // trustcenter_sha{1,256}, which is a blacklisted key. Even though Equifax
   // and Google1024 are known-good, the blacklistedness of Trustcenter
   // should override and cause pin validation failure.
 
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
-  EXPECT_TRUE(
-      state.GetDomainState("plus.google.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("plus.google.com", true, &domain_state));
   EXPECT_TRUE(domain_state.HasPublicKeyPins());
 
   // The statically-defined pins are all SHA-1, so we add some SHA-256 pins
   // manually:
   EXPECT_TRUE(AddHash(google_1024_sha256, &domain_state.static_spki_hashes));
   EXPECT_TRUE(AddHash(trustcenter_sha256,
                       &domain_state.bad_static_spki_hashes));
 
   // Try an all-good SHA1 chain.
   HashValueVector validated_chain;
@@ skipping 91 matching lines @@
   EXPECT_FALSE(ShouldRedirect("google.com"));
   EXPECT_FALSE(ShouldRedirect("www.google.com"));
 
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
   const base::Time current_time(base::Time::Now());
   const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
   domain_state.upgrade_expiry = expiry;
   EnableHost(&state, "www.google.com", domain_state);
 
-  EXPECT_TRUE(
-      state.GetDomainState("www.google.com", true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState("www.google.com", true, &domain_state));
 }
 
 static const uint8 kSidePinLeafSPKI[] = {
   0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
   0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, 0x00, 0xe4,
   0x1d, 0xcc, 0xf2, 0x92, 0xe7, 0x7a, 0xc6, 0x36, 0xf7, 0x1a, 0x62, 0x31, 0x7d,
   0x37, 0xea, 0x0d, 0xa2, 0xa8, 0x12, 0x2b, 0xc2, 0x1c, 0x82, 0x3e, 0xa5, 0x70,
   0x4a, 0x83, 0x5d, 0x9b, 0x84, 0x82, 0x70, 0xa4, 0x88, 0x98, 0x98, 0x41, 0x29,
   0x31, 0xcb, 0x6e, 0x2a, 0x54, 0x65, 0x14, 0x60, 0xcc, 0x00, 0xe8, 0x10, 0x30,
   0x0a, 0x4a, 0xd1, 0xa7, 0x52, 0xfe, 0x2d, 0x31, 0x2a, 0x1d, 0x0d, 0x02, 0x03,
@@ skipping 78 matching lines @@
   // Expect to fail for SNI hosts when not searching the SNI list:
   EXPECT_FALSE(TransportSecurityState::IsGooglePinnedProperty(
       "gmail.com", false));
   EXPECT_FALSE(TransportSecurityState::IsGooglePinnedProperty(
       "googlegroups.com", false));
   EXPECT_FALSE(TransportSecurityState::IsGooglePinnedProperty(
       "www.googlegroups.com", false));
 }
 
 }  // namespace net