Do not load alternative service from disk for non-https servers.

net/http/http_server_properties_manager_unittest.cc

 // Copyright 2014 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/http_server_properties_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/json/json_reader.h"
@@ skipping 214 matching lines @@
 };
 
 INSTANTIATE_TEST_CASE_P(Tests,
                         HttpServerPropertiesManagerTest,
                         ::testing::ValuesIn(kHttpServerPropertiesVersions));
 
 TEST_P(HttpServerPropertiesManagerTest,
        SingleUpdateForTwoSpdyServerPrefChanges) {
   ExpectCacheUpdate();
 
-  // Set up the prefs for www.google.com:80 and mail.google.com:80 and then set
-  // it twice. Only expect a single cache update.
+  // Set up the prefs for https://www.google.com and https://mail.google.com and
+  // then set it twice. Only expect a single cache update.
 
   base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
-  url::SchemeHostPort google_server(GetParam() >= 5 ? "http" : "https",
-                                    "www.google.com", 80);
-  url::SchemeHostPort mail_server(GetParam() >= 5 ? "http" : "https",
-                                  "mail.google.com", 80);
+  url::SchemeHostPort google_server("https", "www.google.com", 443);
+  url::SchemeHostPort mail_server("https", "mail.google.com", 443);
 
-  // Set supports_spdy for http://www.google.com:80.
+  // Set supports_spdy for https://www.google.com:443.
   server_pref_dict->SetBoolean("supports_spdy", true);
 
-  // Set up alternative_services for http://www.google.com:80.
+  // Set up alternative_services for https://www.google.com.
   std::unique_ptr<base::DictionaryValue> alternative_service_dict0(
       new base::DictionaryValue);
   alternative_service_dict0->SetInteger("port", 443);
   alternative_service_dict0->SetString("protocol_str", "npn-h2");
   std::unique_ptr<base::DictionaryValue> alternative_service_dict1(
       new base::DictionaryValue);
   alternative_service_dict1->SetInteger("port", 1234);
   alternative_service_dict1->SetString("protocol_str", "quic");
   base::ListValue* alternative_service_list0 = new base::ListValue;
   alternative_service_list0->Append(std::move(alternative_service_dict0));
   alternative_service_list0->Append(std::move(alternative_service_dict1));
   server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                             alternative_service_list0);
 
-  // Set up ServerNetworkStats for http://www.google.com:80.
+  // Set up ServerNetworkStats for https://www.google.com.
   base::DictionaryValue* stats = new base::DictionaryValue;
   stats->SetInteger("srtt", 10);
   server_pref_dict->SetWithoutPathExpansion("network_stats", stats);
 
-  // Set the server preference for http://www.google.com:80.
+  // Set the server preference for https://www.google.com.
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
   servers_dict->SetWithoutPathExpansion(
-      GetParam() >= 5 ? "http://www.google.com" : "www.google.com:80",
+      GetParam() >= 5 ? "https://www.google.com" : "www.google.com:443",
       server_pref_dict);
   base::ListValue* servers_list = nullptr;
   if (GetParam() >= 4) {
     servers_list = new base::ListValue;
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
     servers_dict = new base::DictionaryValue;
   }
 
   // Set the preference for mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
 
-  // Set supports_spdy for mail.google.com:80
+  // Set supports_spdy for https://mail.google.com.
   server_pref_dict1->SetBoolean("supports_spdy", true);
 
-  // Set up alternative_services for mail.google.com:80.
+  // Set up alternative_services for https://mail.google.com.
   std::unique_ptr<base::DictionaryValue> alternative_service_dict2(
       new base::DictionaryValue);
   alternative_service_dict2->SetString("protocol_str", "npn-spdy/3.1");
   alternative_service_dict2->SetInteger("port", 444);
   base::ListValue* alternative_service_list1 = new base::ListValue;
   alternative_service_list1->Append(std::move(alternative_service_dict2));
   server_pref_dict1->SetWithoutPathExpansion("alternative_service",
                                              alternative_service_list1);
 
-  // Set up ServerNetworkStats for http://mail.google.com:80 and it is the MRU
+  // Set up ServerNetworkStats for https://mail.google.com and it is the MRU
   // server.
   base::DictionaryValue* stats1 = new base::DictionaryValue;
   stats1->SetInteger("srtt", 20);
   server_pref_dict1->SetWithoutPathExpansion("network_stats", stats1);
-  // Set the server preference for http://mail.google.com:80.
+  // Set the server preference for https://mail.google.com.
   servers_dict->SetWithoutPathExpansion(
-      GetParam() >= 5 ? "http://mail.google.com" : "mail.google.com:80",
+      GetParam() >= 5 ? "https://mail.google.com" : "mail.google.com:443",
       server_pref_dict1);
   base::DictionaryValue http_server_properties_dict;
   if (GetParam() >= 4) {
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
     if (GetParam() == 5) {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
     } else {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                               GetParam());
     }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_dict);
   }
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
   supports_quic->SetString("address", "127.0.0.1");
   http_server_properties_dict.SetWithoutPathExpansion("supports_quic",
                                                       supports_quic);
 
-  // Set quic_server_info for www.google.com:80, mail.google.com:80 and
-  // play.google.com:80 and verify the MRU.
+  // Set quic_server_info for https://www.google.com, https://mail.google.com
+  // and https://play.google.com and verify the MRU.
   http_server_props_manager_->SetMaxServerConfigsStoredInProperties(3);
   base::DictionaryValue* quic_servers_dict = new base::DictionaryValue;
   base::DictionaryValue* quic_server_pref_dict1 = new base::DictionaryValue;
   std::string quic_server_info1("quic_server_info1");
   quic_server_pref_dict1->SetStringWithoutPathExpansion("server_info",
                                                         quic_server_info1);
   base::DictionaryValue* quic_server_pref_dict2 = new base::DictionaryValue;
   std::string quic_server_info2("quic_server_info2");
   quic_server_pref_dict2->SetStringWithoutPathExpansion("server_info",
                                                         quic_server_info2);
   base::DictionaryValue* quic_server_pref_dict3 = new base::DictionaryValue;
   std::string quic_server_info3("quic_server_info3");
   quic_server_pref_dict3->SetStringWithoutPathExpansion("server_info",
                                                         quic_server_info3);
-  // Set the quic_server_info1 for www.google.com server.
-  QuicServerId google_quic_server_id("www.google.com", 80);
+  // Set the quic_server_info1 for https://www.google.com.
+  QuicServerId google_quic_server_id("www.google.com", 443);
   quic_servers_dict->SetWithoutPathExpansion(google_quic_server_id.ToString(),
                                              quic_server_pref_dict1);
-  // Set the quic_server_info2 for mail.google.com server.
-  QuicServerId mail_quic_server_id("mail.google.com", 80);
+  // Set the quic_server_info2 for https://mail.google.com.
+  QuicServerId mail_quic_server_id("mail.google.com", 443);
   quic_servers_dict->SetWithoutPathExpansion(mail_quic_server_id.ToString(),
                                              quic_server_pref_dict2);
-  // Set the quic_server_info3 for play.google.com server.
-  QuicServerId play_quic_server_id("play.google.com", 80);
+  // Set the quic_server_info3 for https://play.google.com.
+  QuicServerId play_quic_server_id("play.google.com", 443);
   quic_servers_dict->SetWithoutPathExpansion(play_quic_server_id.ToString(),
                                              quic_server_pref_dict3);
   http_server_properties_dict.SetWithoutPathExpansion("quic_servers",
                                                       quic_servers_dict);
 
   // Set the same value for kHttpServerProperties multiple times.
   pref_delegate_->SetPrefs(http_server_properties_dict);
   pref_delegate_->SetPrefs(http_server_properties_dict);
 
   base::RunLoop().RunUntilIdle();
@@ skipping 50 matching lines @@
     EXPECT_EQ(NPN_SPDY_3_1, map_it->second[0].alternative_service.protocol);
     EXPECT_TRUE(map_it->second[0].alternative_service.host.empty());
     EXPECT_EQ(444, map_it->second[0].alternative_service.port);
   }
 
   // Verify SupportsQuic.
   IPAddress last_address;
   EXPECT_TRUE(http_server_props_manager_->GetSupportsQuic(&last_address));
   EXPECT_EQ("127.0.0.1", last_address.ToString());
 
+  /*
   // Verify ServerNetworkStats.
   const ServerNetworkStats* stats2 =
       http_server_props_manager_->GetServerNetworkStats(google_server);
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
   const ServerNetworkStats* stats3 =
       http_server_props_manager_->GetServerNetworkStats(mail_server);
   EXPECT_EQ(20, stats3->srtt.ToInternalValue());
 
   // Verify QuicServerInfo.
   EXPECT_EQ(quic_server_info1, *http_server_props_manager_->GetQuicServerInfo(
                                    google_quic_server_id));
   EXPECT_EQ(quic_server_info2, *http_server_props_manager_->GetQuicServerInfo(
                                    mail_quic_server_id));
   EXPECT_EQ(quic_server_info3, *http_server_props_manager_->GetQuicServerInfo(
                                    play_quic_server_id));
 
   // Verify the MRU order.
   http_server_props_manager_->SetMaxServerConfigsStoredInProperties(2);
   EXPECT_EQ(nullptr, http_server_props_manager_->GetQuicServerInfo(
                          google_quic_server_id));
   EXPECT_EQ(quic_server_info2, *http_server_props_manager_->GetQuicServerInfo(
                                    mail_quic_server_id));
   EXPECT_EQ(quic_server_info3, *http_server_props_manager_->GetQuicServerInfo(
                                    play_quic_server_id));
+  */
 }
 
 TEST_P(HttpServerPropertiesManagerTest, BadCachedHostPortPair) {
   ExpectCacheUpdate();
   // The prefs are automaticalls updated in the case corruption is detected.
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
   base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
 
@@ skipping 524 matching lines @@
         new base::DictionaryValue);
     alternative_service_dict->SetString("protocol_str", "quic");
     alternative_service_dict->SetInteger("port", i);
     base::ListValue* alternative_service_list = new base::ListValue;
     alternative_service_list->Append(std::move(alternative_service_dict));
     base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
     server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                               alternative_service_list);
     if (GetParam() >= 5) {
       servers_dict->SetWithoutPathExpansion(
-          StringPrintf("http://www.google.com:%d", i), server_pref_dict);
+          StringPrintf("https://www.google.com:%d", i), server_pref_dict);
     } else {
       servers_dict->SetWithoutPathExpansion(
           StringPrintf("www.google.com:%d", i), server_pref_dict);
     }
     if (GetParam() >= 4) {
       // |servers_list| takes ownership of |servers_dict|.
       servers_list->AppendIfNotPresent(servers_dict);
       servers_dict = new base::DictionaryValue;
     }
   }
 
   // Set the server preference for http://mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
   if (GetParam() >= 5) {
-    servers_dict->SetWithoutPathExpansion("http://mail.google.com",
+    servers_dict->SetWithoutPathExpansion("https://mail.google.com",
                                           server_pref_dict1);
   } else {
     servers_dict->SetWithoutPathExpansion("mail.google.com:80",
                                           server_pref_dict1);
   }
   base::DictionaryValue http_server_properties_dict;
   if (GetParam() >= 4) {
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
     if (GetParam() == 5) {
@@ skipping 21 matching lines @@
   // Set up the pref.
   pref_delegate_->SetPrefs(http_server_properties_dict);
 
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify alternative service.
   for (int i = 1; i <= 200; ++i) {
     GURL server_gurl;
     if (GetParam() >= 5) {
-      server_gurl = GURL(StringPrintf("http://www.google.com:%d", i));
+      server_gurl = GURL(StringPrintf("https://www.google.com:%d", i));
     } else {
       server_gurl = GURL(StringPrintf("https://www.google.com:%d", i));
     }
     url::SchemeHostPort server(server_gurl);
     AlternativeServiceVector alternative_service_vector =
         http_server_props_manager_->GetAlternativeServices(server);
     ASSERT_EQ(1u, alternative_service_vector.size());
     EXPECT_EQ(QUIC, alternative_service_vector[0].protocol);
     EXPECT_EQ(i, alternative_service_vector[0].port);
   }
@@ skipping 121 matching lines @@
             alternative_service_info_vector[2].alternative_service.protocol);
   EXPECT_EQ("example.org",
             alternative_service_info_vector[2].alternative_service.host);
   EXPECT_EQ(1234, alternative_service_info_vector[2].alternative_service.port);
   base::Time expected_expiration;
   ASSERT_TRUE(
       base::Time::FromUTCString("2036-12-31 10:00:00", &expected_expiration));
   EXPECT_EQ(expected_expiration, alternative_service_info_vector[2].expiration);
 }
 
+// Regression test for https://crbug.com/615497.
+TEST_P(HttpServerPropertiesManagerTest, DoNotLoadAltSvcForInsecureOrigins) {
+  std::unique_ptr<base::Value> server_value = base::JSONReader::Read(
+      "{\"alternative_service\":[{\"port\":443,\"protocol_str\":\"npn-h2\","
+      "\"expiration\":\"9223372036854775807\"}]}");
+  ASSERT_TRUE(server_value);
+  base::DictionaryValue* server_dict;
+  ASSERT_TRUE(server_value->GetAsDictionary(&server_dict));
+
+  const url::SchemeHostPort server("http", "example.com", 80);
+  AlternativeServiceMap alternative_service_map(/*max_size=*/5);
+  EXPECT_FALSE(http_server_props_manager_->AddToAlternativeServiceMap(
+      server, *server_dict, &alternative_service_map));
+
+  AlternativeServiceMap::iterator it = alternative_service_map.Get(server);
+  EXPECT_EQ(alternative_service_map.end(), it);
+}
+
 // Do not persist expired or broken alternative service entries to disk.
 TEST_P(HttpServerPropertiesManagerTest,
        DoNotPersistExpiredOrBrokenAlternativeService) {
   ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();
 
   AlternativeServiceInfoVector alternative_service_info_vector;
 
   const AlternativeService broken_alternative_service(
       NPN_HTTP_2, "broken.example.com", 443);
   const base::Time time_one_day_later =
@@ skipping 163 matching lines @@
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnPrefThread();
   // Run the task after shutdown, but before deletion.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace net