Avoid advertising SDCH over HTTPS.

net/base/sdch_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 <limits.h>
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 //------------------------------------------------------------------------------
 
 class SdchManagerTest : public testing::Test {
  protected:
   SdchManagerTest()
     : sdch_manager_(new SdchManager) {
   }
 
   SdchManager* sdch_manager() { return sdch_manager_.get(); }
 
+  // Reset globals back to default state.
+  virtual void TearDown() {
+    SdchManager::EnableSdchSupport(true);
+    SdchManager::EnableSecureSchemeSupport(false);
+  }
+
  private:
   scoped_ptr<SdchManager> sdch_manager_;
 };
 
 //------------------------------------------------------------------------------
 static std::string NewSdchDictionary(const std::string& domain) {
   std::string dictionary;
   if (!domain.empty()) {
     dictionary.append("Domain: ");
     dictionary.append(domain);
     dictionary.append("\n");
   }
   dictionary.append("\n");
   dictionary.append(kTestVcdiffDictionary, sizeof(kTestVcdiffDictionary) - 1);
   return dictionary;
 }
 
 TEST_F(SdchManagerTest, DomainSupported) {
   GURL google_url("http://www.google.com");
 
-  net::SdchManager::EnableSdchSupport(false);
+  SdchManager::EnableSdchSupport(false);
   EXPECT_FALSE(sdch_manager()->IsInSupportedDomain(google_url));
-  net::SdchManager::EnableSdchSupport(true);
+  SdchManager::EnableSdchSupport(true);
   EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(google_url));
 }
 
 TEST_F(SdchManagerTest, DomainBlacklisting) {
   GURL test_url("http://www.test.com");
   GURL google_url("http://www.google.com");
 
   sdch_manager()->BlacklistDomain(test_url);
   EXPECT_FALSE(sdch_manager()->IsInSupportedDomain(test_url));
   EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(google_url));
@@ skipping 100 matching lines @@
   sdch_manager()->GetAvailDictionaryList(
       GURL("https://" + dictionary_domain + "/test"),
       &dictionary_list);
   EXPECT_TRUE(dictionary_list.empty());
 }
 
 TEST_F(SdchManagerTest, CanUseHTTPSDictionaryOverHTTPSIfEnabled) {
   std::string dictionary_domain("x.y.z.google.com");
   std::string dictionary_text(NewSdchDictionary(dictionary_domain));
 
-  EXPECT_TRUE(sdch_manager()->AddSdchDictionary(dictionary_text,
-              GURL("https://" + dictionary_domain)));
+  EXPECT_FALSE(sdch_manager()->AddSdchDictionary(
+      dictionary_text, GURL("https://" + dictionary_domain)));
+  SdchManager::EnableSecureSchemeSupport(true);
+  EXPECT_TRUE(sdch_manager()->AddSdchDictionary(
+      dictionary_text, GURL("https://" + dictionary_domain)));
 
   GURL target_url("https://" + dictionary_domain + "/test");
   std::string dictionary_list;
   // HTTPS target URL should advertise dictionary if secure scheme support is
   // enabled.
-  sdch_manager()->EnableSecureSchemeSupport(true);
   sdch_manager()->GetAvailDictionaryList(target_url, &dictionary_list);
   EXPECT_FALSE(dictionary_list.empty());
 
   // Dictionary should be available.
   SdchManager::Dictionary* dictionary = NULL;
   std::string client_hash;
   std::string server_hash;
   sdch_manager()->GenerateHash(dictionary_text, &client_hash, &server_hash);
   sdch_manager()->GetVcdiffDictionary(server_hash, target_url, &dictionary);
   EXPECT_TRUE(dictionary != NULL);
 }
 
 TEST_F(SdchManagerTest, CanNotUseHTTPDictionaryOverHTTPS) {
   std::string dictionary_domain("x.y.z.google.com");
   std::string dictionary_text(NewSdchDictionary(dictionary_domain));
 
   EXPECT_TRUE(sdch_manager()->AddSdchDictionary(dictionary_text,
               GURL("http://" + dictionary_domain)));
 
   GURL target_url("https://" + dictionary_domain + "/test");
   std::string dictionary_list;
   // HTTPS target URL should not advertise dictionary acquired over HTTP even if
   // secure scheme support is enabled.
-  sdch_manager()->EnableSecureSchemeSupport(true);
+  SdchManager::EnableSecureSchemeSupport(true);
   sdch_manager()->GetAvailDictionaryList(target_url, &dictionary_list);
   EXPECT_TRUE(dictionary_list.empty());
 
   SdchManager::Dictionary* dictionary = NULL;
   std::string client_hash;
   std::string server_hash;
   sdch_manager()->GenerateHash(dictionary_text, &client_hash, &server_hash);
   sdch_manager()->GetVcdiffDictionary(server_hash, target_url, &dictionary);
   EXPECT_TRUE(dictionary == NULL);
 }
@@ skipping 197 matching lines @@
       &dictionary);
   EXPECT_FALSE(dictionary);
 
   second_manager.GetVcdiffDictionary(
       server_hash_1,
       GURL("http://" + dictionary_domain_1 + "/random_url"),
       &dictionary);
   EXPECT_FALSE(dictionary);
 }
 
+TEST_F(SdchManagerTest, HttpsCorrectlySupported) {
+  GURL url("http://www.google.com");
+  GURL secure_url("https://www.google.com");
+
+  EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(url));
+  EXPECT_FALSE(sdch_manager()->IsInSupportedDomain(secure_url));
+
+  SdchManager::EnableSecureSchemeSupport(true);
+  EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(url));
+  EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(secure_url));
+}
+
 }  // namespace net